WordPress.org
Get WordPress

Make WordPress Core

Changeset 50624 for branches/5.0


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

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

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

Location:
branches/5.0
Files:
2 added
1 deleted
9 edited

Legend:

Unmodified
Added
Removed

  • branches/5.0

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

    r50307 r50624  
    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/5.0/.github/workflows/end-to-end-tests.yml

    r50307 r50624  
    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/5.0/.github/workflows/javascript-tests.yml

    r50307 r50624  
    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/5.0/.github/workflows/php-compatibility.yml

    r50307 r50624  
    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/5.0/.github/workflows/phpunit-tests.yml

    r50334 r50624  
    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,restapi'
    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: [ '7.3' ]
    133         phpunit: [ '6-php-7.3' ]
     137        php: [ '5.3', '5.4', '5.5' ]
    134138        os: [ ubuntu-latest ]
    135139        memcached: [ false ]
     140        split_slow: [ false, true ]
     141        multisite: [ false, true ]
    136142        include:
    137           # Include job for PHP 7.3 with memcached.
     143          # Include jobs for PHP 7.3 with memcached.
    138144          - php: '7.3'
    139145            phpunit: '6-php-7.3'
    140146            os: ubuntu-latest
    141147            memcached: true
     148            split_slow: false
     149            multisite: false
     150          - php: '7.3'
     151            phpunit: '6-php-7.3'
     152            os: ubuntu-latest
     153            memcached: true
     154            split_slow: false
     155            multisite: true
     156          # Include jobs that require specific versions of PHPUnit.
     157          - php: '7.3'
     158            phpunit: '6-php-7.3'
     159            os: ubuntu-latest
     160            memcached: false
     161            split_slow: false
     162            multisite: false
     163          - php: '7.3'
     164            phpunit: '6-php-7.3'
     165            os: ubuntu-latest
     166            memcached: false
     167            split_slow: false
     168            multisite: true
    142169          - php: '7.2'
    143170            phpunit: '6-php-7.2'
    144171            os: ubuntu-latest
    145172            memcached: false
     173            split_slow: false
     174            multisite: false
     175          - php: '7.2'
     176            phpunit: '6-php-7.2'
     177            os: ubuntu-latest
     178            memcached: false
     179            split_slow: false
     180            multisite: true
    146181          - php: '7.1'
    147182            phpunit: '6-php-7.1'
    148183            os: ubuntu-latest
    149184            memcached: false
     185            split_slow: false
     186            multisite: false
     187          - php: '7.1'
     188            phpunit: '6-php-7.1'
     189            os: ubuntu-latest
     190            memcached: false
     191            split_slow: false
     192            multisite: true
    150193          - php: '7.0'
    151194            phpunit: '6-php-7.0'
    152195            os: ubuntu-latest
    153196            memcached: false
     197            split_slow: false
     198            multisite: false
     199          - php: '7.0'
     200            phpunit: '6-php-7.0'
     201            os: ubuntu-latest
     202            memcached: false
     203            split_slow: false
     204            multisite: true
    154205          - php: '5.6'
    155206            phpunit: '4-php-5.6'
    156207            os: ubuntu-latest
    157208            memcached: false
    158           - php: '5.5'
    159             phpunit: '5.5'
    160             os: ubuntu-latest
    161             memcached: false
    162           - php: '5.4'
    163             phpunit: '5.4'
    164             os: ubuntu-latest
    165             memcached: false
    166           - php: '5.3'
    167             phpunit: '5.3'
    168             os: ubuntu-latest
    169             memcached: false
     209            split_slow: false
     210            multisite: false
     211          - php: '5.6'
     212            phpunit: '4-php-5.6'
     213            os: ubuntu-latest
     214            memcached: false
     215            split_slow: false
     216            multisite: true
     217          # Additional "slow" jobs for PHP 5.6.
     218          - php: '5.6'
     219            phpunit: '4-php-5.6'
     220            os: ubuntu-latest
     221            memcached: false
     222            split_slow: true
     223            multisite: false
     224          - php: '5.6'
     225            phpunit: '4-php-5.6'
     226            os: ubuntu-latest
     227            memcached: false
     228            split_slow: true
     229            multisite: true
     230
    170231    env:
    171232      LOCAL_PHP: ${{ matrix.php }}-fpm
    172       LOCAL_PHPUNIT: ${{ matrix.phpunit }}-fpm
     233      LOCAL_PHPUNIT: ${{ matrix.phpunit && matrix.phpunit || matrix.php }}-fpm
    173234      LOCAL_PHP_MEMCACHED: ${{ matrix.memcached }}
     235      PHPUNIT_CONFIG: ${{ matrix.multisite && 'tests/phpunit/multisite.xml' || 'phpunit.xml.dist' }}
    174236
    175237    steps:
    … …  
    180242
    181243      - name: Download the built WordPress artifact
    182         uses: actions/download-artifact@v2
     244        uses: actions/download-artifact@4a7a711286f30c025902c28b541c10e147a9b843 # v2.0.8
    183245        with:
    184246          name: built-wp-${{ github.sha }}
    … …  
    188250
    189251      - name: Install NodeJS
    190         uses: actions/setup-node@v1
     252        uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea # v2.1.5
    191253        with:
    192254          node-version: 14
    193255
    194256      - name: Use cached Node modules
    195         uses: actions/cache@v2
     257        uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
    196258        env:
    197259          cache-name: cache-node-modules
    … …  
    200262          path: ~/.npm
    201263          key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
    202           restore-keys: |
    203             ${{ runner.os }}-npm-
    204264
    205265      - name: Install Dependencies
    206         run: npx install-changed --install-command="npm ci"
     266        run: npm ci
    207267
    208268      - name: Cache Composer dependencies
    209269        if: ${{ env.COMPOSER_INSTALL == true }}
    210         uses: actions/cache@v2
     270        uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4
    211271        env:
    212272          cache-name: cache-composer-dependencies
    … …  
    214274          path: ${{ steps.composer-cache.outputs.dir }}
    215275          key: ${{ runner.os }}-php-${{ matrix.php }}-composer-${{ hashFiles('**/composer.lock') }}
    216           restore-keys: |
    217             ${{ runner.os }}-php-${{ matrix.php }}-composer-
    218276
    219277      - name: Install Composer dependencies
    … …  
    261319        run: npm run env:install
    262320
     321      - name: Run slow PHPUnit tests
     322        if: ${{ matrix.split_slow }}
     323        run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c ${{ env.PHPUNIT_CONFIG }} --group ${{ env.SLOW_TESTS }}
     324
     325      - name: Run PHPUnit tests for single site excluding slow tests
     326        if: ${{ matrix.php < '7.0' && ! matrix.split_slow && ! matrix.multisite }}
     327        run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c ${{ env.PHPUNIT_CONFIG }} --exclude-group ${{ env.SLOW_TESTS }},ajax,ms-files,ms-required
     328
     329      - name: Run PHPUnit tests for Multisite excluding slow tests
     330        if: ${{ matrix.php < '7.0' && ! matrix.split_slow && matrix.multisite }}
     331        run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c ${{ env.PHPUNIT_CONFIG }} --exclude-group ${{ env.SLOW_TESTS }},ajax,ms-files,ms-excluded,oembed-headers
     332
    263333      - name: Run PHPUnit tests
    264         run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c phpunit.xml.dist
     334        if: ${{ matrix.php >= '7.0' }}
     335        run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c ${{ env.PHPUNIT_CONFIG }}
    265336
    266337      - name: Run AJAX tests
    267         run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c phpunit.xml.dist --group ajax
    268 
    269       - name: Run tests as a multisite install
    270         run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c tests/phpunit/multisite.xml
     338        if: ${{ ! matrix.multisite && ! matrix.split_slow }}
     339        run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c ${{ env.PHPUNIT_CONFIG }} --group ajax
    271340
    272341      - name: Run ms-files tests as a multisite install
     342        if: ${{ matrix.multisite && ! matrix.split_slow }}
    273343        run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c tests/phpunit/multisite.xml --group ms-files
    274344
    275345      - name: Run external HTTP tests
     346        if: ${{ ! matrix.multisite && ! matrix.split_slow }}
    276347        run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c phpunit.xml.dist --group external-http
    277 
    278       - name: Run REST API tests
    279         run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c phpunit.xml.dist --group restapi-jsclient
    280348
    281349      - name: Checkout the WordPress Test Reporter
    282350        if: ${{ github.repository == 'WordPress/wordpress-develop' && github.ref == 'refs/heads/master' && matrix.report }}
    283         uses: actions/checkout@v2
     351        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
    284352        with:
    285353          repository: 'WordPress/phpunit-test-runner'

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

    r50307 r50624  
    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/5.0/package-lock.json

    r50201 r50624  
    4444            }
    4545        },
     46        "@hapi/hoek": {
     47            "version": "9.1.1",
     48            "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.1.1.tgz",
     49            "integrity": "sha512-CAEbWH7OIur6jEOzaai83jq3FmKmv4PmX1JYfs9IrYcGEVI/lyL1EXJGCj7eFVJ0bg5QR8LMxBlEtA+xKiLpFw==",
     50            "dev": true
     51        },
     52        "@hapi/topo": {
     53            "version": "5.0.0",
     54            "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.0.0.tgz",
     55            "integrity": "sha512-tFJlT47db0kMqVm3H4nQYgn6Pwg10GTZHb1pwmSiv1K4ks6drQOtfEF5ZnPjkvC+y4/bUPHK+bc87QvLcL+WMw==",
     56            "dev": true,
     57            "requires": {
     58                "@hapi/hoek": "^9.0.0"
     59            }
     60        },
    4661        "@mrmlnc/readdir-enhanced": {
    4762            "version": "2.2.1",
    … …  
    5570        },
    5671        "@sideway/address": {
    57             "version": "4.1.0",
    58             "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.0.tgz",
    59             "integrity": "sha512-wAH/JYRXeIFQRsxerIuLjgUu2Xszam+O5xKeatJ4oudShOOirfmsQ1D6LL54XOU2tizpCYku+s1wmU0SYdpoSA==",
     72            "version": "4.1.1",
     73            "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.1.tgz",
     74            "integrity": "sha512-+I5aaQr3m0OAmMr7RQ3fR9zx55sejEYR2BFJaxL+zT3VM2611X0SHvPWIbAUBZVTn/YzYKbV8gJ2oT/QELknfQ==",
    6075            "dev": true,
    6176            "requires": {
    6277                "@hapi/hoek": "^9.0.0"
    63             },
    64             "dependencies": {
    65                 "@hapi/hoek": {
    66                     "version": "9.1.1",
    67                     "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.1.1.tgz",
    68                     "integrity": "sha512-CAEbWH7OIur6jEOzaai83jq3FmKmv4PmX1JYfs9IrYcGEVI/lyL1EXJGCj7eFVJ0bg5QR8LMxBlEtA+xKiLpFw==",
    69                     "dev": true
    70                 }
    7178            }
    7279        },
    … …  
    31803187        },
    31813188        "clean-css": {
    3182             "version": "4.2.3",
    3183             "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz",
    3184             "integrity": "sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==",
     3189            "version": "5.1.2",
     3190            "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.1.2.tgz",
     3191            "integrity": "sha512-QcaGg9OuMo+0Ds933yLOY+gHPWbxhxqF0HDexmToPf8pczvmvZGYzd+QqWp9/mkucAOKViI+dSFOqoZIvXbeBw==",
    31853192            "dev": true,
    31863193            "requires": {
    … …  
    63146321        },
    63156322        "grunt-contrib-cssmin": {
    6316             "version": "3.0.0",
    6317             "resolved": "https://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-3.0.0.tgz",
    6318             "integrity": "sha512-eXpooYmVGKMs/xV7DzTLgJFPVOfMuawPD3x0JwhlH0mumq2NtH3xsxaHxp1Y3NKxp0j0tRhFS6kSBRsz6TuTGg==",
    6319             "dev": true,
    6320             "requires": {
    6321                 "chalk": "^2.4.1",
    6322                 "clean-css": "~4.2.1",
    6323                 "maxmin": "^2.1.0"
    6324             },
    6325             "dependencies": {
    6326                 "chalk": {
    6327                     "version": "2.4.2",
    6328                     "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
    6329                     "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
    6330                     "dev": true,
    6331                     "requires": {
    6332                         "ansi-styles": "^3.2.1",
    6333                         "escape-string-regexp": "^1.0.5",
    6334                         "supports-color": "^5.3.0"
    6335                     }
     6323            "version": "4.0.0",
     6324            "resolved": "https://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-4.0.0.tgz",
     6325            "integrity": "sha512-jXU+Zlk8Q8XztOGNGpjYlD/BDQ0n95IHKrQKtFR7Gd8hZrzgqiG1Ra7cGYc8h2DD9vkSFGNlweb9Q00rBxOK2w==",
     6326            "dev": true,
     6327            "requires": {
     6328                "chalk": "^4.1.0",
     6329                "clean-css": "^5.0.1",
     6330                "maxmin": "^3.0.0"
     6331            },
     6332            "dependencies": {
     6333                "figures": {
     6334                    "version": "3.2.0",
     6335                    "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
     6336                    "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
     6337                    "dev": true,
     6338                    "requires": {
     6339                        "escape-string-regexp": "^1.0.5"
     6340                    }
     6341                },
     6342                "maxmin": {
     6343                    "version": "3.0.0",
     6344                    "resolved": "https://registry.npmjs.org/maxmin/-/maxmin-3.0.0.tgz",
     6345                    "integrity": "sha512-wcahMInmGtg/7c6a75fr21Ch/Ks1Tb+Jtoan5Ft4bAI0ZvJqyOw8kkM7e7p8hDSzY805vmxwHT50KcjGwKyJ0g==",
     6346                    "dev": true,
     6347                    "requires": {
     6348                        "chalk": "^4.1.0",
     6349                        "figures": "^3.2.0",
     6350                        "gzip-size": "^5.1.1",
     6351                        "pretty-bytes": "^5.3.0"
     6352                    }
     6353                },
     6354                "pretty-bytes": {
     6355                    "version": "5.6.0",
     6356                    "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz",
     6357                    "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==",
     6358                    "dev": true
    63366359                }
    63376360            }
    … …  
    68316854                    "dev": true
    68326855                }
     6856            }
     6857        },
     6858        "gzip-size": {
     6859            "version": "5.1.1",
     6860            "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz",
     6861            "integrity": "sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==",
     6862            "dev": true,
     6863            "requires": {
     6864                "duplexer": "^0.1.1",
     6865                "pify": "^4.0.1"
    68336866            }
    68346867        },
    … …  
    79537986        },
    79547987        "joi": {
    7955             "version": "17.3.0",
    7956             "resolved": "https://registry.npmjs.org/joi/-/joi-17.3.0.tgz",
    7957             "integrity": "sha512-Qh5gdU6niuYbUIUV5ejbsMiiFmBdw8Kcp8Buj2JntszCkCfxJ9Cz76OtHxOZMPXrt5810iDIXs+n1nNVoquHgg==",
     7988            "version": "17.4.0",
     7989            "resolved": "https://registry.npmjs.org/joi/-/joi-17.4.0.tgz",
     7990            "integrity": "sha512-F4WiW2xaV6wc1jxete70Rw4V/VuMd6IN+a5ilZsxG4uYtUXWu2kq9W5P2dz30e7Gmw8RCbY/u/uk+dMPma9tAg==",
    79587991            "dev": true,
    79597992            "requires": {
    … …  
    79637996                "@sideway/formula": "^3.0.0",
    79647997                "@sideway/pinpoint": "^2.0.0"
    7965             },
    7966             "dependencies": {
    7967                 "@hapi/hoek": {
    7968                     "version": "9.1.1",
    7969                     "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.1.1.tgz",
    7970                     "integrity": "sha512-CAEbWH7OIur6jEOzaai83jq3FmKmv4PmX1JYfs9IrYcGEVI/lyL1EXJGCj7eFVJ0bg5QR8LMxBlEtA+xKiLpFw==",
    7971                     "dev": true
    7972                 },
    7973                 "@hapi/topo": {
    7974                     "version": "5.0.0",
    7975                     "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.0.0.tgz",
    7976                     "integrity": "sha512-tFJlT47db0kMqVm3H4nQYgn6Pwg10GTZHb1pwmSiv1K4ks6drQOtfEF5ZnPjkvC+y4/bUPHK+bc87QvLcL+WMw==",
    7977                     "dev": true,
    7978                     "requires": {
    7979                         "@hapi/hoek": "^9.0.0"
    7980                     }
    7981                 }
    79827998            }
    79837999        },
    … …  
    1145811474        },
    1145911475        "sass": {
    11460             "version": "1.32.6",
    11461             "resolved": "https://registry.npmjs.org/sass/-/sass-1.32.6.tgz",
    11462             "integrity": "sha512-1bcDHDcSqeFtMr0JXI3xc/CXX6c4p0wHHivJdru8W7waM7a1WjKMm4m/Z5sY7CbVw4Whi2Chpcw6DFfSWwGLzQ==",
     11476            "version": "1.32.8",
     11477            "resolved": "https://registry.npmjs.org/sass/-/sass-1.32.8.tgz",
     11478            "integrity": "sha512-Sl6mIeGpzjIUZqvKnKETfMf0iDAswD9TNlv13A7aAF3XZlRPMq4VvJWBC2N2DXbp94MQVdNSFG6LfF/iOXrPHQ==",
    1146311479            "dev": true,
    1146411480            "requires": {
    … …  
    1285612872            "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM="
    1285712873        },
     12874        "tslib": {
     12875            "version": "1.14.1",
     12876            "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
     12877            "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
     12878            "dev": true
     12879        },
    1285812880        "tsort": {
    1285912881            "version": "0.0.1",
    … …  
    1291012932        },
    1291112933        "uglify-js": {
    12912             "version": "3.12.6",
    12913             "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.6.tgz",
    12914             "integrity": "sha512-aqWHe3DfQmZUDGWBbabZ2eQnJlQd1fKlMUu7gV+MiTuDzdgDw31bI3wA2jLLsV/hNcDP26IfyEgSVoft5+0SVw=="
     12934            "version": "3.13.3",
     12935            "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.3.tgz",
     12936            "integrity": "sha512-otIc7O9LyxpUcQoXzj2hL4LPWKklO6LJWoJUzNa8A17Xgi4fOeDC8FBDOLHnC/Slo1CQgsZMcM6as0M76BZaig=="
    1291512937        },
    1291612938        "unbzip2-stream": {
    … …  
    1321413236        },
    1321513237        "wait-on": {
    13216             "version": "5.2.1",
    13217             "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-5.2.1.tgz",
    13218             "integrity": "sha512-H2F986kNWMU9hKlI9l/ppO6tN8ZSJd35yBljMLa1/vjzWP++Qh6aXyt77/u7ySJFZQqBtQxnvm/xgG48AObXcw==",
     13238            "version": "5.3.0",
     13239            "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-5.3.0.tgz",
     13240            "integrity": "sha512-DwrHrnTK+/0QFaB9a8Ol5Lna3k7WvUR4jzSKmz0YaPBpuN2sACyiPVKVfj6ejnjcajAcvn3wlbTyMIn9AZouOg==",
    1321913241            "dev": true,
    1322013242            "requires": {
    1322113243                "axios": "^0.21.1",
    1322213244                "joi": "^17.3.0",
    13223                 "lodash": "^4.17.20",
     13245                "lodash": "^4.17.21",
    1322413246                "minimist": "^1.2.5",
    1322513247                "rxjs": "^6.6.3"
    … …  
    1322713249            "dependencies": {
    1322813250                "lodash": {
    13229                     "version": "4.17.20",
    13230                     "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
    13231                     "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
     13251                    "version": "4.17.21",
     13252                    "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
     13253                    "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
    1323213254                    "dev": true
    1323313255                },
    1323413256                "rxjs": {
    13235                     "version": "6.6.3",
    13236                     "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
    13237                     "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
     13257                    "version": "6.6.7",
     13258                    "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
     13259                    "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
    1323813260                    "dev": true,
    1323913261                    "requires": {
    1324013262                        "tslib": "^1.9.0"
    1324113263                    }
    13242                 },
    13243                 "tslib": {
    13244                     "version": "1.14.1",
    13245                     "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
    13246                     "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
    13247                     "dev": true
    1324813264                }
    1324913265            }

  • branches/5.0/package.json

    r50201 r50624  
    3939        "grunt-contrib-concat": "1.0.1",
    4040        "grunt-contrib-copy": "~1.0.0",
    41         "grunt-contrib-cssmin": "~3.0.0",
     41        "grunt-contrib-cssmin": "~4.0.0",
    4242        "grunt-contrib-imagemin": "~4.0.0",
    4343        "grunt-contrib-jshint": "3.0.0",
    … …  
    5757        "ink-docstrap": "1.3.2",
    5858        "matchdep": "~2.0.0",
    59         "sass": "^1.32.6",
     59        "sass": "^1.32.8",
    6060        "source-map-loader": "^1.1.3",
    61         "uglify-js": "^3.12.6",
    62         "wait-on": "5.2.1",
     61        "uglify-js": "^3.13.2",
     62        "wait-on": "^5.3.0",
    6363        "webpack": "4.43.0",
    6464        "webpack-dev-server": "3.11.2",
Note: See TracChangeset for help on using the changeset viewer.