Merge branch 'develop' into 985-add-passkey-support-for-admin-login

This commit is contained in:
Jonny Barnes 2023-10-27 20:29:14 +01:00
commit 4253764f39
Signed by: jonny
SSH key fingerprint: SHA256:CTuSlns5U7qlD9jqHvtnVmfYV3Zwl2Z7WnJ4/dqOaL8
6 changed files with 1703 additions and 1345 deletions

View file

@ -41,7 +41,7 @@
"laravel/sail": "^1.18", "laravel/sail": "^1.18",
"mockery/mockery": "^1.4.4", "mockery/mockery": "^1.4.4",
"nunomaduro/collision": "^7.0", "nunomaduro/collision": "^7.0",
"openai-php/client": "^0.6.1", "openai-php/client": "^0.7.1",
"phpunit/php-code-coverage": "^10.0", "phpunit/php-code-coverage": "^10.0",
"phpunit/phpunit": "^10.1", "phpunit/phpunit": "^10.1",
"psalm/plugin-laravel": "^2.8", "psalm/plugin-laravel": "^2.8",

1580
composer.lock generated

File diff suppressed because it is too large Load diff

1446
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -5,29 +5,29 @@
"repository": "https://github.com/jonnybarnes/jonnybarnes.uk", "repository": "https://github.com/jonnybarnes/jonnybarnes.uk",
"license": "CC0-1.0", "license": "CC0-1.0",
"devDependencies": { "devDependencies": {
"@babel/core": "^7.22.11", "@babel/core": "^7.23.2",
"@babel/preset-env": "^7.22.10", "@babel/preset-env": "^7.23.2",
"@csstools/postcss-oklab-function": "^3.0.1", "@csstools/postcss-oklab-function": "^3.0.7",
"autoprefixer": "^10.4.15", "autoprefixer": "^10.4.16",
"babel-loader": "^9.1.3", "babel-loader": "^9.1.3",
"browserlist": "^1.0.1", "browserlist": "^1.0.1",
"compression-webpack-plugin": "^10.0.0", "compression-webpack-plugin": "^10.0.0",
"css-loader": "^6.8.1", "css-loader": "^6.8.1",
"cssnano": "^6.0.1", "cssnano": "^6.0.1",
"eslint": "^8.47.0", "eslint": "^8.52.0",
"eslint-webpack-plugin": "^4.0.1", "eslint-webpack-plugin": "^4.0.1",
"mini-css-extract-plugin": "^2.7.6", "mini-css-extract-plugin": "^2.7.6",
"postcss": "^8.4.28", "postcss": "^8.4.31",
"postcss-combine-duplicated-selectors": "^10.0.2", "postcss-combine-duplicated-selectors": "^10.0.2",
"postcss-combine-media-query": "^1.0.1", "postcss-combine-media-query": "^1.0.1",
"postcss-import": "^15.1.0", "postcss-import": "^15.1.0",
"postcss-loader": "^7.3.3", "postcss-loader": "^7.3.3",
"postcss-nesting": "^12.0.1", "postcss-nesting": "^12.0.1",
"style-loader": "^3.3.3", "style-loader": "^3.3.3",
"stylelint": "^15.10.3", "stylelint": "^15.11.0",
"stylelint-config-standard": "^34.0.0", "stylelint-config-standard": "^34.0.0",
"stylelint-webpack-plugin": "^4.1.1", "stylelint-webpack-plugin": "^4.1.1",
"webpack": "^5.88.2", "webpack": "^5.89.0",
"webpack-cli": "^5.1.4" "webpack-cli": "^5.1.4"
}, },
"scripts": { "scripts": {

File diff suppressed because one or more lines are too long

View file

@ -1,5 +1,5 @@
{ {
"/app.js": "/app.js?id=7e1968acfd75b8dc843675097962e3ce", "/app.js": "/app.js?id=ff1533ec4a7afad65c5bd7bcc2cc7d7b",
"/app-dark.css": "/app-dark.css?id=15c72df05e2b1147fa3e4b0670cfb435", "/app-dark.css": "/app-dark.css?id=15c72df05e2b1147fa3e4b0670cfb435",
"/app.css": "/app.css?id=4d6a1a7fe095eedc2cb2a4ce822ea8a5", "/app.css": "/app.css?id=4d6a1a7fe095eedc2cb2a4ce822ea8a5",
"/img/favicon.png": "/img/favicon.png?id=1542bfe8a0010dcbee710da13cce367f", "/img/favicon.png": "/img/favicon.png?id=1542bfe8a0010dcbee710da13cce367f",