WordPress.org

Make WordPress Core

Changeset 45783 for trunk/package.json


Ignore:
Timestamp:
08/12/2019 08:28:33 AM (2 months 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

    • Property svn:ignore
      •  

        old new  
        1414jsdoc
        1515vendor
         16docker-compose.override.yml
  • trunk/package.json

    r45769 r45783  
    2323        "check-node-version": "3.2.0",
    2424        "copy-webpack-plugin": "^4.6.0",
    25         "copyfiles": "2.1.1",
    2625        "core-js": "3.1.4",
    27         "cross-env": "5.2.0",
    28         "cross-var": "1.1.0",
    2926        "cssnano": "4.1.8",
    30         "dotenv-cli": "2.0.1",
     27        "dotenv": "8.0.0",
     28        "dotenv-expand": "5.1.0",
    3129        "grunt": "~1.0.3",
    3230        "grunt-banner": "^0.6.0",
     
    130128        "watch": "grunt watch",
    131129        "grunt": "grunt",
    132         "env:start": "dotenv npm run env:__start-next",
    133         "env:__start-next": "docker-compose -f ./tools/local-env/docker-compose.yml up -d",
    134         "env:stop": "dotenv npm run env:__stop-next",
    135         "env:clean": "dotenv npm run env:__stop-next -- -- -v --remove-orphans",
    136         "env:reset": "dotenv npm run env:__stop-next -- -- --rmi all -v --remove-orphans",
    137         "env:__stop-next": "docker-compose -f ./tools/local-env/docker-compose.yml -f ./tools/local-env/docker-compose.scripts.yml down",
    138         "env:install": "dotenv npm run env:__install-next",
    139         "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",
    140         "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",
    141         "env:__install-config-define-wp_debug": "cross-var npm run env:__cli-next config set WP_DEBUG $LOCAL_WP_DEBUG -- --raw",
    142         "env:__install-config-define-wp_debug_log": "cross-var npm run env:__cli-next config set WP_DEBUG_LOG $LOCAL_WP_DEBUG_LOG -- --raw",
    143         "env:__install-config-define-wp_debug_display": "cross-var npm run env:__cli-next config set WP_DEBUG_DISPLAY $LOCAL_WP_DEBUG_DISPLAY -- --raw",
    144         "env:__install-config-define-script_debug": "cross-var npm run env:__cli-next config set SCRIPT_DEBUG $LOCAL_SCRIPT_DEBUG -- --raw",
    145         "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",
    146         "env:__reset-site": "cross-var wait-on tcp:localhost:$LOCAL_PORT && npm run env:__cli-next db reset -- --yes --quiet",
    147         "env:cli": "dotenv npm run env:__cli-next",
    148         "env:__cli-next": "docker-compose -f ./tools/local-env/docker-compose.yml -f ./tools/local-env/docker-compose.scripts.yml run --rm cli",
    149         "env:logs": "docker-compose -f ./tools/local-env/docker-compose.yml -f ./tools/local-env/docker-compose.scripts.yml logs",
    150         "env:pull": "dotenv npm run env:__pull-next",
    151         "env:__pull-next": "docker-compose -f ./tools/local-env/docker-compose.yml -f ./tools/local-env/docker-compose.scripts.yml pull",
    152         "test:e2e": "dotenv npm run test:__e2e-next",
    153         "test:__e2e-next": "cross-var cross-env WP_BASE_URL=http://localhost:$LOCAL_PORT wp-scripts test-e2e --config tests/e2e/jest.config.js",
    154         "test:php": "dotenv npm run test:__php-next",
    155         "test:__php-next": "docker-compose -f ./tools/local-env/docker-compose.yml -f ./tools/local-env/docker-compose.scripts.yml run --rm phpunit phpunit"
     130        "env:start": "node ./tools/local-env/scripts/start.js",
     131        "env:stop": "node ./tools/local-env/scripts/docker.js down",
     132        "env:clean": "node ./tools/local-env/scripts/docker.js down -v --remove-orphans",
     133        "env:reset": "node ./tools/local-env/scripts/docker.js down --rmi all -v --remove-orphans",
     134        "env:install": "node ./tools/local-env/scripts/install.js",
     135        "env:cli": "node ./tools/local-env/scripts/docker.js run cli",
     136        "env:logs": "node ./tools/local-env/scripts/docker.js logs",
     137        "env:pull": "node ./tools/local-env/scripts/docker.js pull",
     138        "test:php": "node ./tools/local-env/scripts/docker.js run --rm phpunit phpunit",
     139        "test:e2e": "node ./tests/e2e/run-tests.js"
    156140    }
    157141}
Note: See TracChangeset for help on using the changeset viewer.