diff --git a/.github/workflows/.pipeline.yml b/.github/workflows/.pipeline.yml index bbfccb3..4ee2846 100644 --- a/.github/workflows/.pipeline.yml +++ b/.github/workflows/.pipeline.yml @@ -28,7 +28,7 @@ jobs: - name: Install Node uses: actions/setup-node@v2 with: - node-version: '10' + node-version: '14' - name: Install OS dependencies run: sudo apt-get install libxml2-utils ghostscript poppler-utils @@ -37,7 +37,7 @@ jobs: run: sudo systemctl start mysql.service - name: Cache PHP dependencies - uses: actions/cache@v1 + uses: actions/cache@v2 with: path: vendor key: dependencies-php-${{ matrix.php }}-composer-${{ hashFiles('**/composer.lock') }} @@ -85,7 +85,7 @@ jobs: chmod +x wp-cli.phar mv wp-cli.phar /usr/local/bin/wp wp package install wp-cli/dist-archive-command - npm run build:production + npm run build composer install --no-dev --optimize-autoloader cd .. wp dist-archive $GITHUB_REPO_SLUG $GITHUB_BUILD_PATH/$GITHUB_REPO_SLUG-$GITHUB_TAG.zip diff --git a/composer.lock b/composer.lock index 27922b5..87a5913 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "d8d8b043ab5da08715e6d21993616f9e", + "content-hash": "ea6f3106bbfeb8ca34dbd2da053f16ea", "packages": [ { "name": "composer/installers", @@ -229,23 +229,23 @@ }, { "name": "spatie/color", - "version": "1.1.1", + "version": "1.2.4", "source": { "type": "git", "url": "https://github.com/spatie/color.git", - "reference": "5c424dbfa919cc7acdacbf6fdcedb89f790bc04b" + "reference": "a82a3080bd6ddc4914a6960d0a590c1c8b601e81" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/color/zipball/5c424dbfa919cc7acdacbf6fdcedb89f790bc04b", - "reference": "5c424dbfa919cc7acdacbf6fdcedb89f790bc04b", + "url": "https://api.github.com/repos/spatie/color/zipball/a82a3080bd6ddc4914a6960d0a590c1c8b601e81", + "reference": "a82a3080bd6ddc4914a6960d0a590c1c8b601e81", "shasum": "" }, "require": { - "php": "^7.0" + "php": "^7.3|^8.0" }, "require-dev": { - "phpunit/phpunit": "5.*" + "phpunit/phpunit": "^6.5||^9.0" }, "type": "library", "autoload": { @@ -273,7 +273,13 @@ "rgb", "spatie" ], - "time": "2017-02-03T10:05:49+00:00" + "funding": [ + { + "url": "https://github.com/spatie", + "type": "github" + } + ], + "time": "2021-02-18T09:37:02+00:00" } ], "packages-dev": [ @@ -2231,12 +2237,12 @@ "version": "1.9.1", "source": { "type": "git", - "url": "https://github.com/webmozart/assert.git", + "url": "https://github.com/webmozarts/assert.git", "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozart/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389", + "url": "https://api.github.com/repos/webmozarts/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389", "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389", "shasum": "" }, diff --git a/package-lock.json b/package-lock.json index 45ba71f..176d868 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7499,14 +7499,14 @@ } }, "jquery": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz", - "integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==" + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" }, "jquery-bridget": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/jquery-bridget/-/jquery-bridget-2.0.1.tgz", - "integrity": "sha1-eE0XqF5kF4DF2JrD+KfrR7C84fw=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/jquery-bridget/-/jquery-bridget-3.0.0.tgz", + "integrity": "sha512-UamdtgKjbmSUiLfUbJk+VA5q9fMRy4h2XYU1D1OlF2wzI1wIQyuIb7WTYtaMPYML2RgdAOTPyvQUmehWwoXazw==", "requires": { "jquery": ">=1.4.2 <4" } diff --git a/package.json b/package.json index 5e344bb..fccbf4c 100644 --- a/package.json +++ b/package.json @@ -59,8 +59,7 @@ }, "scripts": { "watch": "mix watch", - "prod": "npm run production", - "build:production": "npm run production", + "build": "npm run production", "production": "mix --production", "rmdist": "rimraf dist", "test": "npm run -s lint", @@ -77,6 +76,6 @@ "dependencies": { "aetna": "^1.0.0-alpha.27", "isotope-layout": "^3.0.6", - "jquery-bridget": "^2.0.1" + "jquery-bridget": "^3.0.0" } }