WordPress.org
Get WordPress

Make WordPress Core

Changeset 50626 for branches/3.7


Ignore:
Timestamp:
03/31/2021 07:51:58 PM (4 years ago)
Author:
desrosj
Message:

Build/Test Tools: Backport GitHub Action and build improvements to the 3.7 branch.

This backports several build and test tool improvements to the 3.7 branch. Most notably, this includes:

  • The changes required to allow each workflow to be triggered by the workflow_dispatch event so that tests can be run on a schedule [50590].
  • Splitting single site and multisite tests into parallel jobs [50379].
  • Split slow tests into separate, parallel jobs for PHP <= 5.6 [50444].
  • Better branch and path scoping for GitHub Action workflows when running on pull_request [50432,50479].
  • Several devDependency updates.

Merges [50379,50387,50413,50416,50432,50435,50436,50444,50446,50473,50474,50476,50479,50485,50486,50487,50545,50579,50590] to the 3.7 branch.
See #50401, #51801, #51802, #52548, #52608, #52612, #52624, #52625, #52645, #52653, #52658, #52660, #52667.

Location:
branches/3.7
Files:
2 added
1 deleted
10 edited

Legend:

Unmodified
Added
Removed

  • branches/3.7

  • branches/3.7/.github/workflows/coding-standards.yml

    r50324 r50626  
    22
    33on:
     4  # JSHint was introduced in WordPress 3.8.
     5  # PHPCS checking was introduced in WordPress 5.1.
    46  push:
    57    branches:
    68      - master
    7       # JSHint was introduced in WordPress 3.8.
    8       # PHPCS checking was introduced in WordPress 5.1.
     9      - trunk
    910      - '3.[89]'
    1011      - '[4-9].[0-9]'
    … …  
    1314      - '[4-9].[0-9]*'
    1415  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:
    1536
    1637jobs:
    … …  
    3657    steps:
    3758      - name: Checkout repository
    38         uses: actions/checkout@v2
     59        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
    3960
    4061      - name: Set up PHP
    41         uses: shivammathur/setup-php@v2
     62        uses: shivammathur/setup-php@afefcaf556d98dc7896cca380e181decb609ca44 # v2.10.0
    4263        with:
    4364          php-version: '7.4'
    … …  
    5172
    5273      - name: Install Composer dependencies
    53         uses: ramsey/composer-install@v1
     74        uses: ramsey/composer-install@92a7904348d4ad30236f3611e33b7f0c6f9edd70 # v1.1.0
    5475        with:
    5576          composer-options: "--no-progress --no-ansi --no-interaction"
    … …  
    89110    steps:
    90111      - name: Checkout repository
    91         uses: actions/checkout@v2
     112        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
    92113
    93114      - name: Log debug information
    … …  
    99120
    100121      - name: Install NodeJS
    101         uses: actions/setup-node@v1
     122        uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
    102123        with:
    103124          node-version: 14
    104125
    105126      - name: Cache NodeJS modules
    106         uses: actions/cache@v2
     127        uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
    107128        env:
    108129          cache-name: cache-node-modules
    … …  
    111132          path: ~/.npm
    112133          key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
    113           restore-keys: |
    114             ${{ runner.os }}-npm-
    115134
    116135      - name: Log debug information
    … …  
    120139
    121140      - name: Install Dependencies
    122         run: npx install-changed --install-command="npm ci"
     141        run: npm ci
    123142
    124143      - name: Run JSHint

  • branches/3.7/.github/workflows/end-to-end-tests.yml

    r50324 r50626  
    22
    33on:
     4  # The end to end test suite was introduced in WordPress 5.3.
    45  push:
    56    branches:
    67      - master
    7       # The end to end test suite was introduced in WordPress 5.3.
     8      - trunk
    89      - '5.[3-9]'
    910      - '[6-9].[0-9]'
    … …  
    1213      - '[6-9].[0-9]*'
    1314  pull_request:
     15    branches:
     16      - master
     17      - trunk
     18      - '5.[3-9]'
     19      - '[6-9].[0-9]'
     20  workflow_dispatch:
    1421
    1522env:
    … …  
    4350      - name: Cancel previous runs of this workflow (pull requests only)
    4451        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
    4853
    4954      - name: Configure environment variables
    … …  
    5358
    5459      - name: Checkout repository
    55         uses: actions/checkout@v2
     60        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
    5661
    5762      - name: Log debug information
    … …  
    6772
    6873      - name: Install NodeJS
    69         uses: actions/setup-node@v1
     74        uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
    7075        with:
    7176          node-version: 14
    7277
    7378      - name: Cache NodeJS modules
    74         uses: actions/cache@v2
     79        uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
    7580        env:
    7681          cache-name: cache-node-modules
    … …  
    7984          path: ~/.npm
    8085          key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
    81           restore-keys: |
    82             ${{ runner.os }}-npm-
    8386
    8487      - name: Install Dependencies
    85         run: npx install-changed --install-command="npm ci"
     88        run: npm ci
    8689
    8790      - name: Build WordPress

  • branches/3.7/.github/workflows/javascript-tests.yml

    r50324 r50626  
    22
    33on:
     4  # JavaScript testing was introduced in WordPress 3.8.
    45  push:
    56    branches:
    67      - master
    7       # JavaScript testing was introduced in WordPress 3.8.
     8      - trunk
    89      - '3.[89]'
    910      - '[4-9].[0-9]'
    … …  
    1213      - '[4-9].[0-9]*'
    1314  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:
    1434
    1535jobs:
    … …  
    3454      - name: Cancel previous runs of this workflow (pull requests only)
    3555        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
    3957
    4058      - name: Checkout repository
    41         uses: actions/checkout@v2
     59        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
    4260
    4361      - name: Log debug information
    … …  
    4967
    5068      - name: Install NodeJS
    51         uses: actions/setup-node@v1
     69        uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
    5270        with:
    5371          node-version: 14
    5472
    5573      - name: Cache NodeJS modules
    56         uses: actions/cache@v2
     74        uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
    5775        env:
    5876          cache-name: cache-node-modules
    … …  
    6179          path: ~/.npm
    6280          key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
    63           restore-keys: |
    64             ${{ runner.os }}-npm-
    6581
    6682      - name: Log debug information
    … …  
    7086
    7187      - name: Install Dependencies
    72         run: npx install-changed --install-command="npm ci"
     88        run: npm ci
    7389
    7490      - name: Run QUnit tests

  • branches/3.7/.github/workflows/php-compatibility.yml

    r50324 r50626  
    22
    33on:
     4  # PHP compatibility testing was introduced in WordPress 5.5.
    45  push:
    56    branches:
    67      - master
    7       # The PHP compatibility testing was introduced in WordPress 5.5.
     8      - trunk
    89      - '5.[5-9]'
    910      - '[6-9].[0-9]'
    … …  
    1213      - '[6-9].[0-9]*'
    1314  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:
    1430
    1531jobs:
    … …  
    3551    steps:
    3652      - name: Checkout repository
    37         uses: actions/checkout@v2
     53        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
    3854
    3955      - name: Set up PHP
    40         uses: shivammathur/setup-php@v2
     56        uses: shivammathur/setup-php@afefcaf556d98dc7896cca380e181decb609ca44 # v2.10.0
    4157        with:
    4258          php-version: '7.4'
    … …  
    5066
    5167      - name: Install Composer dependencies
    52         uses: ramsey/composer-install@v1
     68        uses: ramsey/composer-install@92a7904348d4ad30236f3611e33b7f0c6f9edd70 # v1.1.0
    5369        with:
    5470          composer-options: "--no-progress --no-ansi --no-interaction"

  • branches/3.7/.github/workflows/phpunit-tests.yml

    r50324 r50626  
    55    branches:
    66      - master
     7      - trunk
    78      - '3.[7-9]'
    89      - '[4-9].[0-9]'
    … …  
    1112      - '[4-9].[0-9]*'
    1213  pull_request:
     14    branches:
     15      - master
     16      - trunk
     17      - '3.[7-9]'
     18      - '[4-9].[0-9]'
     19  workflow_dispatch:
    1320  # Once weekly On Sundays at 00:00 UTC.
    1421  schedule:
    … …  
    2229  PHPUNIT_SCRIPT: php
    2330  LOCAL_PHP_MEMCACHED: ${{ false }}
     31  SLOW_TESTS: 'external-http,media'
    2432
    2533jobs:
    … …  
    4452      - name: Cancel previous runs of this workflow (pull requests only)
    4553        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
    4955
    5056      - name: Checkout repository
    51         uses: actions/checkout@v2
     57        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
    5258
    5359      - name: Log debug information
    … …  
    6571
    6672      - name: Install NodeJS
    67         uses: actions/setup-node@v1
     73        uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
    6874        with:
    6975          node-version: 14
    7076
    7177      - name: Cache NodeJS modules
    72         uses: actions/cache@v2
     78        uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
    7379        env:
    7480          cache-name: cache-node-modules
    … …  
    7783          path: ~/.npm
    7884          key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
    79           restore-keys: |
    80             ${{ runner.os }}-npm-
    8185
    8286      - name: Install Dependencies
    83         run: npx install-changed --install-command="npm ci"
     87        run: npm ci
    8488
    8589      - name: Build WordPress
    … …  
    8791
    8892      - name: Create ZIP artifact
    89         uses: thedoctor0/zip-release@0.4.1
     93        uses: thedoctor0/zip-release@a1afcab9c664c9976ac398fa831eac67bed1eb0e # v0.4.1
    9094        with:
    9195          filename: built-wp-${{ github.sha }}.zip
    … …  
    9397
    9498      - name: Upload build artifact
    95         uses: actions/upload-artifact@v2
     99        uses: actions/upload-artifact@e448a9b857ee2131e752b06002bf0e093c65e571 # v2.2.2
    96100        with:
    97101          name: built-wp-${{ github.sha }}
    … …  
    125129  # - todo: Configure Slack notifications for failing tests.
    126130  test-php:
    127     name: ${{ matrix.php }}${{ matrix.memcached && ' with memcached' || '' }} on ${{ matrix.os }}
     131    name: ${{ matrix.php }}${{ matrix.multisite && ' multisite' || '' }}${{ matrix.split_slow && ' slow tests' || '' }} ${{ matrix.memcached && ' with memcached' || '' }} on ${{ matrix.os }}
    128132    needs: setup-wordpress
    129133    runs-on: ${{ matrix.os }}
    130134    strategy:
     135      fail-fast: false
    131136      matrix:
    132         php: [ '5.5', '5.4', '5.3' ]
     137        php: [ '5.3', '5.4', '5.5' ]
    133138        os: [ ubuntu-latest ]
     139        split_slow: [ false, true ]
     140        multisite: [ false, true ]
    134141    env:
    135142      LOCAL_PHP: ${{ matrix.php }}-fpm
    136143      LOCAL_PHP_MEMCACHED: ${{ matrix.memcached }}
     144      PHPUNIT_CONFIG: ${{ matrix.multisite && 'tests/phpunit/multisite.xml' || 'phpunit.xml.dist' }}
    137145
    138146    steps:
    … …  
    143151
    144152      - name: Download the built WordPress artifact
    145         uses: actions/download-artifact@v2
     153        uses: actions/download-artifact@4a7a711286f30c025902c28b541c10e147a9b843 # v2.0.8
    146154        with:
    147155          name: built-wp-${{ github.sha }}
    … …  
    151159
    152160      - name: Install NodeJS
    153         uses: actions/setup-node@v1
     161        uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
    154162        with:
    155163          node-version: 14
    156164
    157165      - name: Use cached Node modules
    158         uses: actions/cache@v2
     166        uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
    159167        env:
    160168          cache-name: cache-node-modules
    … …  
    163171          path: ~/.npm
    164172          key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
    165           restore-keys: |
    166             ${{ runner.os }}-npm-
    167173
    168174      - name: Install Dependencies
    169         run: npx install-changed --install-command="npm ci"
     175        run: npm ci
    170176
    171177      - name: Cache Composer dependencies
    172178        if: ${{ env.COMPOSER_INSTALL == true }}
    173         uses: actions/cache@v2
     179        uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
    174180        env:
    175181          cache-name: cache-composer-dependencies
    … …  
    177183          path: ${{ steps.composer-cache.outputs.dir }}
    178184          key: ${{ runner.os }}-php-${{ matrix.php }}-composer-${{ hashFiles('**/composer.lock') }}
    179           restore-keys: |
    180             ${{ runner.os }}-php-${{ matrix.php }}-composer-
    181185
    182186      - name: Install Composer dependencies
    … …  
    224228        run: npm run env:install
    225229
     230      - name: Run slow PHPUnit tests
     231        if: ${{ matrix.split_slow }}
     232        run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c ${{ env.PHPUNIT_CONFIG }} --group ${{ env.SLOW_TESTS }}
     233
     234      - name: Run PHPUnit tests for single site excluding slow tests
     235        if: ${{ matrix.php < '7.0' && ! matrix.split_slow && ! matrix.multisite }}
     236        run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c ${{ env.PHPUNIT_CONFIG }} --exclude-group ${{ env.SLOW_TESTS }},ajax,ms-files,ms-required
     237
     238      - name: Run PHPUnit tests for Multisite excluding slow tests
     239        if: ${{ matrix.php < '7.0' && ! matrix.split_slow && matrix.multisite }}
     240        run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c ${{ env.PHPUNIT_CONFIG }} --exclude-group ${{ env.SLOW_TESTS }},ajax,ms-files,ms-excluded,oembed-headers
     241
    226242      - name: Run PHPUnit tests
    227         run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c phpunit.xml.dist
     243        if: ${{ matrix.php >= '7.0' }}
     244        run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c ${{ env.PHPUNIT_CONFIG }}
    228245
    229246      - name: Run AJAX tests
    230         run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c phpunit.xml.dist --group ajax
    231 
    232       - name: Run tests as a multisite install
    233         run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c tests/phpunit/multisite.xml
     247        if: ${{ ! matrix.multisite && ! matrix.split_slow }}
     248        run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c ${{ env.PHPUNIT_CONFIG }} --group ajax
    234249
    235250      - name: Run external HTTP tests
     251        if: ${{ ! matrix.multisite && ! matrix.split_slow }}
    236252        run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c phpunit.xml.dist --group external-http
    237253
    238254      - name: Checkout the WordPress Test Reporter
    239255        if: ${{ github.repository == 'WordPress/wordpress-develop' && github.ref == 'refs/heads/master' && matrix.report }}
    240         uses: actions/checkout@v2
     256        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
    241257        with:
    242258          repository: 'WordPress/phpunit-test-runner'

  • branches/3.7/.github/workflows/welcome-new-contributors.yml

    r50324 r50626  
    1212
    1313    steps:
    14       - uses: bubkoo/welcome-action@v1
     14      - uses: bubkoo/welcome-action@8dbbac2540d155744c90e4e37da6b05ffc9c5e2c # v1.0.3
    1515        with:
    1616          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

  • branches/3.7/package-lock.json

    r50251 r50626  
    509509        },
    510510        "clean-css": {
    511             "version": "4.2.3",
    512             "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz",
    513             "integrity": "sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==",
     511            "version": "5.1.2",
     512            "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.1.2.tgz",
     513            "integrity": "sha512-QcaGg9OuMo+0Ds933yLOY+gHPWbxhxqF0HDexmToPf8pczvmvZGYzd+QqWp9/mkucAOKViI+dSFOqoZIvXbeBw==",
    514514            "dev": true,
    515515            "requires": {
    … …  
    10961096        },
    10971097        "follow-redirects": {
    1098             "version": "1.13.2",
    1099             "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.2.tgz",
    1100             "integrity": "sha512-6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA==",
     1098            "version": "1.13.3",
     1099            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.3.tgz",
     1100            "integrity": "sha512-DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA==",
    11011101            "dev": true
    11021102        },
    … …  
    14231423        },
    14241424        "grunt-contrib-cssmin": {
    1425             "version": "3.0.0",
    1426             "resolved": "https://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-3.0.0.tgz",
    1427             "integrity": "sha512-eXpooYmVGKMs/xV7DzTLgJFPVOfMuawPD3x0JwhlH0mumq2NtH3xsxaHxp1Y3NKxp0j0tRhFS6kSBRsz6TuTGg==",
    1428             "dev": true,
    1429             "requires": {
    1430                 "chalk": "^2.4.1",
    1431                 "clean-css": "~4.2.1",
    1432                 "maxmin": "^2.1.0"
    1433             },
    1434             "dependencies": {
    1435                 "ansi-styles": {
    1436                     "version": "3.2.1",
    1437                     "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
    1438                     "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
    1439                     "dev": true,
    1440                     "requires": {
    1441                         "color-convert": "^1.9.0"
    1442                     }
    1443                 },
    1444                 "chalk": {
    1445                     "version": "2.4.2",
    1446                     "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
    1447                     "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
    1448                     "dev": true,
    1449                     "requires": {
    1450                         "ansi-styles": "^3.2.1",
    1451                         "escape-string-regexp": "^1.0.5",
    1452                         "supports-color": "^5.3.0"
    1453                     }
    1454                 },
    1455                 "color-convert": {
    1456                     "version": "1.9.3",
    1457                     "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
    1458                     "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
    1459                     "dev": true,
    1460                     "requires": {
    1461                         "color-name": "1.1.3"
    1462                     }
    1463                 },
    1464                 "color-name": {
    1465                     "version": "1.1.3",
    1466                     "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
    1467                     "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
    1468                     "dev": true
    1469                 },
    1470                 "has-flag": {
     1425            "version": "4.0.0",
     1426            "resolved": "https://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-4.0.0.tgz",
     1427            "integrity": "sha512-jXU+Zlk8Q8XztOGNGpjYlD/BDQ0n95IHKrQKtFR7Gd8hZrzgqiG1Ra7cGYc8h2DD9vkSFGNlweb9Q00rBxOK2w==",
     1428            "dev": true,
     1429            "requires": {
     1430                "chalk": "^4.1.0",
     1431                "clean-css": "^5.0.1",
     1432                "maxmin": "^3.0.0"
     1433            },
     1434            "dependencies": {
     1435                "figures": {
     1436                    "version": "3.2.0",
     1437                    "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
     1438                    "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
     1439                    "dev": true,
     1440                    "requires": {
     1441                        "escape-string-regexp": "^1.0.5"
     1442                    }
     1443                },
     1444                "gzip-size": {
     1445                    "version": "5.1.1",
     1446                    "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz",
     1447                    "integrity": "sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==",
     1448                    "dev": true,
     1449                    "requires": {
     1450                        "duplexer": "^0.1.1",
     1451                        "pify": "^4.0.1"
     1452                    }
     1453                },
     1454                "maxmin": {
    14711455                    "version": "3.0.0",
    1472                     "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
    1473                     "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
    1474                     "dev": true
    1475                 },
    1476                 "supports-color": {
    1477                     "version": "5.5.0",
    1478                     "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
    1479                     "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
    1480                     "dev": true,
    1481                     "requires": {
    1482                         "has-flag": "^3.0.0"
     1456                    "resolved": "https://registry.npmjs.org/maxmin/-/maxmin-3.0.0.tgz",
     1457                    "integrity": "sha512-wcahMInmGtg/7c6a75fr21Ch/Ks1Tb+Jtoan5Ft4bAI0ZvJqyOw8kkM7e7p8hDSzY805vmxwHT50KcjGwKyJ0g==",
     1458                    "dev": true,
     1459                    "requires": {
     1460                        "chalk": "^4.1.0",
     1461                        "figures": "^3.2.0",
     1462                        "gzip-size": "^5.1.1",
     1463                        "pretty-bytes": "^5.3.0"
    14831464                    }
    14841465                }
    … …  
    27242705            "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
    27252706            "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
     2707            "dev": true
     2708        },
     2709        "pify": {
     2710            "version": "4.0.1",
     2711            "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
     2712            "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
    27262713            "dev": true
    27272714        },
    … …  
    36103597        },
    36113598        "wait-on": {
    3612             "version": "5.2.1",
    3613             "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-5.2.1.tgz",
    3614             "integrity": "sha512-H2F986kNWMU9hKlI9l/ppO6tN8ZSJd35yBljMLa1/vjzWP++Qh6aXyt77/u7ySJFZQqBtQxnvm/xgG48AObXcw==",
     3599            "version": "5.3.0",
     3600            "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-5.3.0.tgz",
     3601            "integrity": "sha512-DwrHrnTK+/0QFaB9a8Ol5Lna3k7WvUR4jzSKmz0YaPBpuN2sACyiPVKVfj6ejnjcajAcvn3wlbTyMIn9AZouOg==",
    36153602            "dev": true,
    36163603            "requires": {
    36173604                "axios": "^0.21.1",
    36183605                "joi": "^17.3.0",
    3619                 "lodash": "^4.17.20",
     3606                "lodash": "^4.17.21",
    36203607                "minimist": "^1.2.5",
    36213608                "rxjs": "^6.6.3"
    36223609            },
    36233610            "dependencies": {
     3611                "lodash": {
     3612                    "version": "4.17.21",
     3613                    "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
     3614                    "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
     3615                    "dev": true
     3616                },
    36243617                "rxjs": {
    3625                     "version": "6.6.3",
    3626                     "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
    3627                     "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
     3618                    "version": "6.6.7",
     3619                    "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
     3620                    "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
    36283621                    "dev": true,
    36293622                    "requires": {

  • branches/3.7/package.json

    r50251 r50626  
    2121        "grunt-contrib-concat": "~1.0.1",
    2222        "grunt-contrib-copy": "~1.0.0",
    23         "grunt-contrib-cssmin": "~3.0.0",
     23        "grunt-contrib-cssmin": "~4.0.0",
    2424        "grunt-contrib-qunit": "^4.0.0",
    2525        "grunt-contrib-uglify": "~5.0.0",
    … …  
    2828        "grunt-patch-wordpress": "~3.0.0",
    2929        "matchdep": "~2.0.0",
    30         "wait-on": "5.2.1"
     30        "wait-on": "^5.3.0"
    3131    },
    3232    "scripts": {

  • branches/3.7/src

    • Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset for help on using the changeset viewer.