WordPress.org

Make WordPress Core

Changeset 50646


Ignore:
Timestamp:
04/02/2021 04:05:53 PM (7 months ago)
Author:
desrosj
Message:

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

This backports several build and test tool improvements to the 3.8 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,50416,50432,50435-50436,50444,50446,50473-50474,50476,50479,50485-50487,50545,50590] to the 3.8 branch.
See #50401, #51801, #51802, #52548, #52612, #52624, #52625, #52645, #52653, #52658, #52660, #52667.

Location:
branches/3.8
Files:
1 added
1 deleted
9 edited

Legend:

Unmodified
Added
Removed
  • branches/3.8

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

    r50323 r50646  
    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:
     
    3758    steps:
    3859      - name: Checkout repository
    39         uses: actions/checkout@v2
     60        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
    4061
    4162      - name: Log debug information
     
    4768
    4869      - name: Install NodeJS
    49         uses: actions/setup-node@v1
     70        uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
    5071        with:
    5172          node-version: 14
    5273
    5374      - name: Cache NodeJS modules
    54         uses: actions/cache@v2
     75        uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
    5576        env:
    5677          cache-name: cache-node-modules
     
    5980          path: ~/.npm
    6081          key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
    61           restore-keys: |
    62             ${{ runner.os }}-npm-
    6382
    6483      - name: Log debug information
     
    6887
    6988      - name: Install Dependencies
    70         run: npx install-changed --install-command="npm ci"
     89        run: npm ci
    7190
    7291      - name: Run JSHint
  • branches/3.8/.github/workflows/end-to-end-tests.yml

    r50323 r50646  
    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.8/.github/workflows/javascript-tests.yml

    r50323 r50646  
    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.8/.github/workflows/php-compatibility.yml

    r50323 r50646  
    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.8/.github/workflows/phpunit-tests.yml

    r50323 r50646  
    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:
     
    4451      - name: Cancel previous runs of this workflow (pull requests only)
    4552        if: ${{ github.event_name == 'pull_request' }}
    46         uses: styfle/cancel-workflow-action@0.5.0
    47         with:
    48           access_token: ${{ github.token }}
     53        uses: styfle/cancel-workflow-action@3d86a7cc43670094ac248017207be0295edbc31d # v0.8.0
    4954
    5055      - name: Checkout repository
    51         uses: actions/checkout@v2
     56        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
    5257
    5358      - name: Log debug information
     
    6570
    6671      - name: Install NodeJS
    67         uses: actions/setup-node@v1
     72        uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
    6873        with:
    6974          node-version: 14
    7075
    7176      - name: Cache NodeJS modules
    72         uses: actions/cache@v2
     77        uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
    7378        env:
    7479          cache-name: cache-node-modules
     
    7782          path: ~/.npm
    7883          key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
    79           restore-keys: |
    80             ${{ runner.os }}-npm-
    8184
    8285      - name: Install Dependencies
    83         run: npx install-changed --install-command="npm ci"
     86        run: npm ci
    8487
    8588      - name: Build WordPress
     
    8790
    8891      - name: Create ZIP artifact
    89         uses: thedoctor0/zip-release@0.4.1
     92        uses: thedoctor0/zip-release@a1afcab9c664c9976ac398fa831eac67bed1eb0e # v0.4.1
    9093        with:
    9194          filename: built-wp-${{ github.sha }}.zip
     
    9396
    9497      - name: Upload build artifact
    95         uses: actions/upload-artifact@v2
     98        uses: actions/upload-artifact@e448a9b857ee2131e752b06002bf0e093c65e571 # v2.2.2
    9699        with:
    97100          name: built-wp-${{ github.sha }}
     
    125128  # - todo: Configure Slack notifications for failing tests.
    126129  test-php:
    127     name: ${{ matrix.php }}${{ matrix.memcached && ' with memcached' || '' }} on ${{ matrix.os }}
     130    name: ${{ matrix.php }}${{ matrix.multisite && ' multisite' || '' }}${{ matrix.split_slow && ' slow tests' || '' }} ${{ matrix.memcached && ' with memcached' || '' }} on ${{ matrix.os }}
    128131    needs: setup-wordpress
    129132    runs-on: ${{ matrix.os }}
    130133    strategy:
     134      fail-fast: false
    131135      matrix:
    132         php: [ '5.5', '5.4', '5.3' ]
     136        php: [ '5.3', '5.4', '5.5' ]
    133137        os: [ ubuntu-latest ]
     138        split_slow: [ false, true ]
     139        multisite: [ false, true ]
    134140    env:
    135141      LOCAL_PHP: ${{ matrix.php }}-fpm
    136142      LOCAL_PHP_MEMCACHED: ${{ matrix.memcached }}
     143      PHPUNIT_CONFIG: ${{ matrix.multisite && 'tests/phpunit/multisite.xml' || 'phpunit.xml.dist' }}
     144      SLOW_TESTS: 'external-http,media'
    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.8/.github/workflows/welcome-new-contributors.yml

    r50323 r50646  
    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.8/package-lock.json

    r50250 r50646  
    585585        },
    586586        "clean-css": {
    587             "version": "4.2.3",
    588             "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz",
    589             "integrity": "sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==",
     587            "version": "5.1.2",
     588            "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.1.2.tgz",
     589            "integrity": "sha512-QcaGg9OuMo+0Ds933yLOY+gHPWbxhxqF0HDexmToPf8pczvmvZGYzd+QqWp9/mkucAOKViI+dSFOqoZIvXbeBw==",
    590590            "dev": true,
    591591            "requires": {
     
    12581258        },
    12591259        "follow-redirects": {
    1260             "version": "1.13.2",
    1261             "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.2.tgz",
    1262             "integrity": "sha512-6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA==",
     1260            "version": "1.13.3",
     1261            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.3.tgz",
     1262            "integrity": "sha512-DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA==",
    12631263            "dev": true
    12641264        },
     
    13171317        },
    13181318        "fsevents": {
    1319             "version": "2.3.1",
    1320             "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.1.tgz",
    1321             "integrity": "sha512-YR47Eg4hChJGAB1O3yEAOkGO+rlzutoICGqGo9EZ4lKWokzZRSyIW1QmTzqjtw8MJdj9srP869CuWw/hyzSiBw==",
     1319            "version": "2.3.2",
     1320            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
     1321            "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
    13221322            "dev": true,
    13231323            "optional": true
     
    13831383        },
    13841384        "glob-parent": {
    1385             "version": "5.1.1",
    1386             "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
    1387             "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
     1385            "version": "5.1.2",
     1386            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
     1387            "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
    13881388            "dev": true,
    13891389            "requires": {
     
    16121612        },
    16131613        "grunt-contrib-cssmin": {
    1614             "version": "3.0.0",
    1615             "resolved": "https://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-3.0.0.tgz",
    1616             "integrity": "sha512-eXpooYmVGKMs/xV7DzTLgJFPVOfMuawPD3x0JwhlH0mumq2NtH3xsxaHxp1Y3NKxp0j0tRhFS6kSBRsz6TuTGg==",
    1617             "dev": true,
    1618             "requires": {
    1619                 "chalk": "^2.4.1",
    1620                 "clean-css": "~4.2.1",
    1621                 "maxmin": "^2.1.0"
    1622             },
    1623             "dependencies": {
    1624                 "ansi-styles": {
    1625                     "version": "3.2.1",
    1626                     "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
    1627                     "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
    1628                     "dev": true,
    1629                     "requires": {
    1630                         "color-convert": "^1.9.0"
    1631                     }
    1632                 },
    1633                 "chalk": {
    1634                     "version": "2.4.2",
    1635                     "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
    1636                     "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
    1637                     "dev": true,
    1638                     "requires": {
    1639                         "ansi-styles": "^3.2.1",
    1640                         "escape-string-regexp": "^1.0.5",
    1641                         "supports-color": "^5.3.0"
    1642                     }
    1643                 },
    1644                 "color-convert": {
    1645                     "version": "1.9.3",
    1646                     "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
    1647                     "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
    1648                     "dev": true,
    1649                     "requires": {
    1650                         "color-name": "1.1.3"
    1651                     }
    1652                 },
    1653                 "color-name": {
    1654                     "version": "1.1.3",
    1655                     "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
    1656                     "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
    1657                     "dev": true
    1658                 },
    1659                 "has-flag": {
     1614            "version": "4.0.0",
     1615            "resolved": "https://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-4.0.0.tgz",
     1616            "integrity": "sha512-jXU+Zlk8Q8XztOGNGpjYlD/BDQ0n95IHKrQKtFR7Gd8hZrzgqiG1Ra7cGYc8h2DD9vkSFGNlweb9Q00rBxOK2w==",
     1617            "dev": true,
     1618            "requires": {
     1619                "chalk": "^4.1.0",
     1620                "clean-css": "^5.0.1",
     1621                "maxmin": "^3.0.0"
     1622            },
     1623            "dependencies": {
     1624                "figures": {
     1625                    "version": "3.2.0",
     1626                    "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
     1627                    "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
     1628                    "dev": true,
     1629                    "requires": {
     1630                        "escape-string-regexp": "^1.0.5"
     1631                    }
     1632                },
     1633                "gzip-size": {
     1634                    "version": "5.1.1",
     1635                    "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz",
     1636                    "integrity": "sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==",
     1637                    "dev": true,
     1638                    "requires": {
     1639                        "duplexer": "^0.1.1",
     1640                        "pify": "^4.0.1"
     1641                    }
     1642                },
     1643                "maxmin": {
    16601644                    "version": "3.0.0",
    1661                     "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
    1662                     "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
    1663                     "dev": true
    1664                 },
    1665                 "supports-color": {
    1666                     "version": "5.5.0",
    1667                     "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
    1668                     "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
    1669                     "dev": true,
    1670                     "requires": {
    1671                         "has-flag": "^3.0.0"
     1645                    "resolved": "https://registry.npmjs.org/maxmin/-/maxmin-3.0.0.tgz",
     1646                    "integrity": "sha512-wcahMInmGtg/7c6a75fr21Ch/Ks1Tb+Jtoan5Ft4bAI0ZvJqyOw8kkM7e7p8hDSzY805vmxwHT50KcjGwKyJ0g==",
     1647                    "dev": true,
     1648                    "requires": {
     1649                        "chalk": "^4.1.0",
     1650                        "figures": "^3.2.0",
     1651                        "gzip-size": "^5.1.1",
     1652                        "pretty-bytes": "^5.3.0"
    16721653                    }
    16731654                }
     
    30092990            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
    30102991            "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
     2992            "dev": true
     2993        },
     2994        "pify": {
     2995            "version": "4.0.1",
     2996            "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
     2997            "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
    30112998            "dev": true
    30122999        },
     
    33193306        },
    33203307        "sass": {
    3321             "version": "1.32.6",
    3322             "resolved": "https://registry.npmjs.org/sass/-/sass-1.32.6.tgz",
    3323             "integrity": "sha512-1bcDHDcSqeFtMr0JXI3xc/CXX6c4p0wHHivJdru8W7waM7a1WjKMm4m/Z5sY7CbVw4Whi2Chpcw6DFfSWwGLzQ==",
     3308            "version": "1.32.8",
     3309            "resolved": "https://registry.npmjs.org/sass/-/sass-1.32.8.tgz",
     3310            "integrity": "sha512-Sl6mIeGpzjIUZqvKnKETfMf0iDAswD9TNlv13A7aAF3XZlRPMq4VvJWBC2N2DXbp94MQVdNSFG6LfF/iOXrPHQ==",
    33243311            "dev": true,
    33253312            "requires": {
     
    39253912        },
    39263913        "wait-on": {
    3927             "version": "5.2.1",
    3928             "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-5.2.1.tgz",
    3929             "integrity": "sha512-H2F986kNWMU9hKlI9l/ppO6tN8ZSJd35yBljMLa1/vjzWP++Qh6aXyt77/u7ySJFZQqBtQxnvm/xgG48AObXcw==",
     3914            "version": "5.3.0",
     3915            "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-5.3.0.tgz",
     3916            "integrity": "sha512-DwrHrnTK+/0QFaB9a8Ol5Lna3k7WvUR4jzSKmz0YaPBpuN2sACyiPVKVfj6ejnjcajAcvn3wlbTyMIn9AZouOg==",
    39303917            "dev": true,
    39313918            "requires": {
    39323919                "axios": "^0.21.1",
    39333920                "joi": "^17.3.0",
    3934                 "lodash": "^4.17.20",
     3921                "lodash": "^4.17.21",
    39353922                "minimist": "^1.2.5",
    39363923                "rxjs": "^6.6.3"
    39373924            },
    39383925            "dependencies": {
     3926                "lodash": {
     3927                    "version": "4.17.21",
     3928                    "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
     3929                    "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
     3930                    "dev": true
     3931                },
    39393932                "rxjs": {
    3940                     "version": "6.6.3",
    3941                     "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
    3942                     "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
     3933                    "version": "6.6.7",
     3934                    "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
     3935                    "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
    39433936                    "dev": true,
    39443937                    "requires": {
  • branches/3.8/package.json

    r50250 r50646  
    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-jshint": "3.0.0",
    2525        "grunt-contrib-qunit": "^4.0.0",
     
    3131        "grunt-sass": "~3.1.0",
    3232        "matchdep": "~2.0.0",
    33         "sass": "^1.32.6",
    34         "wait-on": "5.2.1"
     33        "sass": "^1.32.8",
     34        "wait-on": "^5.3.0"
    3535    },
    3636    "scripts": {
Note: See TracChangeset for help on using the changeset viewer.