Changeset 50622
- Timestamp:
- 03/31/2021 07:20:38 PM (4 years ago)
- Location:
- branches/5.1
- Files:
-
- 2 added
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/5.1
- Property svn:mergeinfo changed
/trunk merged: 45317,50267,50379,50387,50413,50416,50432,50435-50436,50444,50446,50473-50474,50476,50479,50485-50487,50545,50579,50590,50598
- Property svn:mergeinfo changed
-
branches/5.1/.github/workflows/coding-standards.yml
r50306 r50622 2 2 3 3 on: 4 # JSHint was introduced in WordPress 3.8. 5 # PHPCS checking was introduced in WordPress 5.1. 4 6 push: 5 7 branches: 6 8 - master 7 # JSHint was introduced in WordPress 3.8. 8 # PHPCS checking was introduced in WordPress 5.1. 9 - trunk 9 10 - '3.[89]' 10 11 - '[4-9].[0-9]' … … 13 14 - '[4-9].[0-9]*' 14 15 pull_request: 16 branches: 17 - master 18 - trunk 19 - '3.[89]' 20 - '[4-9].[0-9]' 21 paths: 22 # Any change to a PHP or JavaScript file should run checks. 23 - '**.js' 24 - '**.php' 25 # These files configure NPM. Changes could affect the outcome. 26 - 'package*.json' 27 # These files configure Composer. Changes could affect the outcome. 28 - 'composer.*' 29 # This file configures JSHint. Changes could affect the outcome. 30 - '.jshintrc' 31 # This file configures PHPCS. Changes could affect the outcome. 32 - 'phpcs.xml.dist' 33 # Changes to workflow files should always verify all workflows are successful. 34 - '.github/workflows/*.yml' 35 workflow_dispatch: 15 36 16 37 jobs: … … 36 57 steps: 37 58 - name: Checkout repository 38 uses: actions/checkout@ v259 uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4 39 60 40 61 - name: Set up PHP 41 uses: shivammathur/setup-php@ v262 uses: shivammathur/setup-php@afefcaf556d98dc7896cca380e181decb609ca44 # v2.10.0 42 63 with: 43 64 php-version: '7.2' … … 51 72 52 73 - name: Install Composer dependencies 53 uses: ramsey/composer-install@ v174 uses: ramsey/composer-install@92a7904348d4ad30236f3611e33b7f0c6f9edd70 # v1.1.0 54 75 with: 55 76 composer-options: "--no-progress --no-ansi --no-interaction" … … 86 107 steps: 87 108 - name: Checkout repository 88 uses: actions/checkout@ v2109 uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4 89 110 90 111 - name: Log debug information … … 96 117 97 118 - name: Install NodeJS 98 uses: actions/setup-node@ v1119 uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5 99 120 with: 100 121 node-version: 14 101 122 102 123 - name: Cache NodeJS modules 103 uses: actions/cache@ v2124 uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4 104 125 env: 105 126 cache-name: cache-node-modules … … 108 129 path: ~/.npm 109 130 key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }} 110 restore-keys: |111 ${{ runner.os }}-npm-112 131 113 132 - name: Log debug information … … 117 136 118 137 - name: Install Dependencies 119 run: np x install-changed --install-command="npm ci"138 run: npm ci 120 139 121 140 - name: Run JSHint -
branches/5.1/.github/workflows/end-to-end-tests.yml
r50306 r50622 2 2 3 3 on: 4 # The end to end test suite was introduced in WordPress 5.3. 4 5 push: 5 6 branches: 6 7 - master 7 # The end to end test suite was introduced in WordPress 5.3.8 - trunk 8 9 - '5.[3-9]' 9 10 - '[6-9].[0-9]' … … 12 13 - '[6-9].[0-9]*' 13 14 pull_request: 15 branches: 16 - master 17 - trunk 18 - '5.[3-9]' 19 - '[6-9].[0-9]' 20 workflow_dispatch: 14 21 15 22 env: … … 43 50 - name: Cancel previous runs of this workflow (pull requests only) 44 51 if: ${{ github.event_name == 'pull_request' }} 45 uses: styfle/cancel-workflow-action@0.5.0 46 with: 47 access_token: ${{ github.token }} 52 uses: styfle/cancel-workflow-action@3d86a7cc43670094ac248017207be0295edbc31d # v0.8.0 48 53 49 54 - name: Configure environment variables … … 53 58 54 59 - name: Checkout repository 55 uses: actions/checkout@ v260 uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4 56 61 57 62 - name: Log debug information … … 67 72 68 73 - name: Install NodeJS 69 uses: actions/setup-node@ v174 uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5 70 75 with: 71 76 node-version: 14 72 77 73 78 - name: Cache NodeJS modules 74 uses: actions/cache@ v279 uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4 75 80 env: 76 81 cache-name: cache-node-modules … … 79 84 path: ~/.npm 80 85 key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }} 81 restore-keys: |82 ${{ runner.os }}-npm-83 86 84 87 - name: Install Dependencies 85 run: np x install-changed --install-command="npm ci"88 run: npm ci 86 89 87 90 - name: Build WordPress -
branches/5.1/.github/workflows/javascript-tests.yml
r50306 r50622 2 2 3 3 on: 4 # JavaScript testing was introduced in WordPress 3.8. 4 5 push: 5 6 branches: 6 7 - master 7 # JavaScript testing was introduced in WordPress 3.8.8 - trunk 8 9 - '3.[89]' 9 10 - '[4-9].[0-9]' … … 12 13 - '[4-9].[0-9]*' 13 14 pull_request: 15 branches: 16 - master 17 - trunk 18 - '3.[89]' 19 - '[4-9].[0-9]' 20 paths: 21 # Any change to a JavaScript file should run tests. 22 - '**.js' 23 # These files configure NPM. Changes could affect the outcome. 24 - 'package*.json' 25 # This file configures ESLint. Changes could affect the outcome. 26 - '.eslintignore' 27 # This file configures JSHint. Changes could affect the outcome. 28 - '.jshintrc' 29 # Any change to the QUnit directory should run tests. 30 - 'tests/qunit/**' 31 # Changes to workflow files should always verify all workflows are successful. 32 - '.github/workflows/*.yml' 33 workflow_dispatch: 14 34 15 35 jobs: … … 34 54 - name: Cancel previous runs of this workflow (pull requests only) 35 55 if: ${{ github.event_name == 'pull_request' }} 36 uses: styfle/cancel-workflow-action@0.5.0 37 with: 38 access_token: ${{ github.token }} 56 uses: styfle/cancel-workflow-action@3d86a7cc43670094ac248017207be0295edbc31d # v0.8.0 39 57 40 58 - name: Checkout repository 41 uses: actions/checkout@ v259 uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4 42 60 43 61 - name: Log debug information … … 49 67 50 68 - name: Install NodeJS 51 uses: actions/setup-node@ v169 uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5 52 70 with: 53 71 node-version: 14 54 72 55 73 - name: Cache NodeJS modules 56 uses: actions/cache@ v274 uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4 57 75 env: 58 76 cache-name: cache-node-modules … … 61 79 path: ~/.npm 62 80 key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }} 63 restore-keys: |64 ${{ runner.os }}-npm-65 81 66 82 - name: Log debug information … … 70 86 71 87 - name: Install Dependencies 72 run: np x install-changed --install-command="npm ci"88 run: npm ci 73 89 74 90 - name: Run QUnit tests -
branches/5.1/.github/workflows/php-compatibility.yml
r50306 r50622 2 2 3 3 on: 4 # PHP compatibility testing was introduced in WordPress 5.5. 4 5 push: 5 6 branches: 6 7 - master 7 # The PHP compatibility testing was introduced in WordPress 5.5.8 - trunk 8 9 - '5.[5-9]' 9 10 - '[6-9].[0-9]' … … 12 13 - '[6-9].[0-9]*' 13 14 pull_request: 15 branches: 16 - master 17 - trunk 18 - '5.[5-9]' 19 - '[6-9].[0-9]' 20 paths: 21 # This workflow only scans PHP files. 22 - '**.php' 23 # These files configure Composer. Changes could affect the outcome. 24 - 'composer.*' 25 # This file configures PHP Compatibility scanning. Changes could affect the outcome. 26 - 'phpcompat.xml.dist' 27 # Changes to workflow files should always verify all workflows are successful. 28 - '.github/workflows/*.yml' 29 workflow_dispatch: 14 30 15 31 jobs: … … 35 51 steps: 36 52 - name: Checkout repository 37 uses: actions/checkout@ v253 uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4 38 54 39 55 - name: Set up PHP 40 uses: shivammathur/setup-php@ v256 uses: shivammathur/setup-php@afefcaf556d98dc7896cca380e181decb609ca44 # v2.10.0 41 57 with: 42 58 php-version: '7.4' … … 50 66 51 67 - name: Install Composer dependencies 52 uses: ramsey/composer-install@ v168 uses: ramsey/composer-install@92a7904348d4ad30236f3611e33b7f0c6f9edd70 # v1.1.0 53 69 with: 54 70 composer-options: "--no-progress --no-ansi --no-interaction" -
branches/5.1/.github/workflows/phpunit-tests.yml
r50335 r50622 5 5 branches: 6 6 - master 7 - trunk 7 8 - '3.[7-9]' 8 9 - '[4-9].[0-9]' … … 11 12 - '[4-9].[0-9]*' 12 13 pull_request: 14 branches: 15 - master 16 - trunk 17 - '3.[7-9]' 18 - '[4-9].[0-9]' 19 workflow_dispatch: 13 20 # Once weekly On Sundays at 00:00 UTC. 14 21 schedule: … … 22 29 PHPUNIT_SCRIPT: php 23 30 LOCAL_PHP_MEMCACHED: ${{ false }} 31 SLOW_TESTS: 'external-http,media,restapi' 24 32 25 33 jobs: … … 44 52 - name: Cancel previous runs of this workflow (pull requests only) 45 53 if: ${{ github.event_name == 'pull_request' }} 46 uses: styfle/cancel-workflow-action@0.5.0 47 with: 48 access_token: ${{ github.token }} 54 uses: styfle/cancel-workflow-action@3d86a7cc43670094ac248017207be0295edbc31d # v0.8.0 49 55 50 56 - name: Checkout repository 51 uses: actions/checkout@ v257 uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4 52 58 53 59 - name: Log debug information … … 65 71 66 72 - name: Install NodeJS 67 uses: actions/setup-node@ v173 uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5 68 74 with: 69 75 node-version: 14 70 76 71 77 - name: Cache NodeJS modules 72 uses: actions/cache@ v278 uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4 73 79 env: 74 80 cache-name: cache-node-modules … … 77 83 path: ~/.npm 78 84 key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }} 79 restore-keys: |80 ${{ runner.os }}-npm-81 85 82 86 - name: Install Dependencies 83 run: np x install-changed --install-command="npm ci"87 run: npm ci 84 88 85 89 - name: Build WordPress … … 87 91 88 92 - name: Create ZIP artifact 89 uses: thedoctor0/zip-release@ 0.4.193 uses: thedoctor0/zip-release@a1afcab9c664c9976ac398fa831eac67bed1eb0e # v0.4.1 90 94 with: 91 95 filename: built-wp-${{ github.sha }}.zip … … 93 97 94 98 - name: Upload build artifact 95 uses: actions/upload-artifact@ v299 uses: actions/upload-artifact@e448a9b857ee2131e752b06002bf0e093c65e571 # v2.2.2 96 100 with: 97 101 name: built-wp-${{ github.sha }} … … 125 129 # - todo: Configure Slack notifications for failing tests. 126 130 test-php: 127 name: ${{ matrix.php }}${{ matrix.m emcached && ' with memcached' || '' }} on ${{ matrix.os }}131 name: ${{ matrix.php }}${{ matrix.multisite && ' multisite' || '' }}${{ matrix.split_slow && ' slow tests' || '' }} ${{ matrix.memcached && ' with memcached' || '' }} on ${{ matrix.os }} 128 132 needs: setup-wordpress 129 133 runs-on: ${{ matrix.os }} 130 134 strategy: 135 fail-fast: false 131 136 matrix: 132 php: [ '7.3' ] 133 phpunit: [ '7.3' ] 137 php: [ '5.3', '5.4', '5.5', '7.1', '7.2', '7.3' ] 134 138 os: [ ubuntu-latest ] 135 139 memcached: [ false ] 140 split_slow: [ false ] 141 multisite: [ false, true ] 136 142 include: 137 # Include job for PHP 7.3 with memcached.143 # Include jobs for PHP 7.3 with memcached. 138 144 - php: '7.3' 139 phpunit: '7.3' 140 os: ubuntu-latest 141 memcached: false 142 - php: '7.2' 143 phpunit: '7.2' 144 os: ubuntu-latest 145 memcached: false 146 - php: '7.1' 147 phpunit: '7.1' 148 os: ubuntu-latest 149 memcached: false 145 os: ubuntu-latest 146 memcached: true 147 split_slow: false 148 multisite: false 149 - php: '7.3' 150 os: ubuntu-latest 151 memcached: true 152 split_slow: false 153 multisite: true 154 # Include jobs when specific PHPUnit versions are required. 150 155 - php: '7.0' 151 156 phpunit: '6-php-7.0' 152 157 os: ubuntu-latest 153 158 memcached: false 159 multisite: false 160 - php: '7.0' 161 phpunit: '6-php-7.0' 162 os: ubuntu-latest 163 memcached: false 164 multisite: true 154 165 - php: '5.6' 155 166 phpunit: '4-php-5.6' 156 167 os: ubuntu-latest 157 168 memcached: false 169 multisite: false 170 - php: '5.6' 171 phpunit: '4-php-5.6' 172 os: ubuntu-latest 173 memcached: false 174 multisite: true 175 # Additional "slow" jobs for PHP <= 5.6. 176 - php: '5.6' 177 phpunit: '4-php-5.6' 178 os: ubuntu-latest 179 memcached: false 180 split_slow: true 181 multisite: false 182 - php: '5.6' 183 phpunit: '4-php-5.6' 184 os: ubuntu-latest 185 memcached: false 186 split_slow: true 187 multisite: true 158 188 - php: '5.5' 159 phpunit: '5.5' 160 os: ubuntu-latest 161 memcached: false 189 os: ubuntu-latest 190 memcached: false 191 split_slow: true 192 multisite: false 193 - php: '5.5' 194 os: ubuntu-latest 195 memcached: false 196 split_slow: true 197 multisite: true 162 198 - php: '5.4' 163 phpunit: '5.4' 164 os: ubuntu-latest 165 memcached: false 199 os: ubuntu-latest 200 memcached: false 201 split_slow: true 202 multisite: false 203 - php: '5.4' 204 os: ubuntu-latest 205 memcached: false 206 split_slow: true 207 multisite: true 166 208 - php: '5.3' 167 phpunit: '5.3' 168 os: ubuntu-latest 169 memcached: false 209 os: ubuntu-latest 210 memcached: false 211 split_slow: true 212 multisite: false 213 - php: '5.3' 214 os: ubuntu-latest 215 memcached: false 216 split_slow: true 217 multisite: true 218 170 219 env: 171 220 LOCAL_PHP: ${{ matrix.php }}-fpm 172 LOCAL_PHPUNIT: ${{ matrix.phpunit }}-fpm221 LOCAL_PHPUNIT: ${{ matrix.phpunit && matrix.phpunit || matrix.php }}-fpm 173 222 LOCAL_PHP_MEMCACHED: ${{ matrix.memcached }} 223 PHPUNIT_CONFIG: ${{ matrix.multisite && 'tests/phpunit/multisite.xml' || 'phpunit.xml.dist' }} 174 224 175 225 steps: … … 180 230 181 231 - name: Download the built WordPress artifact 182 uses: actions/download-artifact@ v2232 uses: actions/download-artifact@4a7a711286f30c025902c28b541c10e147a9b843 # v2.0.8 183 233 with: 184 234 name: built-wp-${{ github.sha }} … … 188 238 189 239 - name: Install NodeJS 190 uses: actions/setup-node@ v1240 uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5 191 241 with: 192 242 node-version: 14 193 243 194 244 - name: Use cached Node modules 195 uses: actions/cache@ v2245 uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4 196 246 env: 197 247 cache-name: cache-node-modules … … 200 250 path: ~/.npm 201 251 key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }} 202 restore-keys: |203 ${{ runner.os }}-npm-204 252 205 253 - name: Install Dependencies 206 run: np x install-changed --install-command="npm ci"254 run: npm ci 207 255 208 256 - name: Cache Composer dependencies 209 257 if: ${{ env.COMPOSER_INSTALL == true }} 210 uses: actions/cache@ v2258 uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4 211 259 env: 212 260 cache-name: cache-composer-dependencies … … 214 262 path: ${{ steps.composer-cache.outputs.dir }} 215 263 key: ${{ runner.os }}-php-${{ matrix.php }}-composer-${{ hashFiles('**/composer.lock') }} 216 restore-keys: |217 ${{ runner.os }}-php-${{ matrix.php }}-composer-218 264 219 265 - name: Install Composer dependencies … … 261 307 run: npm run env:install 262 308 309 - name: Run slow PHPUnit tests 310 if: ${{ matrix.split_slow }} 311 run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c ${{ env.PHPUNIT_CONFIG }} --group ${{ env.SLOW_TESTS }} 312 313 - name: Run PHPUnit tests for single site excluding slow tests 314 if: ${{ matrix.php < '7.0' && ! matrix.split_slow && ! matrix.multisite }} 315 run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c ${{ env.PHPUNIT_CONFIG }} --exclude-group ${{ env.SLOW_TESTS }},ajax,ms-files,ms-required 316 317 - name: Run PHPUnit tests for Multisite excluding slow tests 318 if: ${{ matrix.php < '7.0' && ! matrix.split_slow && matrix.multisite }} 319 run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c ${{ env.PHPUNIT_CONFIG }} --exclude-group ${{ env.SLOW_TESTS }},ajax,ms-files,ms-excluded,oembed-headers 320 263 321 - name: Run PHPUnit tests 264 run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c phpunit.xml.dist 322 if: ${{ matrix.php >= '7.0' }} 323 run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c ${{ env.PHPUNIT_CONFIG }} 265 324 266 325 - name: Run AJAX tests 267 run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c phpunit.xml.dist --group ajax 268 269 - name: Run tests as a multisite install 270 run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c tests/phpunit/multisite.xml 326 if: ${{ ! matrix.multisite && ! matrix.split_slow }} 327 run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c ${{ env.PHPUNIT_CONFIG }} --group ajax 271 328 272 329 - name: Run ms-files tests as a multisite install 330 if: ${{ matrix.multisite && ! matrix.split_slow }} 273 331 run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c tests/phpunit/multisite.xml --group ms-files 274 332 275 333 - name: Run external HTTP tests 334 if: ${{ ! matrix.multisite && ! matrix.split_slow }} 276 335 run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c phpunit.xml.dist --group external-http 277 278 - name: Run REST API tests279 run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c phpunit.xml.dist --group restapi-jsclient280 336 281 337 - name: Checkout the WordPress Test Reporter 282 338 if: ${{ github.repository == 'WordPress/wordpress-develop' && github.ref == 'refs/heads/master' && matrix.report }} 283 uses: actions/checkout@ v2339 uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4 284 340 with: 285 341 repository: 'WordPress/phpunit-test-runner' -
branches/5.1/.github/workflows/welcome-new-contributors.yml
r50306 r50622 12 12 13 13 steps: 14 - uses: bubkoo/welcome-action@ v114 - uses: bubkoo/welcome-action@8dbbac2540d155744c90e4e37da6b05ffc9c5e2c # v1.0.3 15 15 with: 16 16 GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} -
branches/5.1/Gruntfile.js
r50199 r50622 485 485 'wp-admin/css/*.css', 486 486 'wp-includes/css/*.css', 487 488 // Exclude minified and already processed files, and files from external packages. 489 // These are present when running `grunt build` after `grunt --dev`. 490 '!wp-admin/css/*-rtl.css', 491 '!wp-includes/css/*-rtl.css', 492 '!wp-admin/css/*.min.css', 493 '!wp-includes/css/*.min.css', 494 '!wp-includes/css/dist', 487 495 488 496 // Exceptions -
branches/5.1/package-lock.json
r50199 r50622 81 81 }, 82 82 "@sideway/address": { 83 "version": "4.1. 0",84 "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1. 0.tgz",85 "integrity": "sha512- wAH/JYRXeIFQRsxerIuLjgUu2Xszam+O5xKeatJ4oudShOOirfmsQ1D6LL54XOU2tizpCYku+s1wmU0SYdpoSA==",83 "version": "4.1.1", 84 "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.1.tgz", 85 "integrity": "sha512-+I5aaQr3m0OAmMr7RQ3fR9zx55sejEYR2BFJaxL+zT3VM2611X0SHvPWIbAUBZVTn/YzYKbV8gJ2oT/QELknfQ==", 86 86 "dev": true, 87 87 "requires": { … … 3096 3096 }, 3097 3097 "clean-css": { 3098 "version": " 4.2.1",3099 "resolved": "https://registry.npmjs.org/clean-css/-/clean-css- 4.2.1.tgz",3100 "integrity": "sha512- 4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==",3098 "version": "5.1.2", 3099 "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.1.2.tgz", 3100 "integrity": "sha512-QcaGg9OuMo+0Ds933yLOY+gHPWbxhxqF0HDexmToPf8pczvmvZGYzd+QqWp9/mkucAOKViI+dSFOqoZIvXbeBw==", 3101 3101 "dev": true, 3102 3102 "requires": { … … 6311 6311 }, 6312 6312 "grunt-contrib-cssmin": { 6313 "version": " 3.0.0",6314 "resolved": "https://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin- 3.0.0.tgz",6315 "integrity": "sha512- eXpooYmVGKMs/xV7DzTLgJFPVOfMuawPD3x0JwhlH0mumq2NtH3xsxaHxp1Y3NKxp0j0tRhFS6kSBRsz6TuTGg==",6316 "dev": true, 6317 "requires": { 6318 "chalk": "^ 2.4.1",6319 "clean-css": " ~4.2.1",6320 "maxmin": "^ 2.1.0"6313 "version": "4.0.0", 6314 "resolved": "https://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-4.0.0.tgz", 6315 "integrity": "sha512-jXU+Zlk8Q8XztOGNGpjYlD/BDQ0n95IHKrQKtFR7Gd8hZrzgqiG1Ra7cGYc8h2DD9vkSFGNlweb9Q00rBxOK2w==", 6316 "dev": true, 6317 "requires": { 6318 "chalk": "^4.1.0", 6319 "clean-css": "^5.0.1", 6320 "maxmin": "^3.0.0" 6321 6321 }, 6322 6322 "dependencies": { 6323 6323 "ansi-styles": { 6324 "version": " 3.2.1",6325 "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles- 3.2.1.tgz",6326 "integrity": "sha512- VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",6327 "dev": true, 6328 "requires": { 6329 "color-convert": "^ 1.9.0"6324 "version": "4.3.0", 6325 "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", 6326 "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", 6327 "dev": true, 6328 "requires": { 6329 "color-convert": "^2.0.1" 6330 6330 } 6331 6331 }, 6332 6332 "chalk": { 6333 "version": "2.4.1", 6334 "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", 6335 "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", 6336 "dev": true, 6337 "requires": { 6338 "ansi-styles": "^3.2.1", 6339 "escape-string-regexp": "^1.0.5", 6340 "supports-color": "^5.3.0" 6333 "version": "4.1.0", 6334 "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", 6335 "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", 6336 "dev": true, 6337 "requires": { 6338 "ansi-styles": "^4.1.0", 6339 "supports-color": "^7.1.0" 6340 } 6341 }, 6342 "color-convert": { 6343 "version": "2.0.1", 6344 "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", 6345 "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", 6346 "dev": true, 6347 "requires": { 6348 "color-name": "~1.1.4" 6349 } 6350 }, 6351 "color-name": { 6352 "version": "1.1.4", 6353 "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", 6354 "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", 6355 "dev": true 6356 }, 6357 "figures": { 6358 "version": "3.2.0", 6359 "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", 6360 "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", 6361 "dev": true, 6362 "requires": { 6363 "escape-string-regexp": "^1.0.5" 6364 } 6365 }, 6366 "gzip-size": { 6367 "version": "5.1.1", 6368 "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz", 6369 "integrity": "sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==", 6370 "dev": true, 6371 "requires": { 6372 "duplexer": "^0.1.1", 6373 "pify": "^4.0.1" 6374 } 6375 }, 6376 "has-flag": { 6377 "version": "4.0.0", 6378 "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", 6379 "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", 6380 "dev": true 6381 }, 6382 "maxmin": { 6383 "version": "3.0.0", 6384 "resolved": "https://registry.npmjs.org/maxmin/-/maxmin-3.0.0.tgz", 6385 "integrity": "sha512-wcahMInmGtg/7c6a75fr21Ch/Ks1Tb+Jtoan5Ft4bAI0ZvJqyOw8kkM7e7p8hDSzY805vmxwHT50KcjGwKyJ0g==", 6386 "dev": true, 6387 "requires": { 6388 "chalk": "^4.1.0", 6389 "figures": "^3.2.0", 6390 "gzip-size": "^5.1.1", 6391 "pretty-bytes": "^5.3.0" 6392 } 6393 }, 6394 "supports-color": { 6395 "version": "7.2.0", 6396 "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", 6397 "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", 6398 "dev": true, 6399 "requires": { 6400 "has-flag": "^4.0.0" 6341 6401 } 6342 6402 } … … 8060 8120 }, 8061 8121 "joi": { 8062 "version": "17. 3.0",8063 "resolved": "https://registry.npmjs.org/joi/-/joi-17. 3.0.tgz",8064 "integrity": "sha512- Qh5gdU6niuYbUIUV5ejbsMiiFmBdw8Kcp8Buj2JntszCkCfxJ9Cz76OtHxOZMPXrt5810iDIXs+n1nNVoquHgg==",8122 "version": "17.4.0", 8123 "resolved": "https://registry.npmjs.org/joi/-/joi-17.4.0.tgz", 8124 "integrity": "sha512-F4WiW2xaV6wc1jxete70Rw4V/VuMd6IN+a5ilZsxG4uYtUXWu2kq9W5P2dz30e7Gmw8RCbY/u/uk+dMPma9tAg==", 8065 8125 "dev": true, 8066 8126 "requires": { … … 12190 12250 }, 12191 12251 "sass": { 12192 "version": "1.32. 6",12193 "resolved": "https://registry.npmjs.org/sass/-/sass-1.32. 6.tgz",12194 "integrity": "sha512- 1bcDHDcSqeFtMr0JXI3xc/CXX6c4p0wHHivJdru8W7waM7a1WjKMm4m/Z5sY7CbVw4Whi2Chpcw6DFfSWwGLzQ==",12252 "version": "1.32.8", 12253 "resolved": "https://registry.npmjs.org/sass/-/sass-1.32.8.tgz", 12254 "integrity": "sha512-Sl6mIeGpzjIUZqvKnKETfMf0iDAswD9TNlv13A7aAF3XZlRPMq4VvJWBC2N2DXbp94MQVdNSFG6LfF/iOXrPHQ==", 12195 12255 "dev": true, 12196 12256 "requires": { … … 14181 14241 }, 14182 14242 "uglify-js": { 14183 "version": "3.1 2.6",14184 "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.1 2.6.tgz",14185 "integrity": "sha512- aqWHe3DfQmZUDGWBbabZ2eQnJlQd1fKlMUu7gV+MiTuDzdgDw31bI3wA2jLLsV/hNcDP26IfyEgSVoft5+0SVw==",14243 "version": "3.13.3", 14244 "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.3.tgz", 14245 "integrity": "sha512-otIc7O9LyxpUcQoXzj2hL4LPWKklO6LJWoJUzNa8A17Xgi4fOeDC8FBDOLHnC/Slo1CQgsZMcM6as0M76BZaig==", 14186 14246 "dev": true 14187 14247 }, … … 14726 14786 }, 14727 14787 "wait-on": { 14728 "version": "5. 2.1",14729 "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-5. 2.1.tgz",14730 "integrity": "sha512- H2F986kNWMU9hKlI9l/ppO6tN8ZSJd35yBljMLa1/vjzWP++Qh6aXyt77/u7ySJFZQqBtQxnvm/xgG48AObXcw==",14788 "version": "5.3.0", 14789 "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-5.3.0.tgz", 14790 "integrity": "sha512-DwrHrnTK+/0QFaB9a8Ol5Lna3k7WvUR4jzSKmz0YaPBpuN2sACyiPVKVfj6ejnjcajAcvn3wlbTyMIn9AZouOg==", 14731 14791 "dev": true, 14732 14792 "requires": { 14733 14793 "axios": "^0.21.1", 14734 14794 "joi": "^17.3.0", 14735 "lodash": "^4.17.2 0",14795 "lodash": "^4.17.21", 14736 14796 "minimist": "^1.2.5", 14737 14797 "rxjs": "^6.6.3" … … 14739 14799 "dependencies": { 14740 14800 "lodash": { 14741 "version": "4.17.2 0",14742 "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.2 0.tgz",14743 "integrity": "sha512- PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",14801 "version": "4.17.21", 14802 "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", 14803 "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", 14744 14804 "dev": true 14745 14805 }, 14746 14806 "rxjs": { 14747 "version": "6.6. 3",14748 "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6. 3.tgz",14749 "integrity": "sha512- trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",14807 "version": "6.6.7", 14808 "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", 14809 "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", 14750 14810 "dev": true, 14751 14811 "requires": { -
branches/5.1/package.json
r50199 r50622 39 39 "grunt-contrib-concat": "1.0.1", 40 40 "grunt-contrib-copy": "~1.0.0", 41 "grunt-contrib-cssmin": "~ 3.0.0",41 "grunt-contrib-cssmin": "~4.0.0", 42 42 "grunt-contrib-imagemin": "~4.0.0", 43 43 "grunt-contrib-jshint": "3.0.0", … … 59 59 "jquery-migrate": "1.4.1", 60 60 "matchdep": "~2.0.0", 61 "sass": "^1.32. 6",61 "sass": "^1.32.8", 62 62 "source-map-loader": "^1.1.3", 63 "uglify-js": "^3.1 2.6",63 "uglify-js": "^3.13.2", 64 64 "uglifyjs-webpack-plugin": "2.2.0", 65 "wait-on": "^5. 2.1",65 "wait-on": "^5.3.0", 66 66 "webpack": "4.43.0", 67 67 "webpack-dev-server": "3.11.2",
Note: See TracChangeset
for help on using the changeset viewer.