Changeset 45783 for trunk/package.json

Timestamp:

08/12/2019 08:28:33 AM (6 years ago)

Author:

pento

Message:

Build Tools: Miscellaneous local-env improvements.

• Move the functionality for controlling local-env out of package.json, into JS scripts.
• Merge the docker-compose config files, and move it to the root directory. This allows docker-compose.override.yml to work for local overrides.
• Fix nginx redirecting to port 80 under some circumstances.
• npm run env:install now creates wp-tests.config.php for you.
• Cleaned up a bunch of cruft in .travis.yml.

See #47767.

Location:

trunk

Files:

• . (modified) (1 prop)
• package.json (modified) (2 diffs)

trunk

@@ -14 +14 @@
 jsdoc
 vendor
+docker-compose.override.yml

@@ -14 +14 @@
 jsdoc
 vendor
+docker-compose.override.yml

trunk/package.json

@@ -23 +23 @@
         "check-node-version": "3.2.0",
         "copy-webpack-plugin": "^4.6.0",
-        "copyfiles": "2.1.1",
         "core-js": "3.1.4",
-        "cross-env": "5.2.0",
-        "cross-var": "1.1.0",
         "cssnano": "4.1.8",
-        "dotenv-cli": "2.0.1",
+        "dotenv": "8.0.0",
+        "dotenv-expand": "5.1.0",
         "grunt": "~1.0.3",
         "grunt-banner": "^0.6.0",
@@ -130 +128 @@
         "watch": "grunt watch",
         "grunt": "grunt",
-        "env:start": "dotenv npm run env:__start-next",
-        "env:__start-next": "docker-compose -f ./tools/local-env/docker-compose.yml up -d",
-        "env:stop": "dotenv npm run env:__stop-next",
-        "env:clean": "dotenv npm run env:__stop-next -- -- -v --remove-orphans",
-        "env:reset": "dotenv npm run env:__stop-next -- -- --rmi all -v --remove-orphans",
-        "env:__stop-next": "docker-compose -f ./tools/local-env/docker-compose.yml -f ./tools/local-env/docker-compose.scripts.yml down",
-        "env:install": "dotenv npm run env:__install-next",
-        "env:__install-next": "npm run env:__install-config && npm run env:__install-config-define-wp_debug && npm run env:__install-config-define-wp_debug_log && npm run env:__install-config-define-wp_debug_display && npm run env:__install-config-define-script_debug && copyfiles -f src/wp-config.php . && npm run env:__reset-site && npm run env:__install-site",
-        "env:__install-config": "cross-var npm run env:__cli-next config create -- --dbname=wordpress_develop --dbuser=root --dbpass=password --dbhost=mysql --path=/var/www/src --force",
-        "env:__install-config-define-wp_debug": "cross-var npm run env:__cli-next config set WP_DEBUG $LOCAL_WP_DEBUG -- --raw",
-        "env:__install-config-define-wp_debug_log": "cross-var npm run env:__cli-next config set WP_DEBUG_LOG $LOCAL_WP_DEBUG_LOG -- --raw",
-        "env:__install-config-define-wp_debug_display": "cross-var npm run env:__cli-next config set WP_DEBUG_DISPLAY $LOCAL_WP_DEBUG_DISPLAY -- --raw",
-        "env:__install-config-define-script_debug": "cross-var npm run env:__cli-next config set SCRIPT_DEBUG $LOCAL_SCRIPT_DEBUG -- --raw",
-        "env:__install-site": "cross-var wait-on tcp:localhost:$LOCAL_PORT && cross-var npm run env:__cli-next core install -- --title=WPDEV --admin_user=admin --admin_password=password --admin_email=test@test.com --skip-email --url=http://localhost:$LOCAL_PORT --quiet",
-        "env:__reset-site": "cross-var wait-on tcp:localhost:$LOCAL_PORT && npm run env:__cli-next db reset -- --yes --quiet",
-        "env:cli": "dotenv npm run env:__cli-next",
-        "env:__cli-next": "docker-compose -f ./tools/local-env/docker-compose.yml -f ./tools/local-env/docker-compose.scripts.yml run --rm cli",
-        "env:logs": "docker-compose -f ./tools/local-env/docker-compose.yml -f ./tools/local-env/docker-compose.scripts.yml logs",
-        "env:pull": "dotenv npm run env:__pull-next",
-        "env:__pull-next": "docker-compose -f ./tools/local-env/docker-compose.yml -f ./tools/local-env/docker-compose.scripts.yml pull",
-        "test:e2e": "dotenv npm run test:__e2e-next",
-        "test:__e2e-next": "cross-var cross-env WP_BASE_URL=http://localhost:$LOCAL_PORT wp-scripts test-e2e --config tests/e2e/jest.config.js",
-        "test:php": "dotenv npm run test:__php-next",
-        "test:__php-next": "docker-compose -f ./tools/local-env/docker-compose.yml -f ./tools/local-env/docker-compose.scripts.yml run --rm phpunit phpunit"
+        "env:start": "node ./tools/local-env/scripts/start.js",
+        "env:stop": "node ./tools/local-env/scripts/docker.js down",
+        "env:clean": "node ./tools/local-env/scripts/docker.js down -v --remove-orphans",
+        "env:reset": "node ./tools/local-env/scripts/docker.js down --rmi all -v --remove-orphans",
+        "env:install": "node ./tools/local-env/scripts/install.js",
+        "env:cli": "node ./tools/local-env/scripts/docker.js run cli",
+        "env:logs": "node ./tools/local-env/scripts/docker.js logs",
+        "env:pull": "node ./tools/local-env/scripts/docker.js pull",
+        "test:php": "node ./tools/local-env/scripts/docker.js run --rm phpunit phpunit",
+        "test:e2e": "node ./tests/e2e/run-tests.js"
     }
 }

@@ -14 +14 @@
 jsdoc
 vendor
+docker-compose.override.yml