Changeset 45783
- Timestamp:
- 08/12/2019 08:28:33 AM (5 years ago)
- Location:
- trunk
- Files:
-
- 5 added
- 1 deleted
- 8 edited
-
. (modified) (1 prop)
-
.env (modified) (1 diff)
-
.gitignore (modified) (1 diff)
-
.travis.yml (modified) (6 diffs)
-
package-lock.json (modified) (11 diffs)
-
package.json (modified) (2 diffs)
-
tests/e2e/run-tests.js (added)
-
tools/local-env/default.template (modified) (1 diff)
-
tools/local-env/docker-compose.scripts.yml (deleted)
-
tools/local-env/docker-compose.yml (modified) (4 diffs)
-
tools/local-env/scripts (added)
-
tools/local-env/scripts/docker.js (added)
-
tools/local-env/scripts/install.js (added)
-
tools/local-env/scripts/start.js (added)
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:ignore
-
old new 14 14 jsdoc 15 15 vendor 16 docker-compose.override.yml
-
- Property svn:ignore
-
trunk/.env
r45762 r45783 30 30 LOCAL_WP_DEBUG_DISPLAY=true 31 31 LOCAL_SCRIPT_DEBUG=true 32 33 # The URL to use when running e2e tests. 34 WP_BASE_URL=http://localhost:${LOCAL_PORT} -
trunk/.gitignore
r45410 r45783 74 74 .svn 75 75 !/src/js/_enqueues/vendor 76 77 # Files for local environment config 78 /docker-compose.override.yml -
trunk/.travis.yml
r45762 r45783 1 language: php 1 language: generic 2 2 3 services: 3 4 - docker 4 - mysql5 5 6 6 addons: … … 52 52 - | 53 53 if [[ "$WP_TRAVISCI" == "test:php" ]]; then 54 cp wp-tests-config-sample.php wp-tests-config.php55 sed -i "s/youremptytestdbnamehere/wordpress_develop_tests/" wp-tests-config.php56 sed -i "s/yourusernamehere/root/" wp-tests-config.php57 sed -i "s/yourpasswordhere/password/" wp-tests-config.php58 sed -i "s/localhost/mysql/" wp-tests-config.php59 echo "define( 'FS_METHOD', 'direct' );" >> wp-tests-config.php60 54 travis_retry svn checkout https://plugins.svn.wordpress.org/wordpress-importer/tags/0.6.3/ tests/phpunit/data/plugins/wordpress-importer 61 55 fi … … 75 69 fi 76 70 - | 77 # Export Composer's global bin dir to PATH:78 composer config --list --global79 export PATH=`composer config --list --global | grep '\[home\]' | { read a; echo "${a#* }/vendor/bin:$PATH"; }`80 - |81 # Install PHPUnit for the tests that don't run in Docker.82 if [[ "$WP_TRAVISCI" == "travis:phpunit" ]]; then83 echo "Using PHPUnit 7.x"84 travis_retry composer global require "phpunit/phpunit:^7"85 fi86 - |87 71 # We only need to run composer install on the PHP coding standards job. 88 72 if [[ "$WP_TRAVISCI" == "travis:phpcs" ]]; then … … 99 83 npm run env:start 100 84 npm run build 101 docker-compose -f tools/local-env/docker-compose.ymlrun --rm mysql mysql --version102 docker-compose -f tools/local-env/docker-compose.ymlrun --rm php php --version103 docker-compose -f tools/local-env/docker-compose.ymlrun --rm php php -m104 docker-compose -f tools/local-env/docker-compose.yml -f tools/local-env/docker-compose.scripts.ymlrun --rm phpunit phpunit --version85 docker-compose run --rm mysql mysql --version 86 docker-compose run --rm php php --version 87 docker-compose run --rm php php -m 88 docker-compose run --rm phpunit phpunit --version 105 89 fi 106 90 - | 107 91 if [[ "$LOCAL_PHP_MEMCACHED" == "true" ]]; then 108 92 cp tests/phpunit/includes/object-cache.php build/wp-content/object-cache.php 109 docker run --name memcached --net local-env_wpdevnet -d memcached 93 # The memcached server needs to start after `npm run env:start`, which sets up the Docker network. 94 docker run --name memcached --net wordpress-develop_wpdevnet -d memcached 110 95 fi 111 96 - | 112 if [[ "$WP_TRAVISCI" == "test:e2e" ]]; then 97 if [[ "$WP_TRAVISCI" == "test:e2e" ]] || [[ "$WP_TRAVISCI" == "test:php" ]]; then 98 # Run the install process after memcached has started. 113 99 npm run env:install 114 100 fi … … 125 111 npm run test:e2e 126 112 elif [[ "$WP_TRAVISCI" == "test:php" ]]; then 127 npm run test:php -- -- -- --verbose -c phpunit.xml.dist &&128 npm run test:php -- -- -- --verbose -c phpunit.xml.dist --group ajax &&129 npm run test:php -- -- -- --verbose -c tests/phpunit/multisite.xml &&130 npm run test:php -- -- -- --verbose -c tests/phpunit/multisite.xml --group ms-files &&131 npm run test:php -- -- -- --verbose -c phpunit.xml.dist --group external-http &&132 npm run test:php -- -- -- --verbose -c phpunit.xml.dist --group restapi-jsclient113 npm run test:php -- --verbose -c phpunit.xml.dist && 114 npm run test:php -- --verbose -c phpunit.xml.dist --group ajax && 115 npm run test:php -- --verbose -c tests/phpunit/multisite.xml && 116 npm run test:php -- --verbose -c tests/phpunit/multisite.xml --group ms-files && 117 npm run test:php -- --verbose -c phpunit.xml.dist --group external-http && 118 npm run test:php -- --verbose -c phpunit.xml.dist --group restapi-jsclient 133 119 else 134 120 npm run grunt $WP_TRAVISCI … … 139 125 if [[ "$WP_TEST_REPORTER" == "true" ]]; then 140 126 git clone https://github.com/WordPress/phpunit-test-runner.git test-runner 141 export WPT_PREPARE_DIR=$(pwd) 142 export WPT_TEST_DIR=$(pwd) 143 php test-runner/report.php 127 docker-compose run --rm -e WPT_PREPARE_DIR=/var/www -e WPT_TEST_DIR=/var/www php php test-runner/report.php 144 128 fi 145 129 -
trunk/package-lock.json
r45769 r45783 3720 3720 } 3721 3721 }, 3722 "babel-helper-bindify-decorators": {3723 "version": "6.24.1",3724 "resolved": "https://registry.npmjs.org/babel-helper-bindify-decorators/-/babel-helper-bindify-decorators-6.24.1.tgz",3725 "integrity": "sha1-FMGeXxQte0fxmlJDHlKxzLxAozA=",3726 "dev": true,3727 "requires": {3728 "babel-runtime": "^6.22.0",3729 "babel-traverse": "^6.24.1",3730 "babel-types": "^6.24.1"3731 }3732 },3733 "babel-helper-builder-binary-assignment-operator-visitor": {3734 "version": "6.24.1",3735 "resolved": "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz",3736 "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=",3737 "dev": true,3738 "requires": {3739 "babel-helper-explode-assignable-expression": "^6.24.1",3740 "babel-runtime": "^6.22.0",3741 "babel-types": "^6.24.1"3742 }3743 },3744 3722 "babel-helper-call-delegate": { 3745 3723 "version": "6.24.1", … … 3762 3740 "babel-types": "^6.26.0", 3763 3741 "lodash": "^4.17.4" 3764 }3765 },3766 "babel-helper-explode-assignable-expression": {3767 "version": "6.24.1",3768 "resolved": "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz",3769 "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=",3770 "dev": true,3771 "requires": {3772 "babel-runtime": "^6.22.0",3773 "babel-traverse": "^6.24.1",3774 "babel-types": "^6.24.1"3775 }3776 },3777 "babel-helper-explode-class": {3778 "version": "6.24.1",3779 "resolved": "https://registry.npmjs.org/babel-helper-explode-class/-/babel-helper-explode-class-6.24.1.tgz",3780 "integrity": "sha1-fcKjkQ3uAHBW4eMdZAztPVTqqes=",3781 "dev": true,3782 "requires": {3783 "babel-helper-bindify-decorators": "^6.24.1",3784 "babel-runtime": "^6.22.0",3785 "babel-traverse": "^6.24.1",3786 "babel-types": "^6.24.1"3787 3742 } 3788 3743 }, … … 3834 3789 "babel-types": "^6.26.0", 3835 3790 "lodash": "^4.17.4" 3836 }3837 },3838 "babel-helper-remap-async-to-generator": {3839 "version": "6.24.1",3840 "resolved": "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz",3841 "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=",3842 "dev": true,3843 "requires": {3844 "babel-helper-function-name": "^6.24.1",3845 "babel-runtime": "^6.22.0",3846 "babel-template": "^6.24.1",3847 "babel-traverse": "^6.24.1",3848 "babel-types": "^6.24.1"3849 3791 } 3850 3792 }, … … 4016 3958 } 4017 3959 }, 4018 "babel-plugin-syntax-async-functions": {4019 "version": "6.13.0",4020 "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz",4021 "integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=",4022 "dev": true4023 },4024 "babel-plugin-syntax-async-generators": {4025 "version": "6.13.0",4026 "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz",4027 "integrity": "sha1-a8lj67FuzLrmuStZbrfzXDQqi5o=",4028 "dev": true4029 },4030 "babel-plugin-syntax-class-constructor-call": {4031 "version": "6.18.0",4032 "resolved": "https://registry.npmjs.org/babel-plugin-syntax-class-constructor-call/-/babel-plugin-syntax-class-constructor-call-6.18.0.tgz",4033 "integrity": "sha1-nLnTn+Q8hgC+yBRkVt3L1OGnZBY=",4034 "dev": true4035 },4036 "babel-plugin-syntax-class-properties": {4037 "version": "6.13.0",4038 "resolved": "https://registry.npmjs.org/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz",4039 "integrity": "sha1-1+sjt5oxf4VDlixQW4J8fWysJ94=",4040 "dev": true4041 },4042 "babel-plugin-syntax-decorators": {4043 "version": "6.13.0",4044 "resolved": "https://registry.npmjs.org/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz",4045 "integrity": "sha1-MSVjtNvePMgGzuPkFszurd0RrAs=",4046 "dev": true4047 },4048 "babel-plugin-syntax-do-expressions": {4049 "version": "6.13.0",4050 "resolved": "https://registry.npmjs.org/babel-plugin-syntax-do-expressions/-/babel-plugin-syntax-do-expressions-6.13.0.tgz",4051 "integrity": "sha1-V0d1YTmqJtOQ0JQQsDdEugfkeW0=",4052 "dev": true4053 },4054 "babel-plugin-syntax-dynamic-import": {4055 "version": "6.18.0",4056 "resolved": "https://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz",4057 "integrity": "sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=",4058 "dev": true4059 },4060 "babel-plugin-syntax-exponentiation-operator": {4061 "version": "6.13.0",4062 "resolved": "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz",4063 "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=",4064 "dev": true4065 },4066 "babel-plugin-syntax-export-extensions": {4067 "version": "6.13.0",4068 "resolved": "https://registry.npmjs.org/babel-plugin-syntax-export-extensions/-/babel-plugin-syntax-export-extensions-6.13.0.tgz",4069 "integrity": "sha1-cKFITw+QiaToStRLrDU8lbmxJyE=",4070 "dev": true4071 },4072 "babel-plugin-syntax-function-bind": {4073 "version": "6.13.0",4074 "resolved": "https://registry.npmjs.org/babel-plugin-syntax-function-bind/-/babel-plugin-syntax-function-bind-6.13.0.tgz",4075 "integrity": "sha1-SMSV8Xe98xqYHnMvVa3AvdJgH0Y=",4076 "dev": true4077 },4078 "babel-plugin-syntax-object-rest-spread": {4079 "version": "6.13.0",4080 "resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz",4081 "integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=",4082 "dev": true4083 },4084 "babel-plugin-syntax-trailing-function-commas": {4085 "version": "6.22.0",4086 "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz",4087 "integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=",4088 "dev": true4089 },4090 "babel-plugin-transform-async-generator-functions": {4091 "version": "6.24.1",4092 "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.24.1.tgz",4093 "integrity": "sha1-8FiQAUX9PpkHpt3yjaWfIVJYpds=",4094 "dev": true,4095 "requires": {4096 "babel-helper-remap-async-to-generator": "^6.24.1",4097 "babel-plugin-syntax-async-generators": "^6.5.0",4098 "babel-runtime": "^6.22.0"4099 }4100 },4101 "babel-plugin-transform-async-to-generator": {4102 "version": "6.24.1",4103 "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz",4104 "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=",4105 "dev": true,4106 "requires": {4107 "babel-helper-remap-async-to-generator": "^6.24.1",4108 "babel-plugin-syntax-async-functions": "^6.8.0",4109 "babel-runtime": "^6.22.0"4110 }4111 },4112 "babel-plugin-transform-class-constructor-call": {4113 "version": "6.24.1",4114 "resolved": "https://registry.npmjs.org/babel-plugin-transform-class-constructor-call/-/babel-plugin-transform-class-constructor-call-6.24.1.tgz",4115 "integrity": "sha1-gNwoVQWsBn3LjWxl4vbxGrd2Xvk=",4116 "dev": true,4117 "requires": {4118 "babel-plugin-syntax-class-constructor-call": "^6.18.0",4119 "babel-runtime": "^6.22.0",4120 "babel-template": "^6.24.1"4121 }4122 },4123 "babel-plugin-transform-class-properties": {4124 "version": "6.24.1",4125 "resolved": "https://registry.npmjs.org/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz",4126 "integrity": "sha1-anl2PqYdM9NvN7YRqp3vgagbRqw=",4127 "dev": true,4128 "requires": {4129 "babel-helper-function-name": "^6.24.1",4130 "babel-plugin-syntax-class-properties": "^6.8.0",4131 "babel-runtime": "^6.22.0",4132 "babel-template": "^6.24.1"4133 }4134 },4135 "babel-plugin-transform-decorators": {4136 "version": "6.24.1",4137 "resolved": "https://registry.npmjs.org/babel-plugin-transform-decorators/-/babel-plugin-transform-decorators-6.24.1.tgz",4138 "integrity": "sha1-eIAT2PjGtSIr33s0Q5Df13Vp4k0=",4139 "dev": true,4140 "requires": {4141 "babel-helper-explode-class": "^6.24.1",4142 "babel-plugin-syntax-decorators": "^6.13.0",4143 "babel-runtime": "^6.22.0",4144 "babel-template": "^6.24.1",4145 "babel-types": "^6.24.1"4146 }4147 },4148 "babel-plugin-transform-do-expressions": {4149 "version": "6.22.0",4150 "resolved": "https://registry.npmjs.org/babel-plugin-transform-do-expressions/-/babel-plugin-transform-do-expressions-6.22.0.tgz",4151 "integrity": "sha1-KMyvkoEtlJws0SgfaQyP3EaK6bs=",4152 "dev": true,4153 "requires": {4154 "babel-plugin-syntax-do-expressions": "^6.8.0",4155 "babel-runtime": "^6.22.0"4156 }4157 },4158 3960 "babel-plugin-transform-es2015-arrow-functions": { 4159 3961 "version": "6.22.0", … … 4366 4168 "babel-runtime": "^6.22.0", 4367 4169 "regexpu-core": "^2.0.0" 4368 }4369 },4370 "babel-plugin-transform-exponentiation-operator": {4371 "version": "6.24.1",4372 "resolved": "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz",4373 "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=",4374 "dev": true,4375 "requires": {4376 "babel-helper-builder-binary-assignment-operator-visitor": "^6.24.1",4377 "babel-plugin-syntax-exponentiation-operator": "^6.8.0",4378 "babel-runtime": "^6.22.0"4379 }4380 },4381 "babel-plugin-transform-export-extensions": {4382 "version": "6.22.0",4383 "resolved": "https://registry.npmjs.org/babel-plugin-transform-export-extensions/-/babel-plugin-transform-export-extensions-6.22.0.tgz",4384 "integrity": "sha1-U3OLR+deghhYnuqUbLvTkQm75lM=",4385 "dev": true,4386 "requires": {4387 "babel-plugin-syntax-export-extensions": "^6.8.0",4388 "babel-runtime": "^6.22.0"4389 }4390 },4391 "babel-plugin-transform-function-bind": {4392 "version": "6.22.0",4393 "resolved": "https://registry.npmjs.org/babel-plugin-transform-function-bind/-/babel-plugin-transform-function-bind-6.22.0.tgz",4394 "integrity": "sha1-xvuOlqwpajELjPjqQBRiQH3fapc=",4395 "dev": true,4396 "requires": {4397 "babel-plugin-syntax-function-bind": "^6.8.0",4398 "babel-runtime": "^6.22.0"4399 }4400 },4401 "babel-plugin-transform-object-rest-spread": {4402 "version": "6.26.0",4403 "resolved": "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz",4404 "integrity": "sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=",4405 "dev": true,4406 "requires": {4407 "babel-plugin-syntax-object-rest-spread": "^6.8.0",4408 "babel-runtime": "^6.26.0"4409 4170 } 4410 4171 }, … … 4467 4228 } 4468 4229 }, 4469 "babel-preset-stage-0": {4470 "version": "6.24.1",4471 "resolved": "https://registry.npmjs.org/babel-preset-stage-0/-/babel-preset-stage-0-6.24.1.tgz",4472 "integrity": "sha1-VkLRUEL5E4TX5a+LyIsduVsDnmo=",4473 "dev": true,4474 "requires": {4475 "babel-plugin-transform-do-expressions": "^6.22.0",4476 "babel-plugin-transform-function-bind": "^6.22.0",4477 "babel-preset-stage-1": "^6.24.1"4478 }4479 },4480 "babel-preset-stage-1": {4481 "version": "6.24.1",4482 "resolved": "https://registry.npmjs.org/babel-preset-stage-1/-/babel-preset-stage-1-6.24.1.tgz",4483 "integrity": "sha1-dpLNfc1oSZB+auSgqFWJz7niv7A=",4484 "dev": true,4485 "requires": {4486 "babel-plugin-transform-class-constructor-call": "^6.24.1",4487 "babel-plugin-transform-export-extensions": "^6.22.0",4488 "babel-preset-stage-2": "^6.24.1"4489 }4490 },4491 "babel-preset-stage-2": {4492 "version": "6.24.1",4493 "resolved": "https://registry.npmjs.org/babel-preset-stage-2/-/babel-preset-stage-2-6.24.1.tgz",4494 "integrity": "sha1-2eKWD7PXEYfw5k7sYrwHdnIZvcE=",4495 "dev": true,4496 "requires": {4497 "babel-plugin-syntax-dynamic-import": "^6.18.0",4498 "babel-plugin-transform-class-properties": "^6.24.1",4499 "babel-plugin-transform-decorators": "^6.24.1",4500 "babel-preset-stage-3": "^6.24.1"4501 }4502 },4503 "babel-preset-stage-3": {4504 "version": "6.24.1",4505 "resolved": "https://registry.npmjs.org/babel-preset-stage-3/-/babel-preset-stage-3-6.24.1.tgz",4506 "integrity": "sha1-g2raCp56f6N8sTj7kyb4eTSkg5U=",4507 "dev": true,4508 "requires": {4509 "babel-plugin-syntax-trailing-function-commas": "^6.22.0",4510 "babel-plugin-transform-async-generator-functions": "^6.24.1",4511 "babel-plugin-transform-async-to-generator": "^6.24.1",4512 "babel-plugin-transform-exponentiation-operator": "^6.24.1",4513 "babel-plugin-transform-object-rest-spread": "^6.22.0"4514 }4515 },4516 4230 "babel-register": { 4517 4231 "version": "6.26.0", … … 6171 5885 } 6172 5886 }, 6173 "copyfiles": {6174 "version": "2.1.1",6175 "resolved": "https://registry.npmjs.org/copyfiles/-/copyfiles-2.1.1.tgz",6176 "integrity": "sha512-y6DZHve80whydXzBal7r70TBgKMPKesVRR1Sn/raUu7Jh/i7iSLSyGvYaq0eMJ/3Y/CKghwzjY32q1WzEnpp3Q==",6177 "dev": true,6178 "requires": {6179 "glob": "^7.0.5",6180 "minimatch": "^3.0.3",6181 "mkdirp": "^0.5.1",6182 "noms": "0.0.0",6183 "through2": "^2.0.1",6184 "yargs": "^13.2.4"6185 },6186 "dependencies": {6187 "ansi-regex": {6188 "version": "4.1.0",6189 "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",6190 "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",6191 "dev": true6192 },6193 "ansi-styles": {6194 "version": "3.2.1",6195 "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",6196 "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",6197 "dev": true,6198 "requires": {6199 "color-convert": "^1.9.0"6200 }6201 },6202 "camelcase": {6203 "version": "5.3.1",6204 "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",6205 "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",6206 "dev": true6207 },6208 "cliui": {6209 "version": "5.0.0",6210 "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",6211 "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",6212 "dev": true,6213 "requires": {6214 "string-width": "^3.1.0",6215 "strip-ansi": "^5.2.0",6216 "wrap-ansi": "^5.1.0"6217 }6218 },6219 "find-up": {6220 "version": "3.0.0",6221 "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",6222 "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",6223 "dev": true,6224 "requires": {6225 "locate-path": "^3.0.0"6226 }6227 },6228 "get-caller-file": {6229 "version": "2.0.5",6230 "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",6231 "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",6232 "dev": true6233 },6234 "locate-path": {6235 "version": "3.0.0",6236 "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",6237 "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",6238 "dev": true,6239 "requires": {6240 "p-locate": "^3.0.0",6241 "path-exists": "^3.0.0"6242 }6243 },6244 "p-limit": {6245 "version": "2.2.0",6246 "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz",6247 "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",6248 "dev": true,6249 "requires": {6250 "p-try": "^2.0.0"6251 }6252 },6253 "p-locate": {6254 "version": "3.0.0",6255 "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",6256 "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",6257 "dev": true,6258 "requires": {6259 "p-limit": "^2.0.0"6260 }6261 },6262 "p-try": {6263 "version": "2.2.0",6264 "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",6265 "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",6266 "dev": true6267 },6268 "require-main-filename": {6269 "version": "2.0.0",6270 "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",6271 "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",6272 "dev": true6273 },6274 "string-width": {6275 "version": "3.1.0",6276 "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",6277 "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",6278 "dev": true,6279 "requires": {6280 "emoji-regex": "^7.0.1",6281 "is-fullwidth-code-point": "^2.0.0",6282 "strip-ansi": "^5.1.0"6283 }6284 },6285 "strip-ansi": {6286 "version": "5.2.0",6287 "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",6288 "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",6289 "dev": true,6290 "requires": {6291 "ansi-regex": "^4.1.0"6292 }6293 },6294 "wrap-ansi": {6295 "version": "5.1.0",6296 "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",6297 "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",6298 "dev": true,6299 "requires": {6300 "ansi-styles": "^3.2.0",6301 "string-width": "^3.0.0",6302 "strip-ansi": "^5.0.0"6303 }6304 },6305 "y18n": {6306 "version": "4.0.0",6307 "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",6308 "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",6309 "dev": true6310 },6311 "yargs": {6312 "version": "13.3.0",6313 "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz",6314 "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==",6315 "dev": true,6316 "requires": {6317 "cliui": "^5.0.0",6318 "find-up": "^3.0.0",6319 "get-caller-file": "^2.0.1",6320 "require-directory": "^2.1.1",6321 "require-main-filename": "^2.0.0",6322 "set-blocking": "^2.0.0",6323 "string-width": "^3.0.0",6324 "which-module": "^2.0.0",6325 "y18n": "^4.0.0",6326 "yargs-parser": "^13.1.1"6327 }6328 },6329 "yargs-parser": {6330 "version": "13.1.1",6331 "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz",6332 "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==",6333 "dev": true,6334 "requires": {6335 "camelcase": "^5.0.0",6336 "decamelize": "^1.2.0"6337 }6338 }6339 }6340 },6341 5887 "core-js": { 6342 5888 "version": "3.1.4", … … 6452 5998 } 6453 5999 }, 6454 "cross-env": {6455 "version": "5.2.0",6456 "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz",6457 "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==",6458 "dev": true,6459 "requires": {6460 "cross-spawn": "^6.0.5",6461 "is-windows": "^1.0.0"6462 },6463 "dependencies": {6464 "cross-spawn": {6465 "version": "6.0.5",6466 "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",6467 "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",6468 "dev": true,6469 "requires": {6470 "nice-try": "^1.0.4",6471 "path-key": "^2.0.1",6472 "semver": "^5.5.0",6473 "shebang-command": "^1.2.0",6474 "which": "^1.2.9"6475 }6476 }6477 }6478 },6479 6000 "cross-spawn": { 6480 6001 "version": "5.1.0", … … 6485 6006 "shebang-command": "^1.2.0", 6486 6007 "which": "^1.2.9" 6487 }6488 },6489 "cross-var": {6490 "version": "1.1.0",6491 "resolved": "https://registry.npmjs.org/cross-var/-/cross-var-1.1.0.tgz",6492 "integrity": "sha1-8PDUuyNdlRONGlOYQtKQ8A23HNY=",6493 "dev": true,6494 "requires": {6495 "babel-preset-es2015": "^6.18.0",6496 "babel-preset-stage-0": "^6.16.0",6497 "babel-register": "^6.18.0",6498 "cross-spawn": "^5.0.1",6499 "exit": "^0.1.2"6500 6008 } 6501 6009 }, … … 7610 7118 } 7611 7119 }, 7612 "dotenv-cli": { 7613 "version": "2.0.1", 7614 "resolved": "https://registry.npmjs.org/dotenv-cli/-/dotenv-cli-2.0.1.tgz", 7615 "integrity": "sha512-RnjvnE+r27ni9j93w1ddMs9mQgxWlRozSfby7M4xVDJ5/DgLOFFAP92JrmXHkpn8dXCy+OObRx+w5wx0Dc3yww==", 7616 "dev": true, 7617 "requires": { 7618 "cross-spawn": "^4.0.0", 7619 "dotenv": "^7.0.0", 7620 "dotenv-expand": "^5.0.0", 7621 "minimist": "^1.1.3" 7622 }, 7623 "dependencies": { 7624 "cross-spawn": { 7625 "version": "4.0.2", 7626 "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz", 7627 "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=", 7628 "dev": true, 7629 "requires": { 7630 "lru-cache": "^4.0.1", 7631 "which": "^1.2.9" 7632 } 7633 }, 7634 "dotenv": { 7635 "version": "7.0.0", 7636 "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-7.0.0.tgz", 7637 "integrity": "sha512-M3NhsLbV1i6HuGzBUH8vXrtxOk+tWmzWKDMbAVSUp3Zsjm7ywFeuwrUXhmhQyRK1q5B5GGy7hcXPbj3bnfZg2g==", 7638 "dev": true 7639 }, 7640 "minimist": { 7641 "version": "1.2.0", 7642 "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", 7643 "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", 7644 "dev": true 7645 } 7646 } 7120 "dotenv": { 7121 "version": "8.0.0", 7122 "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.0.0.tgz", 7123 "integrity": "sha512-30xVGqjLjiUOArT4+M5q9sYdvuR4riM6yK9wMcas9Vbp6zZa+ocC9dp6QoftuhTPhFAiLK/0C5Ni2nou/Bk8lg==", 7124 "dev": true 7647 7125 }, 7648 7126 "dotenv-expand": { … … 16143 15621 "dev": true, 16144 15622 "optional": true 16145 },16146 "noms": {16147 "version": "0.0.0",16148 "resolved": "https://registry.npmjs.org/noms/-/noms-0.0.0.tgz",16149 "integrity": "sha1-2o69nzr51nYJGbJ9nNyAkqczKFk=",16150 "dev": true,16151 "requires": {16152 "inherits": "^2.0.1",16153 "readable-stream": "~1.0.31"16154 },16155 "dependencies": {16156 "isarray": {16157 "version": "0.0.1",16158 "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",16159 "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",16160 "dev": true16161 },16162 "readable-stream": {16163 "version": "1.0.34",16164 "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",16165 "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",16166 "dev": true,16167 "requires": {16168 "core-util-is": "~1.0.0",16169 "inherits": "~2.0.1",16170 "isarray": "0.0.1",16171 "string_decoder": "~0.10.x"16172 }16173 },16174 "string_decoder": {16175 "version": "0.10.31",16176 "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",16177 "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",16178 "dev": true16179 }16180 }16181 15623 }, 16182 15624 "nopt": { -
trunk/package.json
r45769 r45783 23 23 "check-node-version": "3.2.0", 24 24 "copy-webpack-plugin": "^4.6.0", 25 "copyfiles": "2.1.1",26 25 "core-js": "3.1.4", 27 "cross-env": "5.2.0",28 "cross-var": "1.1.0",29 26 "cssnano": "4.1.8", 30 "dotenv-cli": "2.0.1", 27 "dotenv": "8.0.0", 28 "dotenv-expand": "5.1.0", 31 29 "grunt": "~1.0.3", 32 30 "grunt-banner": "^0.6.0", … … 130 128 "watch": "grunt watch", 131 129 "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" 156 140 } 157 141 } -
trunk/tools/local-env/default.template
r45745 r45783 14 14 root /var/www/${LOCAL_DIR}; 15 15 16 absolute_redirect off; 17 16 18 location / { 17 19 try_files $uri $uri/ /index.php?$args; -
trunk/tools/local-env/docker-compose.yml
r45762 r45783 19 19 20 20 volumes: 21 - ./ default.template:/etc/nginx/conf.d/default.template22 - . ./../:/var/www21 - ./tools/local-env/default.template:/etc/nginx/conf.d/default.template 22 - ./:/var/www 23 23 24 24 # Load our config file, substituning environment variables into the config. … … 42 42 43 43 volumes: 44 - ./ php-config.ini:/usr/local/etc/php/conf.d/php-config.ini45 - . ./../:/var/www44 - ./tools/local-env/php-config.ini:/usr/local/etc/php/conf.d/php-config.ini 45 - ./:/var/www 46 46 47 47 depends_on: … … 61 61 62 62 volumes: 63 - ./ mysql-init.sql:/docker-entrypoint-initdb.d/mysql-init.sql63 - ./tools/local-env/mysql-init.sql:/docker-entrypoint-initdb.d/mysql-init.sql 64 64 - mysql:/var/lib/mysql 65 65 … … 67 67 command: --default-authentication-plugin=mysql_native_password 68 68 69 ## 70 # The WP CLI container. 71 ## 72 cli: 73 image: wordpressdevelop/cli:${LOCAL_PHP-latest} 74 75 networks: 76 - wpdevnet 77 78 environment: 79 LOCAL_PHP_XDEBUG: ${LOCAL_PHP_XDEBUG-false} 80 LOCAL_PHP_MEMCACHED: ${LOCAL_PHP_MEMCACHED-false} 81 82 volumes: 83 - ./:/var/www 84 85 # The init directive ensures the command runs with a PID > 1, so Ctrl+C works correctly. 86 init: true 87 88 ## 89 # The PHPUnit container. 90 ## 91 phpunit: 92 image: wordpressdevelop/phpunit:${LOCAL_PHP-latest} 93 94 networks: 95 - wpdevnet 96 97 environment: 98 LOCAL_PHP_XDEBUG: ${LOCAL_PHP_XDEBUG-false} 99 LOCAL_PHP_MEMCACHED: ${LOCAL_PHP_MEMCACHED-false} 100 101 volumes: 102 - ./tools/local-env/phpunit-config.ini:/usr/local/etc/php/conf.d/phpunit-config.ini 103 - ./:/wordpress-develop 104 - phpunit-uploads:/wordpress-develop/${LOCAL_DIR-src}/wp-content/uploads 105 106 # The init directive ensures the command runs with a PID > 1, so Ctrl+C works correctly. 107 init: true 108 109 depends_on: 110 - mysql 111 69 112 volumes: 70 113 # So that sites aren't wiped every time containers are restarted, MySQL uses a persistent volume. 71 114 mysql: {} 115 # Using a volume for the uploads directory improves PHPUnit performance. 116 phpunit-uploads: {} 72 117 73 118 networks:
Note: See TracChangeset
for help on using the changeset viewer.