WordPress.org

Make WordPress Core

Changeset 50643


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

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

This backports several build and test tool improvements to the 4.1 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 4.1 branch.
See #50401, #51801, #51802, #52548, #52612, #52624, #52625, #52645, #52653, #52658, #52660, #52667.

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

Legend:

Unmodified
Added
Removed
  • branches/4.1

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

    r50320 r50643  
    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/4.1/.github/workflows/end-to-end-tests.yml

    r50320 r50643  
    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/4.1/.github/workflows/javascript-tests.yml

    r50320 r50643  
    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/4.1/.github/workflows/php-compatibility.yml

    r50320 r50643  
    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/4.1/.github/workflows/phpunit-tests.yml

    r50325 r50643  
    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.6' ]
    133         phpunit: [ '4-php-5.6' ]
     136        php: [ '5.3', '5.4', '5.5' ]
    134137        os: [ ubuntu-latest ]
     138        split_slow: [ false, true ]
     139        multisite: [ false, true ]
    135140        memcached: [ false ]
    136141        include:
    137           - php: '5.5'
    138             phpunit: '5.5'
     142          - php: '5.6'
     143            phpunit: '4-php-5.6'
    139144            os: ubuntu-latest
     145            split_slow: false
     146            multisite: false
    140147            memcached: false
    141           - php: '5.4'
    142             phpunit: '5.4'
     148          - php: '5.6'
     149            phpunit: '4-php-5.6'
    143150            os: ubuntu-latest
     151            split_slow: false
     152            multisite: true
    144153            memcached: false
    145           - php: '5.3'
    146             phpunit: '5.3'
     154          - php: '5.6'
     155            phpunit: '4-php-5.6'
    147156            os: ubuntu-latest
     157            split_slow: true
     158            multisite: false
     159            memcached: false
     160          - php: '5.6'
     161            phpunit: '4-php-5.6'
     162            os: ubuntu-latest
     163            split_slow: true
     164            multisite: true
    148165            memcached: false
    149166    env:
    150167      LOCAL_PHP: ${{ matrix.php }}-fpm
    151       LOCAL_PHPUNIT: ${{ matrix.phpunit }}-fpm
     168      LOCAL_PHPUNIT: ${{ matrix.phpunit && matrix.phpunit || matrix.php }}-fpm
    152169      LOCAL_PHP_MEMCACHED: ${{ matrix.memcached }}
     170      PHPUNIT_CONFIG: ${{ matrix.multisite && 'tests/phpunit/multisite.xml' || 'phpunit.xml.dist' }}
     171      SLOW_TESTS: 'external-http,media'
    153172
    154173    steps:
     
    159178
    160179      - name: Download the built WordPress artifact
    161         uses: actions/download-artifact@v2
     180        uses: actions/download-artifact@4a7a711286f30c025902c28b541c10e147a9b843 # v2.0.8
    162181        with:
    163182          name: built-wp-${{ github.sha }}
     
    167186
    168187      - name: Install NodeJS
    169         uses: actions/setup-node@v1
     188        uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
    170189        with:
    171190          node-version: 14
    172191
    173192      - name: Use cached Node modules
    174         uses: actions/cache@v2
     193        uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
    175194        env:
    176195          cache-name: cache-node-modules
     
    179198          path: ~/.npm
    180199          key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
    181           restore-keys: |
    182             ${{ runner.os }}-npm-
    183200
    184201      - name: Install Dependencies
    185         run: npx install-changed --install-command="npm ci"
     202        run: npm ci
    186203
    187204      - name: Cache Composer dependencies
    188205        if: ${{ env.COMPOSER_INSTALL == true }}
    189         uses: actions/cache@v2
     206        uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
    190207        env:
    191208          cache-name: cache-composer-dependencies
     
    193210          path: ${{ steps.composer-cache.outputs.dir }}
    194211          key: ${{ runner.os }}-php-${{ matrix.php }}-composer-${{ hashFiles('**/composer.lock') }}
    195           restore-keys: |
    196             ${{ runner.os }}-php-${{ matrix.php }}-composer-
    197212
    198213      - name: Install Composer dependencies
     
    240255        run: npm run env:install
    241256
     257      - name: Run slow PHPUnit tests
     258        if: ${{ matrix.split_slow }}
     259        run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c ${{ env.PHPUNIT_CONFIG }} --group ${{ env.SLOW_TESTS }}
     260
     261      - name: Run PHPUnit tests for single site excluding slow tests
     262        if: ${{ matrix.php < '7.0' && ! matrix.split_slow && ! matrix.multisite }}
     263        run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c ${{ env.PHPUNIT_CONFIG }} --exclude-group ${{ env.SLOW_TESTS }},ajax,ms-files,ms-required
     264
     265      - name: Run PHPUnit tests for Multisite excluding slow tests
     266        if: ${{ matrix.php < '7.0' && ! matrix.split_slow && matrix.multisite }}
     267        run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c ${{ env.PHPUNIT_CONFIG }} --exclude-group ${{ env.SLOW_TESTS }},ajax,ms-files,ms-excluded,oembed-headers
     268
    242269      - name: Run PHPUnit tests
    243         run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c phpunit.xml.dist
     270        if: ${{ matrix.php >= '7.0' }}
     271        run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c ${{ env.PHPUNIT_CONFIG }}
    244272
    245273      - name: Run AJAX tests
    246         run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c phpunit.xml.dist --group ajax
    247 
    248       - name: Run tests as a multisite install
    249         run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c tests/phpunit/multisite.xml
    250 
    251       - name: Run ms-files tests as a multisite install
    252         run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c tests/phpunit/multisite.xml --group ms-files
     274        if: ${{ ! matrix.multisite && ! matrix.split_slow }}
     275        run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c ${{ env.PHPUNIT_CONFIG }} --group ajax
    253276
    254277      - name: Run external HTTP tests
     278        if: ${{ ! matrix.multisite && ! matrix.split_slow }}
    255279        run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c phpunit.xml.dist --group external-http
    256280
    257281      - name: Checkout the WordPress Test Reporter
    258282        if: ${{ github.repository == 'WordPress/wordpress-develop' && github.ref == 'refs/heads/master' && matrix.report }}
    259         uses: actions/checkout@v2
     283        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
    260284        with:
    261285          repository: 'WordPress/phpunit-test-runner'
  • branches/4.1/.github/workflows/welcome-new-contributors.yml

    r50320 r50643  
    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/4.1/package-lock.json

    r50247 r50643  
    975975                },
    976976                "glob-parent": {
    977                     "version": "5.1.1",
    978                     "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
    979                     "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
     977                    "version": "5.1.2",
     978                    "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
     979                    "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
    980980                    "dev": true,
    981981                    "requires": {
     
    10391039        },
    10401040        "clean-css": {
    1041             "version": "4.2.3",
    1042             "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz",
    1043             "integrity": "sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==",
     1041            "version": "5.1.2",
     1042            "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.1.2.tgz",
     1043            "integrity": "sha512-QcaGg9OuMo+0Ds933yLOY+gHPWbxhxqF0HDexmToPf8pczvmvZGYzd+QqWp9/mkucAOKViI+dSFOqoZIvXbeBw==",
    10441044            "dev": true,
    10451045            "requires": {
     
    24082408        },
    24092409        "follow-redirects": {
    2410             "version": "1.13.2",
    2411             "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.2.tgz",
    2412             "integrity": "sha512-6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA==",
     2410            "version": "1.13.3",
     2411            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.3.tgz",
     2412            "integrity": "sha512-DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA==",
    24132413            "dev": true
    24142414        },
     
    24962496        },
    24972497        "fsevents": {
    2498             "version": "2.3.1",
    2499             "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.1.tgz",
    2500             "integrity": "sha512-YR47Eg4hChJGAB1O3yEAOkGO+rlzutoICGqGo9EZ4lKWokzZRSyIW1QmTzqjtw8MJdj9srP869CuWw/hyzSiBw==",
     2498            "version": "2.3.2",
     2499            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
     2500            "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
    25012501            "dev": true,
    25022502            "optional": true
     
    30013001        },
    30023002        "grunt-contrib-cssmin": {
    3003             "version": "3.0.0",
    3004             "resolved": "https://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-3.0.0.tgz",
    3005             "integrity": "sha512-eXpooYmVGKMs/xV7DzTLgJFPVOfMuawPD3x0JwhlH0mumq2NtH3xsxaHxp1Y3NKxp0j0tRhFS6kSBRsz6TuTGg==",
    3006             "dev": true,
    3007             "requires": {
    3008                 "chalk": "^2.4.1",
    3009                 "clean-css": "~4.2.1",
    3010                 "maxmin": "^2.1.0"
    3011             },
    3012             "dependencies": {
    3013                 "ansi-styles": {
    3014                     "version": "3.2.1",
    3015                     "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
    3016                     "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
    3017                     "dev": true,
    3018                     "requires": {
    3019                         "color-convert": "^1.9.0"
    3020                     }
    3021                 },
    3022                 "chalk": {
    3023                     "version": "2.4.2",
    3024                     "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
    3025                     "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
    3026                     "dev": true,
    3027                     "requires": {
    3028                         "ansi-styles": "^3.2.1",
    3029                         "escape-string-regexp": "^1.0.5",
    3030                         "supports-color": "^5.3.0"
    3031                     }
    3032                 },
    3033                 "color-convert": {
    3034                     "version": "1.9.3",
    3035                     "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
    3036                     "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
    3037                     "dev": true,
    3038                     "requires": {
    3039                         "color-name": "1.1.3"
    3040                     }
    3041                 },
    3042                 "color-name": {
    3043                     "version": "1.1.3",
    3044                     "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
    3045                     "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
    3046                     "dev": true
    3047                 },
    3048                 "has-flag": {
     3003            "version": "4.0.0",
     3004            "resolved": "https://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-4.0.0.tgz",
     3005            "integrity": "sha512-jXU+Zlk8Q8XztOGNGpjYlD/BDQ0n95IHKrQKtFR7Gd8hZrzgqiG1Ra7cGYc8h2DD9vkSFGNlweb9Q00rBxOK2w==",
     3006            "dev": true,
     3007            "requires": {
     3008                "chalk": "^4.1.0",
     3009                "clean-css": "^5.0.1",
     3010                "maxmin": "^3.0.0"
     3011            },
     3012            "dependencies": {
     3013                "figures": {
     3014                    "version": "3.2.0",
     3015                    "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
     3016                    "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
     3017                    "dev": true,
     3018                    "requires": {
     3019                        "escape-string-regexp": "^1.0.5"
     3020                    }
     3021                },
     3022                "gzip-size": {
     3023                    "version": "5.1.1",
     3024                    "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz",
     3025                    "integrity": "sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==",
     3026                    "dev": true,
     3027                    "requires": {
     3028                        "duplexer": "^0.1.1",
     3029                        "pify": "^4.0.1"
     3030                    }
     3031                },
     3032                "maxmin": {
    30493033                    "version": "3.0.0",
    3050                     "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
    3051                     "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
    3052                     "dev": true
    3053                 },
    3054                 "supports-color": {
    3055                     "version": "5.5.0",
    3056                     "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
    3057                     "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
    3058                     "dev": true,
    3059                     "requires": {
    3060                         "has-flag": "^3.0.0"
     3034                    "resolved": "https://registry.npmjs.org/maxmin/-/maxmin-3.0.0.tgz",
     3035                    "integrity": "sha512-wcahMInmGtg/7c6a75fr21Ch/Ks1Tb+Jtoan5Ft4bAI0ZvJqyOw8kkM7e7p8hDSzY805vmxwHT50KcjGwKyJ0g==",
     3036                    "dev": true,
     3037                    "requires": {
     3038                        "chalk": "^4.1.0",
     3039                        "figures": "^3.2.0",
     3040                        "gzip-size": "^5.1.1",
     3041                        "pretty-bytes": "^5.3.0"
    30613042                    }
    30623043                }
     
    57715752        },
    57725753        "sass": {
    5773             "version": "1.32.6",
    5774             "resolved": "https://registry.npmjs.org/sass/-/sass-1.32.6.tgz",
    5775             "integrity": "sha512-1bcDHDcSqeFtMr0JXI3xc/CXX6c4p0wHHivJdru8W7waM7a1WjKMm4m/Z5sY7CbVw4Whi2Chpcw6DFfSWwGLzQ==",
     5754            "version": "1.32.8",
     5755            "resolved": "https://registry.npmjs.org/sass/-/sass-1.32.8.tgz",
     5756            "integrity": "sha512-Sl6mIeGpzjIUZqvKnKETfMf0iDAswD9TNlv13A7aAF3XZlRPMq4VvJWBC2N2DXbp94MQVdNSFG6LfF/iOXrPHQ==",
    57765757            "dev": true,
    57775758            "requires": {
     
    68516832        },
    68526833        "wait-on": {
    6853             "version": "5.2.1",
    6854             "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-5.2.1.tgz",
    6855             "integrity": "sha512-H2F986kNWMU9hKlI9l/ppO6tN8ZSJd35yBljMLa1/vjzWP++Qh6aXyt77/u7ySJFZQqBtQxnvm/xgG48AObXcw==",
     6834            "version": "5.3.0",
     6835            "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-5.3.0.tgz",
     6836            "integrity": "sha512-DwrHrnTK+/0QFaB9a8Ol5Lna3k7WvUR4jzSKmz0YaPBpuN2sACyiPVKVfj6ejnjcajAcvn3wlbTyMIn9AZouOg==",
    68566837            "dev": true,
    68576838            "requires": {
    68586839                "axios": "^0.21.1",
    68596840                "joi": "^17.3.0",
    6860                 "lodash": "^4.17.20",
     6841                "lodash": "^4.17.21",
    68616842                "minimist": "^1.2.5",
    68626843                "rxjs": "^6.6.3"
    68636844            },
    68646845            "dependencies": {
     6846                "lodash": {
     6847                    "version": "4.17.21",
     6848                    "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
     6849                    "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
     6850                    "dev": true
     6851                },
    68656852                "rxjs": {
    6866                     "version": "6.6.3",
    6867                     "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
    6868                     "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
     6853                    "version": "6.6.7",
     6854                    "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
     6855                    "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
    68696856                    "dev": true,
    68706857                    "requires": {
  • branches/4.1/package.json

    r50247 r50643  
    2222        "grunt-contrib-concat": "1.0.1",
    2323        "grunt-contrib-copy": "~1.0.0",
    24         "grunt-contrib-cssmin": "~3.0.0",
     24        "grunt-contrib-cssmin": "~4.0.0",
    2525        "grunt-contrib-imagemin": "~4.0.0",
    2626        "grunt-contrib-jshint": "3.0.0",
     
    3434        "grunt-sass": "~3.1.0",
    3535        "matchdep": "~2.0.0",
    36         "sass": "^1.32.6",
    37         "wait-on": "5.2.1"
     36        "sass": "^1.32.8",
     37        "wait-on": "^5.3.0"
    3838    },
    3939    "scripts": {
Note: See TracChangeset for help on using the changeset viewer.