Merge branch 'master' into master

This commit is contained in:
Chris Kankiewicz
2022-01-22 19:09:46 -07:00
committed by GitHub
5 changed files with 3021 additions and 2818 deletions

View File

@@ -5,7 +5,7 @@ ENV HOME="/tmp"
ENV COMPOSER_HOME="/tmp"
ENV XDG_CONFIG_HOME="/tmp/.config"
COPY --from=composer:2.0 /usr/bin/composer /usr/bin/composer
COPY --from=composer:2.1 /usr/bin/composer /usr/bin/composer
COPY --from=node:16.8 /usr/local/bin/node /usr/local/bin/node
COPY --from=node:16.8 /usr/local/lib/node_modules /usr/local/lib/node_modules

View File

@@ -38,7 +38,7 @@
"johnkary/phpunit-speedtrap": "^4.0",
"phlak/coding-standards": "^2.0",
"phpstan/phpstan": "^1.0",
"psy/psysh": "^0.10",
"psy/psysh": "^0.11.0",
"symfony/var-dumper": "^5.0",
"yoast/phpunit-polyfills": "^1.0"
},

987
composer.lock generated

File diff suppressed because it is too large Load Diff

4846
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -3,7 +3,7 @@
"author": "Chris Kankiewicz",
"license": "MIT",
"scripts": {
"cs": "npx eslint app/resources/js/**/*.js || true",
"cs": "npx eslint \"app/resources/js/**/*.js\"",
"dev": "npm run development",
"development": "mix",
"watch": "mix watch",