From 69d211311f5cd10548e7ff8c6b9de8d74cc2424d Mon Sep 17 00:00:00 2001 From: Owen Buckley Date: Sun, 10 Mar 2024 15:59:26 -0400 Subject: [PATCH 01/26] upgrade greenwood v0.30.0 --- package-lock.json | 664 ++++++++++++++++++++++++++++++++++++---------- package.json | 10 +- 2 files changed, 533 insertions(+), 141 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8848ff3..e470fe9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -23,11 +23,11 @@ "@aws-sdk/client-cloudfront": "^3.47.0", "@aws-sdk/client-s3": "^3.46.0", "@esm-bundle/chai": "^4.3.4", - "@greenwood/cli": "^0.29.0", - "@greenwood/plugin-google-analytics": "^0.29.0", - "@greenwood/plugin-import-css": "^0.29.0", - "@greenwood/plugin-postcss": "^0.29.0", - "@greenwood/plugin-typescript": "^0.29.0", + "@greenwood/cli": "^0.30.0-alpha.0", + "@greenwood/plugin-google-analytics": "^0.30.0-alpha.0", + "@greenwood/plugin-import-css": "^0.30.0-alpha.0", + "@greenwood/plugin-postcss": "^0.30.0-alpha.0", + "@greenwood/plugin-typescript": "^0.30.0-alpha.0", "@ls-lint/ls-lint": "^1.10.0", "@rollup/plugin-dynamic-import-vars": "^1.4.1", "@storybook/addon-actions": "^6.3.2", @@ -3378,15 +3378,15 @@ "dev": true }, "node_modules/@greenwood/cli": { - "version": "0.29.0", - "resolved": "https://registry.npmjs.org/@greenwood/cli/-/cli-0.29.0.tgz", - "integrity": "sha512-/mqXakf4ciN7j3O7iErp5xJJaginfDlL+F7oPaGo6ndqwgkPArFCrXa/C/svbmuiaymDCDCRjaAwmzsmMhHVPA==", + "version": "0.30.0-alpha.0", + "resolved": "https://registry.npmjs.org/@greenwood/cli/-/cli-0.30.0-alpha.0.tgz", + "integrity": "sha512-TZDWu24Rm7H/MDMhRuZGdFZzqKRUw5lD7JlBzSNK+RtJ1J4pn0T/csOqNjmWJojm09tAL0dFhfgGCfAxBiffWw==", "dev": true, "dependencies": { - "@rollup/plugin-commonjs": "^21.0.0", - "@rollup/plugin-node-resolve": "^13.0.0", - "@rollup/plugin-replace": "^2.3.4", - "@rollup/plugin-terser": "^0.1.0", + "@rollup/plugin-commonjs": "^25.0.0", + "@rollup/plugin-node-resolve": "^15.0.0", + "@rollup/plugin-replace": "^5.0.5", + "@rollup/plugin-terser": "^0.4.4", "acorn": "^8.0.1", "acorn-walk": "^8.0.0", "commander": "^2.20.0", @@ -3403,9 +3403,9 @@ "remark-frontmatter": "^2.0.0", "remark-parse": "^8.0.3", "remark-rehype": "^7.0.0", - "rollup": "^2.58.0", + "rollup": "^3.29.4", "unified": "^9.2.0", - "wc-compiler": "~0.9.0" + "wc-compiler": "~0.12.0" }, "bin": { "greenwood": "src/index.js" @@ -3414,28 +3414,103 @@ "node": ">=18.12.1" } }, + "node_modules/@greenwood/cli/node_modules/@rollup/plugin-node-resolve": { + "version": "15.2.3", + "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.2.3.tgz", + "integrity": "sha512-j/lym8nf5E21LwBT4Df1VD6hRO2L2iwUeUmP7litikRsVp1H6NWx20NEp0Y7su+7XGc476GnXXc4kFeZNGmaSQ==", + "dev": true, + "dependencies": { + "@rollup/pluginutils": "^5.0.1", + "@types/resolve": "1.20.2", + "deepmerge": "^4.2.2", + "is-builtin-module": "^3.2.1", + "is-module": "^1.0.0", + "resolve": "^1.22.1" + }, + "engines": { + "node": ">=14.0.0" + }, + "peerDependencies": { + "rollup": "^2.78.0||^3.0.0||^4.0.0" + }, + "peerDependenciesMeta": { + "rollup": { + "optional": true + } + } + }, + "node_modules/@greenwood/cli/node_modules/@rollup/pluginutils": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.0.tgz", + "integrity": "sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==", + "dev": true, + "dependencies": { + "@types/estree": "^1.0.0", + "estree-walker": "^2.0.2", + "picomatch": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + }, + "peerDependencies": { + "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0" + }, + "peerDependenciesMeta": { + "rollup": { + "optional": true + } + } + }, + "node_modules/@greenwood/cli/node_modules/@types/estree": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", + "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", + "dev": true + }, + "node_modules/@greenwood/cli/node_modules/@types/resolve": { + "version": "1.20.2", + "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.2.tgz", + "integrity": "sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==", + "dev": true + }, + "node_modules/@greenwood/cli/node_modules/rollup": { + "version": "3.29.4", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz", + "integrity": "sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==", + "dev": true, + "bin": { + "rollup": "dist/bin/rollup" + }, + "engines": { + "node": ">=14.18.0", + "npm": ">=8.0.0" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, "node_modules/@greenwood/plugin-google-analytics": { - "version": "0.29.0", - "resolved": "https://registry.npmjs.org/@greenwood/plugin-google-analytics/-/plugin-google-analytics-0.29.0.tgz", - "integrity": "sha512-X67DwK7SUBPowzQBw0vYU1Jq1UiRabKc3IVG6sOczWDBL1OMcKLyxvQwejN5HoWEvhoQoOZB02CC9POU9dbCwg==", + "version": "0.30.0-alpha.0", + "resolved": "https://registry.npmjs.org/@greenwood/plugin-google-analytics/-/plugin-google-analytics-0.30.0-alpha.0.tgz", + "integrity": "sha512-GeEriXvzzozBlF18+4lLKN8gU6R55LBjS3QLbqYjSpeg14XJ5UEJqy3zk3gxsI0rf4s1ilc9dY3ewBN/v8qvDg==", "dev": true, "peerDependencies": { "@greenwood/cli": "^0.4.0" } }, "node_modules/@greenwood/plugin-import-css": { - "version": "0.29.0", - "resolved": "https://registry.npmjs.org/@greenwood/plugin-import-css/-/plugin-import-css-0.29.0.tgz", - "integrity": "sha512-2FMk3qs8umOuR4bb4xSuW1bRGV1Pk1QS1QY6sk5BNhOIO5+ZphtuIrVTJUcfxHzLw4BBOG4Xws6LJCs5XfNfjw==", + "version": "0.30.0-alpha.0", + "resolved": "https://registry.npmjs.org/@greenwood/plugin-import-css/-/plugin-import-css-0.30.0-alpha.0.tgz", + "integrity": "sha512-prRZFX2nDyQY1eqxWEuUMV20E44ueGwojL6uRdW7nel9mE44n21d8wMACnkI2ag4GDiYz6I64h/QM2grTm0/Sw==", "dev": true, "peerDependencies": { "@greenwood/cli": "^0.4.0" } }, "node_modules/@greenwood/plugin-postcss": { - "version": "0.29.0", - "resolved": "https://registry.npmjs.org/@greenwood/plugin-postcss/-/plugin-postcss-0.29.0.tgz", - "integrity": "sha512-Q5/yOR/Da5Homufxv2bk96uE/YSJZUt9bEP/PS7sLeBaCzbSvFMkCytPDoanmfkUClHBDsCgeHZ04sPwq4g6Gw==", + "version": "0.30.0-alpha.0", + "resolved": "https://registry.npmjs.org/@greenwood/plugin-postcss/-/plugin-postcss-0.30.0-alpha.0.tgz", + "integrity": "sha512-T8lJKBUrSF9oJFrmDqqBKBfX6vtilSjX6o2b99Vw0STHC9TJ1BTocptXhS6PGy1sKPOG3MzEWvKMWWarhnLOwg==", "dev": true, "dependencies": { "postcss": "^8.3.11", @@ -3447,9 +3522,9 @@ } }, "node_modules/@greenwood/plugin-typescript": { - "version": "0.29.0", - "resolved": "https://registry.npmjs.org/@greenwood/plugin-typescript/-/plugin-typescript-0.29.0.tgz", - "integrity": "sha512-FhDyBW8XAVPddMfjYGJi1oS+nqhPBjwUrrjY3U2ZqSf6r66QT+Q36EcE6VfABCVRgnxHhVuheMZVpVVC+s3VdQ==", + "version": "0.30.0-alpha.0", + "resolved": "https://registry.npmjs.org/@greenwood/plugin-typescript/-/plugin-typescript-0.30.0-alpha.0.tgz", + "integrity": "sha512-ERYmUubVZgwGQZem5tVNQQlRsqeqyF1PNN33O6U2wENPE0/TDjUVgjuRvp7opOSfrRb7oIdW17w8i/FYWnwFaw==", "dev": true, "dependencies": { "typescript": "^5.1.6" @@ -4116,25 +4191,139 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/@projectevergreen/acorn-jsx-esm": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/@projectevergreen/acorn-jsx-esm/-/acorn-jsx-esm-0.1.0.tgz", + "integrity": "sha512-ZBSkr0e2M4ylq74dTGHSkWI2dF3Mz8zwBLyzIXZMftecKDADcsCTj7bWltVgtdl8Rh4+bmY1jNWUw7AlSV/r7A==", + "dev": true, + "peerDependencies": { + "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" + } + }, + "node_modules/@projectevergreen/escodegen-esm": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/@projectevergreen/escodegen-esm/-/escodegen-esm-0.1.0.tgz", + "integrity": "sha512-LM9FFffsXPHiOFt78K3bgF8kO8Fx+qluAPy9jP3H4lvCFE+2nbwQM4cWdOpVik++rHf4pkDA7FxDPWWATyBABg==", + "dev": true, + "dependencies": { + "esprima": "^4.0.1", + "estraverse": "^5.2.0", + "esutils": "^2.0.2" + }, + "bin": { + "escodegen": "bin/escodegen.js", + "esgenerate": "bin/esgenerate.js" + }, + "engines": { + "node": ">=6.0" + }, + "optionalDependencies": { + "source-map": "~0.6.1" + } + }, "node_modules/@rollup/plugin-commonjs": { - "version": "21.1.0", - "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-21.1.0.tgz", - "integrity": "sha512-6ZtHx3VHIp2ReNNDxHjuUml6ur+WcQ28N1yHgCQwsbNkQg2suhxGMDQGJOn/KuDxKtd1xuZP5xSTwBA4GQ8hbA==", + "version": "25.0.7", + "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-25.0.7.tgz", + "integrity": "sha512-nEvcR+LRjEjsaSsc4x3XZfCCvZIaSMenZu/OiwOKGN2UhQpAYI7ru7czFvyWbErlpoGjnSX3D5Ch5FcMA3kRWQ==", "dev": true, "dependencies": { - "@rollup/pluginutils": "^3.1.0", + "@rollup/pluginutils": "^5.0.1", "commondir": "^1.0.1", - "estree-walker": "^2.0.1", - "glob": "^7.1.6", - "is-reference": "^1.2.1", - "magic-string": "^0.25.7", - "resolve": "^1.17.0" + "estree-walker": "^2.0.2", + "glob": "^8.0.3", + "is-reference": "1.2.1", + "magic-string": "^0.30.3" }, "engines": { - "node": ">= 8.0.0" + "node": ">=14.0.0" }, "peerDependencies": { - "rollup": "^2.38.3" + "rollup": "^2.68.0||^3.0.0||^4.0.0" + }, + "peerDependenciesMeta": { + "rollup": { + "optional": true + } + } + }, + "node_modules/@rollup/plugin-commonjs/node_modules/@rollup/pluginutils": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.0.tgz", + "integrity": "sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==", + "dev": true, + "dependencies": { + "@types/estree": "^1.0.0", + "estree-walker": "^2.0.2", + "picomatch": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + }, + "peerDependencies": { + "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0" + }, + "peerDependenciesMeta": { + "rollup": { + "optional": true + } + } + }, + "node_modules/@rollup/plugin-commonjs/node_modules/@types/estree": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", + "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", + "dev": true + }, + "node_modules/@rollup/plugin-commonjs/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/@rollup/plugin-commonjs/node_modules/glob": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", + "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^5.0.1", + "once": "^1.3.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@rollup/plugin-commonjs/node_modules/magic-string": { + "version": "0.30.8", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.8.tgz", + "integrity": "sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==", + "dev": true, + "dependencies": { + "@jridgewell/sourcemap-codec": "^1.4.15" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@rollup/plugin-commonjs/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" } }, "node_modules/@rollup/plugin-dynamic-import-vars": { @@ -4189,31 +4378,81 @@ } }, "node_modules/@rollup/plugin-replace": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-2.4.2.tgz", - "integrity": "sha512-IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg==", + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-5.0.5.tgz", + "integrity": "sha512-rYO4fOi8lMaTg/z5Jb+hKnrHHVn8j2lwkqwyS4kTRhKyWOLf2wST2sWXr4WzWiTcoHTp2sTjqUbqIj2E39slKQ==", "dev": true, "dependencies": { - "@rollup/pluginutils": "^3.1.0", - "magic-string": "^0.25.7" + "@rollup/pluginutils": "^5.0.1", + "magic-string": "^0.30.3" + }, + "engines": { + "node": ">=14.0.0" }, "peerDependencies": { - "rollup": "^1.20.0 || ^2.0.0" + "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0" + }, + "peerDependenciesMeta": { + "rollup": { + "optional": true + } + } + }, + "node_modules/@rollup/plugin-replace/node_modules/@rollup/pluginutils": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.0.tgz", + "integrity": "sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==", + "dev": true, + "dependencies": { + "@types/estree": "^1.0.0", + "estree-walker": "^2.0.2", + "picomatch": "^2.3.1" + }, + "engines": { + "node": ">=14.0.0" + }, + "peerDependencies": { + "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0" + }, + "peerDependenciesMeta": { + "rollup": { + "optional": true + } + } + }, + "node_modules/@rollup/plugin-replace/node_modules/@types/estree": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", + "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", + "dev": true + }, + "node_modules/@rollup/plugin-replace/node_modules/magic-string": { + "version": "0.30.8", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.8.tgz", + "integrity": "sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==", + "dev": true, + "dependencies": { + "@jridgewell/sourcemap-codec": "^1.4.15" + }, + "engines": { + "node": ">=12" } }, "node_modules/@rollup/plugin-terser": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@rollup/plugin-terser/-/plugin-terser-0.1.0.tgz", - "integrity": "sha512-N2KK+qUfHX2hBzVzM41UWGLrEmcjVC37spC8R3c9mt3oEDFKh3N2e12/lLp9aVSt86veR0TQiCNQXrm8C6aiUQ==", + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/@rollup/plugin-terser/-/plugin-terser-0.4.4.tgz", + "integrity": "sha512-XHeJC5Bgvs8LfukDwWZp7yeqin6ns8RTl2B9avbejt6tZqsqvVoWI7ZTQrcNsfKEDWBTnTxM8nMDkO2IFFbd0A==", "dev": true, "dependencies": { - "terser": "^5.15.1" + "serialize-javascript": "^6.0.1", + "smob": "^1.0.0", + "terser": "^5.17.4" }, "engines": { "node": ">=14.0.0" }, "peerDependencies": { - "rollup": "^2.x || ^3.x" + "rollup": "^2.0.0||^3.0.0||^4.0.0" }, "peerDependenciesMeta": { "rollup": { @@ -4221,6 +4460,15 @@ } } }, + "node_modules/@rollup/plugin-terser/node_modules/serialize-javascript": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", + "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", + "dev": true, + "dependencies": { + "randombytes": "^2.1.0" + } + }, "node_modules/@rollup/pluginutils": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz", @@ -8603,9 +8851,9 @@ } }, "node_modules/acorn-walk": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.0.tgz", - "integrity": "sha512-FS7hV565M5l1R08MXqo8odwMTB02C2UqzB17RVgu9EyuYFBqJZ3/ZY97sQD5FewVu1UyDFc1yztUDrAwT0EypA==", + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz", + "integrity": "sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==", "dev": true, "engines": { "node": ">=0.4.0" @@ -12841,27 +13089,6 @@ "node": ">=0.8.0" } }, - "node_modules/escodegen": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz", - "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==", - "dev": true, - "dependencies": { - "esprima": "^4.0.1", - "estraverse": "^5.2.0", - "esutils": "^2.0.2" - }, - "bin": { - "escodegen": "bin/escodegen.js", - "esgenerate": "bin/esgenerate.js" - }, - "engines": { - "node": ">=6.0" - }, - "optionalDependencies": { - "source-map": "~0.6.1" - } - }, "node_modules/eslint": { "version": "8.54.0", "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.54.0.tgz", @@ -23118,6 +23345,12 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, + "node_modules/smob": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/smob/-/smob-1.4.1.tgz", + "integrity": "sha512-9LK+E7Hv5R9u4g4C3p+jjLstaLe11MDsL21UpYaCNmapvMkYhqCV4A/f/3gyH8QjMyh6l68q9xC85vihY9ahMQ==", + "dev": true + }, "node_modules/snapdragon": { "version": "0.8.2", "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", @@ -25833,15 +26066,15 @@ } }, "node_modules/wc-compiler": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/wc-compiler/-/wc-compiler-0.9.0.tgz", - "integrity": "sha512-AmpkRrOVPP0SHUF/9Y9BEiHejw3K+58cjLDxj/cN3w5ptJ3ZKEICDn7v+gEmj+d7XDwwb/8PjeEzmBWjo877ew==", + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/wc-compiler/-/wc-compiler-0.12.0.tgz", + "integrity": "sha512-eMgHEGhJGcyjSL9p6YIix0ReMViffhtabVEnNE1oRiNlNJL/Fd8e0GZ2gdWhIOV5ZvNMOocyAKFODKpg3CDMkg==", "dev": true, "dependencies": { + "@projectevergreen/acorn-jsx-esm": "~0.1.0", + "@projectevergreen/escodegen-esm": "~0.1.0", "acorn": "^8.7.0", - "acorn-jsx": "^5.3.2", "acorn-walk": "^8.2.0", - "escodegen": "^2.0.0", "parse5": "^6.0.1" }, "engines": { @@ -29148,15 +29381,15 @@ "dev": true }, "@greenwood/cli": { - "version": "0.29.0", - "resolved": "https://registry.npmjs.org/@greenwood/cli/-/cli-0.29.0.tgz", - "integrity": "sha512-/mqXakf4ciN7j3O7iErp5xJJaginfDlL+F7oPaGo6ndqwgkPArFCrXa/C/svbmuiaymDCDCRjaAwmzsmMhHVPA==", + "version": "0.30.0-alpha.0", + "resolved": "https://registry.npmjs.org/@greenwood/cli/-/cli-0.30.0-alpha.0.tgz", + "integrity": "sha512-TZDWu24Rm7H/MDMhRuZGdFZzqKRUw5lD7JlBzSNK+RtJ1J4pn0T/csOqNjmWJojm09tAL0dFhfgGCfAxBiffWw==", "dev": true, "requires": { - "@rollup/plugin-commonjs": "^21.0.0", - "@rollup/plugin-node-resolve": "^13.0.0", - "@rollup/plugin-replace": "^2.3.4", - "@rollup/plugin-terser": "^0.1.0", + "@rollup/plugin-commonjs": "^25.0.0", + "@rollup/plugin-node-resolve": "^15.0.0", + "@rollup/plugin-replace": "^5.0.5", + "@rollup/plugin-terser": "^0.4.4", "acorn": "^8.0.1", "acorn-walk": "^8.0.0", "commander": "^2.20.0", @@ -29173,27 +29406,75 @@ "remark-frontmatter": "^2.0.0", "remark-parse": "^8.0.3", "remark-rehype": "^7.0.0", - "rollup": "^2.58.0", + "rollup": "^3.29.4", "unified": "^9.2.0", - "wc-compiler": "~0.9.0" + "wc-compiler": "~0.12.0" + }, + "dependencies": { + "@rollup/plugin-node-resolve": { + "version": "15.2.3", + "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.2.3.tgz", + "integrity": "sha512-j/lym8nf5E21LwBT4Df1VD6hRO2L2iwUeUmP7litikRsVp1H6NWx20NEp0Y7su+7XGc476GnXXc4kFeZNGmaSQ==", + "dev": true, + "requires": { + "@rollup/pluginutils": "^5.0.1", + "@types/resolve": "1.20.2", + "deepmerge": "^4.2.2", + "is-builtin-module": "^3.2.1", + "is-module": "^1.0.0", + "resolve": "^1.22.1" + } + }, + "@rollup/pluginutils": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.0.tgz", + "integrity": "sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==", + "dev": true, + "requires": { + "@types/estree": "^1.0.0", + "estree-walker": "^2.0.2", + "picomatch": "^2.3.1" + } + }, + "@types/estree": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", + "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", + "dev": true + }, + "@types/resolve": { + "version": "1.20.2", + "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.2.tgz", + "integrity": "sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==", + "dev": true + }, + "rollup": { + "version": "3.29.4", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz", + "integrity": "sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==", + "dev": true, + "requires": { + "fsevents": "~2.3.2" + } + } } }, "@greenwood/plugin-google-analytics": { - "version": "0.29.0", - "resolved": "https://registry.npmjs.org/@greenwood/plugin-google-analytics/-/plugin-google-analytics-0.29.0.tgz", - "integrity": "sha512-X67DwK7SUBPowzQBw0vYU1Jq1UiRabKc3IVG6sOczWDBL1OMcKLyxvQwejN5HoWEvhoQoOZB02CC9POU9dbCwg==", + "version": "0.30.0-alpha.0", + "resolved": "https://registry.npmjs.org/@greenwood/plugin-google-analytics/-/plugin-google-analytics-0.30.0-alpha.0.tgz", + "integrity": "sha512-GeEriXvzzozBlF18+4lLKN8gU6R55LBjS3QLbqYjSpeg14XJ5UEJqy3zk3gxsI0rf4s1ilc9dY3ewBN/v8qvDg==", "dev": true }, "@greenwood/plugin-import-css": { - "version": "0.29.0", - "resolved": "https://registry.npmjs.org/@greenwood/plugin-import-css/-/plugin-import-css-0.29.0.tgz", - "integrity": "sha512-2FMk3qs8umOuR4bb4xSuW1bRGV1Pk1QS1QY6sk5BNhOIO5+ZphtuIrVTJUcfxHzLw4BBOG4Xws6LJCs5XfNfjw==", + "version": "0.30.0-alpha.0", + "resolved": "https://registry.npmjs.org/@greenwood/plugin-import-css/-/plugin-import-css-0.30.0-alpha.0.tgz", + "integrity": "sha512-prRZFX2nDyQY1eqxWEuUMV20E44ueGwojL6uRdW7nel9mE44n21d8wMACnkI2ag4GDiYz6I64h/QM2grTm0/Sw==", "dev": true }, "@greenwood/plugin-postcss": { - "version": "0.29.0", - "resolved": "https://registry.npmjs.org/@greenwood/plugin-postcss/-/plugin-postcss-0.29.0.tgz", - "integrity": "sha512-Q5/yOR/Da5Homufxv2bk96uE/YSJZUt9bEP/PS7sLeBaCzbSvFMkCytPDoanmfkUClHBDsCgeHZ04sPwq4g6Gw==", + "version": "0.30.0-alpha.0", + "resolved": "https://registry.npmjs.org/@greenwood/plugin-postcss/-/plugin-postcss-0.30.0-alpha.0.tgz", + "integrity": "sha512-T8lJKBUrSF9oJFrmDqqBKBfX6vtilSjX6o2b99Vw0STHC9TJ1BTocptXhS6PGy1sKPOG3MzEWvKMWWarhnLOwg==", "dev": true, "requires": { "postcss": "^8.3.11", @@ -29202,9 +29483,9 @@ } }, "@greenwood/plugin-typescript": { - "version": "0.29.0", - "resolved": "https://registry.npmjs.org/@greenwood/plugin-typescript/-/plugin-typescript-0.29.0.tgz", - "integrity": "sha512-FhDyBW8XAVPddMfjYGJi1oS+nqhPBjwUrrjY3U2ZqSf6r66QT+Q36EcE6VfABCVRgnxHhVuheMZVpVVC+s3VdQ==", + "version": "0.30.0-alpha.0", + "resolved": "https://registry.npmjs.org/@greenwood/plugin-typescript/-/plugin-typescript-0.30.0-alpha.0.tgz", + "integrity": "sha512-ERYmUubVZgwGQZem5tVNQQlRsqeqyF1PNN33O6U2wENPE0/TDjUVgjuRvp7opOSfrRb7oIdW17w8i/FYWnwFaw==", "dev": true, "requires": { "typescript": "^5.1.6" @@ -29710,19 +29991,95 @@ } } }, + "@projectevergreen/acorn-jsx-esm": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/@projectevergreen/acorn-jsx-esm/-/acorn-jsx-esm-0.1.0.tgz", + "integrity": "sha512-ZBSkr0e2M4ylq74dTGHSkWI2dF3Mz8zwBLyzIXZMftecKDADcsCTj7bWltVgtdl8Rh4+bmY1jNWUw7AlSV/r7A==", + "dev": true + }, + "@projectevergreen/escodegen-esm": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/@projectevergreen/escodegen-esm/-/escodegen-esm-0.1.0.tgz", + "integrity": "sha512-LM9FFffsXPHiOFt78K3bgF8kO8Fx+qluAPy9jP3H4lvCFE+2nbwQM4cWdOpVik++rHf4pkDA7FxDPWWATyBABg==", + "dev": true, + "requires": { + "esprima": "^4.0.1", + "estraverse": "^5.2.0", + "esutils": "^2.0.2", + "source-map": "~0.6.1" + } + }, "@rollup/plugin-commonjs": { - "version": "21.1.0", - "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-21.1.0.tgz", - "integrity": "sha512-6ZtHx3VHIp2ReNNDxHjuUml6ur+WcQ28N1yHgCQwsbNkQg2suhxGMDQGJOn/KuDxKtd1xuZP5xSTwBA4GQ8hbA==", + "version": "25.0.7", + "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-25.0.7.tgz", + "integrity": "sha512-nEvcR+LRjEjsaSsc4x3XZfCCvZIaSMenZu/OiwOKGN2UhQpAYI7ru7czFvyWbErlpoGjnSX3D5Ch5FcMA3kRWQ==", "dev": true, "requires": { - "@rollup/pluginutils": "^3.1.0", + "@rollup/pluginutils": "^5.0.1", "commondir": "^1.0.1", - "estree-walker": "^2.0.1", - "glob": "^7.1.6", - "is-reference": "^1.2.1", - "magic-string": "^0.25.7", - "resolve": "^1.17.0" + "estree-walker": "^2.0.2", + "glob": "^8.0.3", + "is-reference": "1.2.1", + "magic-string": "^0.30.3" + }, + "dependencies": { + "@rollup/pluginutils": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.0.tgz", + "integrity": "sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==", + "dev": true, + "requires": { + "@types/estree": "^1.0.0", + "estree-walker": "^2.0.2", + "picomatch": "^2.3.1" + } + }, + "@types/estree": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", + "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", + "dev": true + }, + "brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "requires": { + "balanced-match": "^1.0.0" + } + }, + "glob": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", + "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^5.0.1", + "once": "^1.3.0" + } + }, + "magic-string": { + "version": "0.30.8", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.8.tgz", + "integrity": "sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==", + "dev": true, + "requires": { + "@jridgewell/sourcemap-codec": "^1.4.15" + } + }, + "minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dev": true, + "requires": { + "brace-expansion": "^2.0.1" + } + } } }, "@rollup/plugin-dynamic-import-vars": { @@ -29764,22 +30121,63 @@ } }, "@rollup/plugin-replace": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-2.4.2.tgz", - "integrity": "sha512-IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg==", + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-5.0.5.tgz", + "integrity": "sha512-rYO4fOi8lMaTg/z5Jb+hKnrHHVn8j2lwkqwyS4kTRhKyWOLf2wST2sWXr4WzWiTcoHTp2sTjqUbqIj2E39slKQ==", "dev": true, "requires": { - "@rollup/pluginutils": "^3.1.0", - "magic-string": "^0.25.7" + "@rollup/pluginutils": "^5.0.1", + "magic-string": "^0.30.3" + }, + "dependencies": { + "@rollup/pluginutils": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.0.tgz", + "integrity": "sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==", + "dev": true, + "requires": { + "@types/estree": "^1.0.0", + "estree-walker": "^2.0.2", + "picomatch": "^2.3.1" + } + }, + "@types/estree": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", + "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", + "dev": true + }, + "magic-string": { + "version": "0.30.8", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.8.tgz", + "integrity": "sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==", + "dev": true, + "requires": { + "@jridgewell/sourcemap-codec": "^1.4.15" + } + } } }, "@rollup/plugin-terser": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@rollup/plugin-terser/-/plugin-terser-0.1.0.tgz", - "integrity": "sha512-N2KK+qUfHX2hBzVzM41UWGLrEmcjVC37spC8R3c9mt3oEDFKh3N2e12/lLp9aVSt86veR0TQiCNQXrm8C6aiUQ==", + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/@rollup/plugin-terser/-/plugin-terser-0.4.4.tgz", + "integrity": "sha512-XHeJC5Bgvs8LfukDwWZp7yeqin6ns8RTl2B9avbejt6tZqsqvVoWI7ZTQrcNsfKEDWBTnTxM8nMDkO2IFFbd0A==", "dev": true, "requires": { - "terser": "^5.15.1" + "serialize-javascript": "^6.0.1", + "smob": "^1.0.0", + "terser": "^5.17.4" + }, + "dependencies": { + "serialize-javascript": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", + "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", + "dev": true, + "requires": { + "randombytes": "^2.1.0" + } + } } }, "@rollup/pluginutils": { @@ -33122,9 +33520,9 @@ "dev": true }, "acorn-walk": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.0.tgz", - "integrity": "sha512-FS7hV565M5l1R08MXqo8odwMTB02C2UqzB17RVgu9EyuYFBqJZ3/ZY97sQD5FewVu1UyDFc1yztUDrAwT0EypA==", + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz", + "integrity": "sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==", "dev": true }, "address": { @@ -36359,18 +36757,6 @@ "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", "dev": true }, - "escodegen": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz", - "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==", - "dev": true, - "requires": { - "esprima": "^4.0.1", - "estraverse": "^5.2.0", - "esutils": "^2.0.2", - "source-map": "~0.6.1" - } - }, "eslint": { "version": "8.54.0", "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.54.0.tgz", @@ -44094,6 +44480,12 @@ } } }, + "smob": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/smob/-/smob-1.4.1.tgz", + "integrity": "sha512-9LK+E7Hv5R9u4g4C3p+jjLstaLe11MDsL21UpYaCNmapvMkYhqCV4A/f/3gyH8QjMyh6l68q9xC85vihY9ahMQ==", + "dev": true + }, "snapdragon": { "version": "0.8.2", "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", @@ -46221,15 +46613,15 @@ } }, "wc-compiler": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/wc-compiler/-/wc-compiler-0.9.0.tgz", - "integrity": "sha512-AmpkRrOVPP0SHUF/9Y9BEiHejw3K+58cjLDxj/cN3w5ptJ3ZKEICDn7v+gEmj+d7XDwwb/8PjeEzmBWjo877ew==", + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/wc-compiler/-/wc-compiler-0.12.0.tgz", + "integrity": "sha512-eMgHEGhJGcyjSL9p6YIix0ReMViffhtabVEnNE1oRiNlNJL/Fd8e0GZ2gdWhIOV5ZvNMOocyAKFODKpg3CDMkg==", "dev": true, "requires": { + "@projectevergreen/acorn-jsx-esm": "~0.1.0", + "@projectevergreen/escodegen-esm": "~0.1.0", "acorn": "^8.7.0", - "acorn-jsx": "^5.3.2", "acorn-walk": "^8.2.0", - "escodegen": "^2.0.0", "parse5": "^6.0.1" } }, diff --git a/package.json b/package.json index 09dad0c..c1cf153 100644 --- a/package.json +++ b/package.json @@ -47,11 +47,11 @@ "@aws-sdk/client-cloudfront": "^3.47.0", "@aws-sdk/client-s3": "^3.46.0", "@esm-bundle/chai": "^4.3.4", - "@greenwood/cli": "^0.29.0", - "@greenwood/plugin-google-analytics": "^0.29.0", - "@greenwood/plugin-import-css": "^0.29.0", - "@greenwood/plugin-postcss": "^0.29.0", - "@greenwood/plugin-typescript": "^0.29.0", + "@greenwood/cli": "^0.30.0-alpha.0", + "@greenwood/plugin-google-analytics": "^0.30.0-alpha.0", + "@greenwood/plugin-import-css": "^0.30.0-alpha.0", + "@greenwood/plugin-postcss": "^0.30.0-alpha.0", + "@greenwood/plugin-typescript": "^0.30.0-alpha.0", "@ls-lint/ls-lint": "^1.10.0", "@rollup/plugin-dynamic-import-vars": "^1.4.1", "@storybook/addon-actions": "^6.3.2", From 66e7fe62b78d949732504ad533f4169048f8cf31 Mon Sep 17 00:00:00 2001 From: Owen Buckley Date: Mon, 6 May 2024 13:07:36 -0400 Subject: [PATCH 02/26] upgrade alpha.2 --- .nvmrc | 2 +- greenwood.config.js | 4 +- package-lock.json | 125 ++++++++++-------- package.json | 10 +- src/components/card/card.ts | 2 +- .../events-calendar/events-calendar.ts | 2 +- src/components/footer/footer.ts | 2 +- src/components/header/header.ts | 2 +- src/components/navigation/navigation.ts | 2 +- src/components/posts-list/posts-list.ts | 2 +- src/components/social-share/social-share.ts | 2 +- src/routes/albums/album-details.ts | 2 +- src/routes/albums/albums.ts | 2 +- src/routes/artists/artist-details.ts | 2 +- src/routes/artists/artists.ts | 2 +- src/routes/contact/contact.ts | 2 +- src/routes/events/event-details.ts | 2 +- src/routes/events/events.ts | 2 +- src/routes/home/home.ts | 2 +- src/typings.d.ts | 2 +- web-test-runner.config.js | 14 +- 21 files changed, 102 insertions(+), 85 deletions(-) diff --git a/.nvmrc b/.nvmrc index 72c7744..a05e3d4 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -18.12.1 \ No newline at end of file +18.20.2 \ No newline at end of file diff --git a/greenwood.config.js b/greenwood.config.js index 23488c5..6c551ff 100644 --- a/greenwood.config.js +++ b/greenwood.config.js @@ -1,7 +1,7 @@ import { greenwoodPluginFontAwesome } from '@analogstudiosri/greenwood-plugin-font-awesome'; import { greenwoodPluginGoogleAnalytics } from '@greenwood/plugin-google-analytics'; import { greenwoodPluginTypeScript } from '@greenwood/plugin-typescript'; -import { greenwoodPluginImportCss } from '@greenwood/plugin-import-css'; +import { greenwoodPluginImportRaw } from '@greenwood/plugin-import-raw'; import { greenwoodPluginPostCss } from '@greenwood/plugin-postcss'; import analyze from 'rollup-plugin-analyzer'; import { visualizer } from 'rollup-plugin-visualizer'; @@ -16,7 +16,7 @@ export default { }, plugins: [ greenwoodPluginPostCss(), - greenwoodPluginImportCss(), + greenwoodPluginImportRaw(), greenwoodPluginFontAwesome(), greenwoodPluginTypeScript(), // https://developers.google.com/analytics/devguides/collection/analyticsjs/single-page-applications diff --git a/package-lock.json b/package-lock.json index e470fe9..59a4ee5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -23,11 +23,11 @@ "@aws-sdk/client-cloudfront": "^3.47.0", "@aws-sdk/client-s3": "^3.46.0", "@esm-bundle/chai": "^4.3.4", - "@greenwood/cli": "^0.30.0-alpha.0", - "@greenwood/plugin-google-analytics": "^0.30.0-alpha.0", - "@greenwood/plugin-import-css": "^0.30.0-alpha.0", - "@greenwood/plugin-postcss": "^0.30.0-alpha.0", - "@greenwood/plugin-typescript": "^0.30.0-alpha.0", + "@greenwood/cli": "^0.30.0-alpha.2", + "@greenwood/plugin-google-analytics": "^0.30.0-alpha.2", + "@greenwood/plugin-import-raw": "^0.30.0-alpha.2", + "@greenwood/plugin-postcss": "^0.30.0-alpha.2", + "@greenwood/plugin-typescript": "^0.30.0-alpha.2", "@ls-lint/ls-lint": "^1.10.0", "@rollup/plugin-dynamic-import-vars": "^1.4.1", "@storybook/addon-actions": "^6.3.2", @@ -3378,9 +3378,9 @@ "dev": true }, "node_modules/@greenwood/cli": { - "version": "0.30.0-alpha.0", - "resolved": "https://registry.npmjs.org/@greenwood/cli/-/cli-0.30.0-alpha.0.tgz", - "integrity": "sha512-TZDWu24Rm7H/MDMhRuZGdFZzqKRUw5lD7JlBzSNK+RtJ1J4pn0T/csOqNjmWJojm09tAL0dFhfgGCfAxBiffWw==", + "version": "0.30.0-alpha.2", + "resolved": "https://registry.npmjs.org/@greenwood/cli/-/cli-0.30.0-alpha.2.tgz", + "integrity": "sha512-lh3YmRFCZXcLLYJrK3L40GLZnQZchqZ0QFQ8cXqculnBDxo0Y2cHKUGUJWTBzsODiGWOaJNuCIY4wxXBvTnu2w==", "dev": true, "dependencies": { "@rollup/plugin-commonjs": "^25.0.0", @@ -3391,7 +3391,7 @@ "acorn-walk": "^8.0.0", "commander": "^2.20.0", "css-tree": "^2.2.1", - "es-module-shims": "^1.2.0", + "es-module-shims": "^1.8.3", "front-matter": "^4.0.2", "koa": "^2.13.0", "koa-body": "^6.0.1", @@ -3405,13 +3405,13 @@ "remark-rehype": "^7.0.0", "rollup": "^3.29.4", "unified": "^9.2.0", - "wc-compiler": "~0.12.0" + "wc-compiler": "~0.13.0" }, "bin": { "greenwood": "src/index.js" }, "engines": { - "node": ">=18.12.1" + "node": ">=18.20.0" } }, "node_modules/@greenwood/cli/node_modules/@rollup/plugin-node-resolve": { @@ -3490,27 +3490,27 @@ } }, "node_modules/@greenwood/plugin-google-analytics": { - "version": "0.30.0-alpha.0", - "resolved": "https://registry.npmjs.org/@greenwood/plugin-google-analytics/-/plugin-google-analytics-0.30.0-alpha.0.tgz", - "integrity": "sha512-GeEriXvzzozBlF18+4lLKN8gU6R55LBjS3QLbqYjSpeg14XJ5UEJqy3zk3gxsI0rf4s1ilc9dY3ewBN/v8qvDg==", + "version": "0.30.0-alpha.2", + "resolved": "https://registry.npmjs.org/@greenwood/plugin-google-analytics/-/plugin-google-analytics-0.30.0-alpha.2.tgz", + "integrity": "sha512-gH4XfOpH3ALbhOdyPba8AMTIMZ85ZdrrqOpaGESMxMoZDpAoZohU4Q6NbTs0Nj6IG4zY06iwAC04k+zXs3WPVg==", "dev": true, "peerDependencies": { "@greenwood/cli": "^0.4.0" } }, - "node_modules/@greenwood/plugin-import-css": { - "version": "0.30.0-alpha.0", - "resolved": "https://registry.npmjs.org/@greenwood/plugin-import-css/-/plugin-import-css-0.30.0-alpha.0.tgz", - "integrity": "sha512-prRZFX2nDyQY1eqxWEuUMV20E44ueGwojL6uRdW7nel9mE44n21d8wMACnkI2ag4GDiYz6I64h/QM2grTm0/Sw==", + "node_modules/@greenwood/plugin-import-raw": { + "version": "0.30.0-alpha.2", + "resolved": "https://registry.npmjs.org/@greenwood/plugin-import-raw/-/plugin-import-raw-0.30.0-alpha.2.tgz", + "integrity": "sha512-BPM79Y1GcMPnh1jRbFpRZ5aQAXYFsrMMi2TO2I5Js3Lck1ivqbdFrXasZIbnNN0YQwr+8+idH+8WzVumn/MMQw==", "dev": true, "peerDependencies": { "@greenwood/cli": "^0.4.0" } }, "node_modules/@greenwood/plugin-postcss": { - "version": "0.30.0-alpha.0", - "resolved": "https://registry.npmjs.org/@greenwood/plugin-postcss/-/plugin-postcss-0.30.0-alpha.0.tgz", - "integrity": "sha512-T8lJKBUrSF9oJFrmDqqBKBfX6vtilSjX6o2b99Vw0STHC9TJ1BTocptXhS6PGy1sKPOG3MzEWvKMWWarhnLOwg==", + "version": "0.30.0-alpha.2", + "resolved": "https://registry.npmjs.org/@greenwood/plugin-postcss/-/plugin-postcss-0.30.0-alpha.2.tgz", + "integrity": "sha512-Ipy6T9nCsw2XCT2p6hRJIUp1M/Nojez4101LmmVM88eniJVSHku/NApgzFQdYhhODtCaeS1lFSrGduLQ09Je0w==", "dev": true, "dependencies": { "postcss": "^8.3.11", @@ -3522,9 +3522,9 @@ } }, "node_modules/@greenwood/plugin-typescript": { - "version": "0.30.0-alpha.0", - "resolved": "https://registry.npmjs.org/@greenwood/plugin-typescript/-/plugin-typescript-0.30.0-alpha.0.tgz", - "integrity": "sha512-ERYmUubVZgwGQZem5tVNQQlRsqeqyF1PNN33O6U2wENPE0/TDjUVgjuRvp7opOSfrRb7oIdW17w8i/FYWnwFaw==", + "version": "0.30.0-alpha.2", + "resolved": "https://registry.npmjs.org/@greenwood/plugin-typescript/-/plugin-typescript-0.30.0-alpha.2.tgz", + "integrity": "sha512-LqtWBtCaPmMMRyAhkOdPBASTZeuiNobPrG9MIVWaT2vppD+MhnT1JaQwkfRCkJQKc3hZv34cK/GMf1Rpjl06ZA==", "dev": true, "dependencies": { "typescript": "^5.1.6" @@ -8841,6 +8841,15 @@ "node": ">=0.4.0" } }, + "node_modules/acorn-import-attributes": { + "version": "1.9.5", + "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz", + "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==", + "dev": true, + "peerDependencies": { + "acorn": "^8" + } + }, "node_modules/acorn-jsx": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", @@ -13005,9 +13014,9 @@ "dev": true }, "node_modules/es-module-shims": { - "version": "1.8.2", - "resolved": "https://registry.npmjs.org/es-module-shims/-/es-module-shims-1.8.2.tgz", - "integrity": "sha512-7vIYVzpOhXtpc3Yn03itB+GSgVZFW7oL4kdydA+iL+IEi7HiSLBUxM05QFw4SxTl6e++pMpGqZPo2+vdNs3TbA==", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/es-module-shims/-/es-module-shims-1.10.0.tgz", + "integrity": "sha512-3PmuShQBd9d8pulTFx6L7HKgncnZ1oeSSbrEfnUasb3Tv974BAvyFtW1HLPJSkh5fCaU9JNZbBzPdbxSwg2zqA==", "dev": true }, "node_modules/es-set-tostringtag": { @@ -26066,14 +26075,15 @@ } }, "node_modules/wc-compiler": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/wc-compiler/-/wc-compiler-0.12.0.tgz", - "integrity": "sha512-eMgHEGhJGcyjSL9p6YIix0ReMViffhtabVEnNE1oRiNlNJL/Fd8e0GZ2gdWhIOV5ZvNMOocyAKFODKpg3CDMkg==", + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/wc-compiler/-/wc-compiler-0.13.0.tgz", + "integrity": "sha512-yyFr9MqBrlLM0vEWLL5fHTHgmM66R9BCStIqH8mFA3iJ9EKRk8hRb+wBzDSIE3B6TLsgxYKMPX3fy6ftiujNKg==", "dev": true, "dependencies": { "@projectevergreen/acorn-jsx-esm": "~0.1.0", "@projectevergreen/escodegen-esm": "~0.1.0", "acorn": "^8.7.0", + "acorn-import-attributes": "^1.9.5", "acorn-walk": "^8.2.0", "parse5": "^6.0.1" }, @@ -29381,9 +29391,9 @@ "dev": true }, "@greenwood/cli": { - "version": "0.30.0-alpha.0", - "resolved": "https://registry.npmjs.org/@greenwood/cli/-/cli-0.30.0-alpha.0.tgz", - "integrity": "sha512-TZDWu24Rm7H/MDMhRuZGdFZzqKRUw5lD7JlBzSNK+RtJ1J4pn0T/csOqNjmWJojm09tAL0dFhfgGCfAxBiffWw==", + "version": "0.30.0-alpha.2", + "resolved": "https://registry.npmjs.org/@greenwood/cli/-/cli-0.30.0-alpha.2.tgz", + "integrity": "sha512-lh3YmRFCZXcLLYJrK3L40GLZnQZchqZ0QFQ8cXqculnBDxo0Y2cHKUGUJWTBzsODiGWOaJNuCIY4wxXBvTnu2w==", "dev": true, "requires": { "@rollup/plugin-commonjs": "^25.0.0", @@ -29394,7 +29404,7 @@ "acorn-walk": "^8.0.0", "commander": "^2.20.0", "css-tree": "^2.2.1", - "es-module-shims": "^1.2.0", + "es-module-shims": "^1.8.3", "front-matter": "^4.0.2", "koa": "^2.13.0", "koa-body": "^6.0.1", @@ -29408,7 +29418,7 @@ "remark-rehype": "^7.0.0", "rollup": "^3.29.4", "unified": "^9.2.0", - "wc-compiler": "~0.12.0" + "wc-compiler": "~0.13.0" }, "dependencies": { "@rollup/plugin-node-resolve": { @@ -29460,21 +29470,21 @@ } }, "@greenwood/plugin-google-analytics": { - "version": "0.30.0-alpha.0", - "resolved": "https://registry.npmjs.org/@greenwood/plugin-google-analytics/-/plugin-google-analytics-0.30.0-alpha.0.tgz", - "integrity": "sha512-GeEriXvzzozBlF18+4lLKN8gU6R55LBjS3QLbqYjSpeg14XJ5UEJqy3zk3gxsI0rf4s1ilc9dY3ewBN/v8qvDg==", + "version": "0.30.0-alpha.2", + "resolved": "https://registry.npmjs.org/@greenwood/plugin-google-analytics/-/plugin-google-analytics-0.30.0-alpha.2.tgz", + "integrity": "sha512-gH4XfOpH3ALbhOdyPba8AMTIMZ85ZdrrqOpaGESMxMoZDpAoZohU4Q6NbTs0Nj6IG4zY06iwAC04k+zXs3WPVg==", "dev": true }, - "@greenwood/plugin-import-css": { - "version": "0.30.0-alpha.0", - "resolved": "https://registry.npmjs.org/@greenwood/plugin-import-css/-/plugin-import-css-0.30.0-alpha.0.tgz", - "integrity": "sha512-prRZFX2nDyQY1eqxWEuUMV20E44ueGwojL6uRdW7nel9mE44n21d8wMACnkI2ag4GDiYz6I64h/QM2grTm0/Sw==", + "@greenwood/plugin-import-raw": { + "version": "0.30.0-alpha.2", + "resolved": "https://registry.npmjs.org/@greenwood/plugin-import-raw/-/plugin-import-raw-0.30.0-alpha.2.tgz", + "integrity": "sha512-BPM79Y1GcMPnh1jRbFpRZ5aQAXYFsrMMi2TO2I5Js3Lck1ivqbdFrXasZIbnNN0YQwr+8+idH+8WzVumn/MMQw==", "dev": true }, "@greenwood/plugin-postcss": { - "version": "0.30.0-alpha.0", - "resolved": "https://registry.npmjs.org/@greenwood/plugin-postcss/-/plugin-postcss-0.30.0-alpha.0.tgz", - "integrity": "sha512-T8lJKBUrSF9oJFrmDqqBKBfX6vtilSjX6o2b99Vw0STHC9TJ1BTocptXhS6PGy1sKPOG3MzEWvKMWWarhnLOwg==", + "version": "0.30.0-alpha.2", + "resolved": "https://registry.npmjs.org/@greenwood/plugin-postcss/-/plugin-postcss-0.30.0-alpha.2.tgz", + "integrity": "sha512-Ipy6T9nCsw2XCT2p6hRJIUp1M/Nojez4101LmmVM88eniJVSHku/NApgzFQdYhhODtCaeS1lFSrGduLQ09Je0w==", "dev": true, "requires": { "postcss": "^8.3.11", @@ -29483,9 +29493,9 @@ } }, "@greenwood/plugin-typescript": { - "version": "0.30.0-alpha.0", - "resolved": "https://registry.npmjs.org/@greenwood/plugin-typescript/-/plugin-typescript-0.30.0-alpha.0.tgz", - "integrity": "sha512-ERYmUubVZgwGQZem5tVNQQlRsqeqyF1PNN33O6U2wENPE0/TDjUVgjuRvp7opOSfrRb7oIdW17w8i/FYWnwFaw==", + "version": "0.30.0-alpha.2", + "resolved": "https://registry.npmjs.org/@greenwood/plugin-typescript/-/plugin-typescript-0.30.0-alpha.2.tgz", + "integrity": "sha512-LqtWBtCaPmMMRyAhkOdPBASTZeuiNobPrG9MIVWaT2vppD+MhnT1JaQwkfRCkJQKc3hZv34cK/GMf1Rpjl06ZA==", "dev": true, "requires": { "typescript": "^5.1.6" @@ -33513,6 +33523,12 @@ "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==", "dev": true }, + "acorn-import-attributes": { + "version": "1.9.5", + "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz", + "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==", + "dev": true + }, "acorn-jsx": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", @@ -36691,9 +36707,9 @@ "dev": true }, "es-module-shims": { - "version": "1.8.2", - "resolved": "https://registry.npmjs.org/es-module-shims/-/es-module-shims-1.8.2.tgz", - "integrity": "sha512-7vIYVzpOhXtpc3Yn03itB+GSgVZFW7oL4kdydA+iL+IEi7HiSLBUxM05QFw4SxTl6e++pMpGqZPo2+vdNs3TbA==", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/es-module-shims/-/es-module-shims-1.10.0.tgz", + "integrity": "sha512-3PmuShQBd9d8pulTFx6L7HKgncnZ1oeSSbrEfnUasb3Tv974BAvyFtW1HLPJSkh5fCaU9JNZbBzPdbxSwg2zqA==", "dev": true }, "es-set-tostringtag": { @@ -46613,14 +46629,15 @@ } }, "wc-compiler": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/wc-compiler/-/wc-compiler-0.12.0.tgz", - "integrity": "sha512-eMgHEGhJGcyjSL9p6YIix0ReMViffhtabVEnNE1oRiNlNJL/Fd8e0GZ2gdWhIOV5ZvNMOocyAKFODKpg3CDMkg==", + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/wc-compiler/-/wc-compiler-0.13.0.tgz", + "integrity": "sha512-yyFr9MqBrlLM0vEWLL5fHTHgmM66R9BCStIqH8mFA3iJ9EKRk8hRb+wBzDSIE3B6TLsgxYKMPX3fy6ftiujNKg==", "dev": true, "requires": { "@projectevergreen/acorn-jsx-esm": "~0.1.0", "@projectevergreen/escodegen-esm": "~0.1.0", "acorn": "^8.7.0", + "acorn-import-attributes": "^1.9.5", "acorn-walk": "^8.2.0", "parse5": "^6.0.1" } diff --git a/package.json b/package.json index c1cf153..d17b1b5 100644 --- a/package.json +++ b/package.json @@ -47,11 +47,11 @@ "@aws-sdk/client-cloudfront": "^3.47.0", "@aws-sdk/client-s3": "^3.46.0", "@esm-bundle/chai": "^4.3.4", - "@greenwood/cli": "^0.30.0-alpha.0", - "@greenwood/plugin-google-analytics": "^0.30.0-alpha.0", - "@greenwood/plugin-import-css": "^0.30.0-alpha.0", - "@greenwood/plugin-postcss": "^0.30.0-alpha.0", - "@greenwood/plugin-typescript": "^0.30.0-alpha.0", + "@greenwood/cli": "^0.30.0-alpha.2", + "@greenwood/plugin-google-analytics": "^0.30.0-alpha.2", + "@greenwood/plugin-import-raw": "^0.30.0-alpha.2", + "@greenwood/plugin-postcss": "^0.30.0-alpha.2", + "@greenwood/plugin-typescript": "^0.30.0-alpha.2", "@ls-lint/ls-lint": "^1.10.0", "@rollup/plugin-dynamic-import-vars": "^1.4.1", "@storybook/addon-actions": "^6.3.2", diff --git a/src/components/card/card.ts b/src/components/card/card.ts index 73c598d..ec724dd 100644 --- a/src/components/card/card.ts +++ b/src/components/card/card.ts @@ -2,7 +2,7 @@ import { css, html, LitElement, unsafeCSS, TemplateResult } from 'lit'; import { customElement, property } from 'lit/decorators.js'; import { unsafeHTML } from 'lit/directives/unsafe-html.js'; import { Details } from './card.model.ts'; -import cardCss from './card.css?type=css'; +import cardCss from './card.css?type=raw'; @customElement('app-card') export class CardComponent extends LitElement { diff --git a/src/components/events-calendar/events-calendar.ts b/src/components/events-calendar/events-calendar.ts index 9d1037f..ba54b4f 100644 --- a/src/components/events-calendar/events-calendar.ts +++ b/src/components/events-calendar/events-calendar.ts @@ -3,7 +3,7 @@ import { html, LitElement, TemplateResult } from 'lit'; import { customElement, property } from 'lit/decorators.js'; import { unsafeHTML } from 'lit/directives/unsafe-html.js'; import { getEvents } from '../../services/events/events-service.ts'; -import eventsCalendarCss from './events-calendar.css?type=css'; +import eventsCalendarCss from './events-calendar.css?type=raw'; @customElement('app-events-calendar') export class EventsCalendarComponent extends LitElement { diff --git a/src/components/footer/footer.ts b/src/components/footer/footer.ts index a754ad2..3c3bdbd 100644 --- a/src/components/footer/footer.ts +++ b/src/components/footer/footer.ts @@ -1,6 +1,6 @@ import { css, html, LitElement, unsafeCSS, TemplateResult } from 'lit'; import { customElement, property } from 'lit/decorators.js'; -import footerCss from './footer.css?type=css'; +import footerCss from './footer.css?type=raw'; @customElement('app-footer') export class FooterComponent extends LitElement { diff --git a/src/components/header/header.ts b/src/components/header/header.ts index ff00d7a..6ab8ad1 100644 --- a/src/components/header/header.ts +++ b/src/components/header/header.ts @@ -1,7 +1,7 @@ import { css, html, LitElement, unsafeCSS, TemplateResult } from 'lit'; import { customElement } from 'lit/decorators.js'; import '../navigation/navigation.ts'; -import headerCss from './header.css?type=css'; +import headerCss from './header.css?type=raw'; @customElement('app-header') export class HeaderComponent extends LitElement { diff --git a/src/components/navigation/navigation.ts b/src/components/navigation/navigation.ts index efe6798..98521a7 100644 --- a/src/components/navigation/navigation.ts +++ b/src/components/navigation/navigation.ts @@ -1,6 +1,6 @@ import { css, html, LitElement, unsafeCSS, TemplateResult } from 'lit'; import { customElement } from 'lit/decorators.js'; -import navigationCss from './navigation.css?type=css'; +import navigationCss from './navigation.css?type=raw'; @customElement('app-navigation') export class NavigationComponent extends LitElement { diff --git a/src/components/posts-list/posts-list.ts b/src/components/posts-list/posts-list.ts index 41503db..40eb040 100644 --- a/src/components/posts-list/posts-list.ts +++ b/src/components/posts-list/posts-list.ts @@ -2,7 +2,7 @@ import { html, LitElement, TemplateResult } from 'lit'; import { customElement, property } from 'lit/decorators.js'; import { unsafeHTML } from 'lit/directives/unsafe-html.js'; import { getPosts } from '../../services/posts/posts-service.ts'; -import postsListCss from './posts-list.css?type=css'; +import postsListCss from './posts-list.css?type=raw'; @customElement('app-posts-list') export class PostsListComponent extends LitElement { diff --git a/src/components/social-share/social-share.ts b/src/components/social-share/social-share.ts index 309fc98..253b527 100644 --- a/src/components/social-share/social-share.ts +++ b/src/components/social-share/social-share.ts @@ -1,6 +1,6 @@ import { css, html, LitElement, unsafeCSS, TemplateResult } from 'lit'; import { customElement, property } from 'lit/decorators.js'; -import socialShareCss from './social-share.css?type=css'; +import socialShareCss from './social-share.css?type=raw'; import 'web-social-share'; @customElement('app-social-share') diff --git a/src/routes/albums/album-details.ts b/src/routes/albums/album-details.ts index 149dbc4..9c9f574 100644 --- a/src/routes/albums/album-details.ts +++ b/src/routes/albums/album-details.ts @@ -6,7 +6,7 @@ import { modelAlbum } from '../../components/card/card.model.ts'; import { Album } from '../../services/albums/album.model.ts'; import '../../components/card/card.ts'; import '../../components/social-share/social-share.ts'; -import albumsCss from './albums.css?type=css'; +import albumsCss from './albums.css?type=raw'; @customElement('as-route-album-details') export class AlbumDetailsRouteComponent extends LitElement { diff --git a/src/routes/albums/albums.ts b/src/routes/albums/albums.ts index ad2ff66..a32fb8d 100644 --- a/src/routes/albums/albums.ts +++ b/src/routes/albums/albums.ts @@ -7,7 +7,7 @@ import { modelAlbum } from '../../components/card/card.model.ts'; import { Album } from '../../services/albums/album.model.ts'; import store from '../../store.ts'; import '../../components/card/card.ts'; -import albumsCss from './albums.css?type=css'; +import albumsCss from './albums.css?type=raw'; @customElement('as-route-albums') export class AlbumsRouteComponent extends LitElement { diff --git a/src/routes/artists/artist-details.ts b/src/routes/artists/artist-details.ts index d089ebc..c355dc5 100644 --- a/src/routes/artists/artist-details.ts +++ b/src/routes/artists/artist-details.ts @@ -9,7 +9,7 @@ import { Artist } from '../../services/artists/artist.model.ts'; import { Album } from '../../services/albums/album.model.ts'; import '../../components/card/card.ts'; import '../../components/social-share/social-share.ts'; -import artistsCss from './artists.css?type=css'; +import artistsCss from './artists.css?type=raw'; @customElement('as-route-artist-details') export class ArtistDetailsRouteComponent extends LitElement { diff --git a/src/routes/artists/artists.ts b/src/routes/artists/artists.ts index 118d8d2..72fe1c8 100644 --- a/src/routes/artists/artists.ts +++ b/src/routes/artists/artists.ts @@ -7,7 +7,7 @@ import { modelArtist } from '../../components/card/card.model.ts'; import { Artist } from '../../services/artists/artist.model.ts'; import store from '../../store.ts'; import '../../components/card/card.ts'; -import artistsCss from './artists.css?type=css'; +import artistsCss from './artists.css?type=raw'; @customElement('as-route-artists') export class ArtistsRouteComponent extends LitElement { diff --git a/src/routes/contact/contact.ts b/src/routes/contact/contact.ts index 590144c..050d8f4 100644 --- a/src/routes/contact/contact.ts +++ b/src/routes/contact/contact.ts @@ -1,6 +1,6 @@ import { html, LitElement, TemplateResult } from 'lit'; import { customElement } from 'lit/decorators.js'; -import contactCss from './contact.css?type=css'; +import contactCss from './contact.css?type=raw'; @customElement('as-route-contact') export class ContactRouteComponent extends LitElement { diff --git a/src/routes/events/event-details.ts b/src/routes/events/event-details.ts index 03ce8b1..3a41516 100644 --- a/src/routes/events/event-details.ts +++ b/src/routes/events/event-details.ts @@ -4,7 +4,7 @@ import { customElement, property } from 'lit/decorators.js'; import { getEventById } from '../../services/events/events-service.ts'; import { Event } from '../../services/events/event.model.ts'; import '../../components/social-share/social-share.ts'; -import eventsCss from './events.css?type=css'; +import eventsCss from './events.css?type=raw'; @customElement('as-route-event-details') export class EventDetailsRouteComponent extends LitElement { diff --git a/src/routes/events/events.ts b/src/routes/events/events.ts index d7e30f0..3b9abed 100644 --- a/src/routes/events/events.ts +++ b/src/routes/events/events.ts @@ -2,7 +2,7 @@ import { html, LitElement, TemplateResult } from 'lit'; import { customElement } from 'lit/decorators.js'; import '../../components/events-calendar/events-calendar.ts'; -import eventsCss from './events.css?type=css'; +import eventsCss from './events.css?type=raw'; @customElement('as-route-events') export class EventsRouteComponent extends LitElement { diff --git a/src/routes/home/home.ts b/src/routes/home/home.ts index 6d4f4d9..4076a31 100644 --- a/src/routes/home/home.ts +++ b/src/routes/home/home.ts @@ -2,7 +2,7 @@ import { html, LitElement, TemplateResult } from 'lit'; import { customElement } from 'lit/decorators.js'; import '../../components/events-calendar/events-calendar.ts'; import '../../components/posts-list/posts-list.ts'; -import homeCss from './home.css?type=css'; +import homeCss from './home.css?type=raw'; @customElement('as-route-home') export class HomeRouteComponent extends LitElement { diff --git a/src/typings.d.ts b/src/typings.d.ts index a706ab1..95e2f17 100644 --- a/src/typings.d.ts +++ b/src/typings.d.ts @@ -1,4 +1,4 @@ -declare module '*.css?type=css' { +declare module '*.css?type=raw' { interface IClassNames { [className: string]: string } diff --git a/web-test-runner.config.js b/web-test-runner.config.js index 7e7dbf2..2a562a6 100644 --- a/web-test-runner.config.js +++ b/web-test-runner.config.js @@ -1,12 +1,12 @@ import { defaultReporter } from '@web/test-runner'; import fs from 'fs/promises'; -import { greenwoodPluginImportCss } from '@greenwood/plugin-import-css/src/index.js'; -import { greenwoodPluginTypeScript } from '@greenwood/plugin-typescript/src/index.js'; +import { greenwoodPluginImportRaw } from '@greenwood/plugin-import-raw'; +import { greenwoodPluginTypeScript } from '@greenwood/plugin-typescript'; import { junitReporter } from '@web/test-runner-junit-reporter'; import { puppeteerLauncher } from '@web/test-runner-puppeteer'; // create a direct instance of ImportCssResource -const importCssResource = greenwoodPluginImportCss()[0].provider({}); +const importRawResource = greenwoodPluginImportRaw()[0].provider({}); // create a direct instance of TypeScriptResource const typeScriptResource = greenwoodPluginTypeScript()[0].provider({ @@ -56,18 +56,18 @@ export default { } } }, { - name: 'import-css', + name: 'import-raw-css', async transform(context) { const url = new URL(`.${context.request.url}`, import.meta.url); - const request = new Request(url, { headers: new Headers(context.headers) }); - const shouldIntercept = await importCssResource.shouldIntercept(url, request); + const request = new Request(url, { headers: { 'Sec-Fetch-Dest': 'empty' } }); + const shouldIntercept = await importRawResource.shouldIntercept(url, request); if (shouldIntercept) { const contents = await fs.readFile(url); const initResponse = new Response(contents, { headers: new Headers(context.headers) }); - const response = await importCssResource.intercept(url, request, initResponse.clone()); + const response = await importRawResource.intercept(url, request, initResponse.clone()); return { body: await response.text(), From 1da1b1c47d629f57ca9a9a49daee31f82efaf93d Mon Sep 17 00:00:00 2001 From: Owen Buckley Date: Mon, 6 May 2024 13:21:16 -0400 Subject: [PATCH 03/26] bump netlify.toml node version --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index 0a0fbb2..d9eba6a 100644 --- a/netlify.toml +++ b/netlify.toml @@ -6,7 +6,7 @@ skip_processing = true [build.environment] - NODE_VERSION = "18.12.1" + NODE_VERSION = "18.20.2" [[redirects]] from = "/api/*" From 15d6c4fa780637e980fb24d2816705c854bdb77a Mon Sep 17 00:00:00 2001 From: Owen Buckley Date: Thu, 30 May 2024 20:56:32 -0400 Subject: [PATCH 04/26] gracefully handle un-resolvable CSS assets --- patches/@greenwood+cli+0.30.0-alpha.2.patch | 56 +++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 patches/@greenwood+cli+0.30.0-alpha.2.patch diff --git a/patches/@greenwood+cli+0.30.0-alpha.2.patch b/patches/@greenwood+cli+0.30.0-alpha.2.patch new file mode 100644 index 0000000..2b7e5d4 --- /dev/null +++ b/patches/@greenwood+cli+0.30.0-alpha.2.patch @@ -0,0 +1,56 @@ +diff --git a/node_modules/@greenwood/cli/src/plugins/resource/plugin-standard-css.js b/node_modules/@greenwood/cli/src/plugins/resource/plugin-standard-css.js +index 64c1ba0..12fb4a2 100644 +--- a/node_modules/@greenwood/cli/src/plugins/resource/plugin-standard-css.js ++++ b/node_modules/@greenwood/cli/src/plugins/resource/plugin-standard-css.js +@@ -50,23 +50,32 @@ function bundleCss(body, url, compilation) { + barePath = barePath.replace('/', ''); + } + ++ // TODO was this handling too naive? :| + const locationUrl = barePath.startsWith('node_modules') + ? new URL(`./${barePath}`, projectDirectory) + : new URL(`./${barePath}`, userWorkspace); +- const hash = hashString(fs.readFileSync(locationUrl, 'utf-8')); +- const ext = barePath.split('.').pop(); +- const hashedRoot = barePath.replace(`.${ext}`, `.${hash}.${ext}`); + +- fs.mkdirSync(normalizePathnameForWindows(new URL(`./${path.dirname(barePath)}/`, outputDir)), { +- recursive: true +- }); ++ if (fs.existsSync(locationUrl.pathname)) { ++ const hash = hashString(fs.readFileSync(locationUrl, 'utf-8')); ++ const ext = barePath.split('.').pop(); ++ const hashedRoot = barePath.replace(`.${ext}`, `.${hash}.${ext}`); + +- fs.promises.copyFile( +- locationUrl, +- new URL(`./${hashedRoot}`, outputDir) +- ); ++ fs.mkdirSync(normalizePathnameForWindows(new URL(`./${path.dirname(barePath)}/`, outputDir)), { ++ recursive: true ++ }); ++ ++ fs.promises.copyFile( ++ locationUrl, ++ new URL(`./${hashedRoot}`, outputDir) ++ ); ++ ++ optimizedCss += `url('${basePath}${hashedRoot}')`; ++ } else { ++ // TODO handle 'data:', e.g. Unable to optimize /Users/owenbuckley/Workspace/analogstudiosri/www.analogstudios.net/src/data:image/svg+xml;charset=utf8,%3Csvg%20xmlns='http://www.w3.org/2000/svg'%20viewBox='0%200%204%204'%3E%3Cpath%20stroke='%23fff'%20d='M0%202h4'/%3E%3C/svg%3E. ++ console.warn(`Unable to optimize ${locationUrl.pathname}. You may need to manually copy this file into the output directory.`); ++ optimizedCss += `url('${value}')`; ++ } + +- optimizedCss += `url('${basePath}${hashedRoot}')`; + } else if (type === 'Atrule' && name !== 'import') { + optimizedCss += `@${name} `; + } else if (type === 'TypeSelector') { +@@ -291,6 +300,7 @@ class StandardCssResource extends ResourceInterface { + + async optimize(url, response) { + const body = await response.text(); ++ console.log('CSS Optimize', { url, body }); + const optimizedBody = bundleCss(body, url, this.compilation); + + return new Response(optimizedBody); From 2ed1f5833f48fd87d671865179d000e28e877b44 Mon Sep 17 00:00:00 2001 From: Owen Buckley Date: Thu, 30 May 2024 20:59:30 -0400 Subject: [PATCH 05/26] add patch package and postinstall --- package-lock.json | 402 ++++++++++++++++++++++++++++++++++++++++++++++ package.json | 4 +- 2 files changed, 405 insertions(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 59a4ee5..cf5f325 100644 --- a/package-lock.json +++ b/package-lock.json @@ -45,6 +45,7 @@ "glob-promise": "^4.2.2", "http-server": "^14.1.1", "mime-types": "^2.1.34", + "patch-package": "^8.0.0", "postcss-nested": "^4.1.2", "rimraf": "^2.6.3", "rollup-plugin-analyzer": "^4.0.0", @@ -8816,6 +8817,12 @@ "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", "dev": true }, + "node_modules/@yarnpkg/lockfile": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz", + "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==", + "dev": true + }, "node_modules/accepts": { "version": "1.3.8", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", @@ -14121,6 +14128,15 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/find-yarn-workspace-root": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz", + "integrity": "sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==", + "dev": true, + "dependencies": { + "micromatch": "^4.0.2" + } + }, "node_modules/flat-cache": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", @@ -17062,6 +17078,24 @@ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", "dev": true }, + "node_modules/json-stable-stringify": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.1.1.tgz", + "integrity": "sha512-SU/971Kt5qVQfJpyDveVhQ/vya+5hvrjClFOcr8c0Fq5aODJjMwutrOfCU+eCnVD5gpx1Q3fEqkyom77zH1iIg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.5", + "isarray": "^2.0.5", + "jsonify": "^0.0.1", + "object-keys": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/json-stable-stringify-without-jsonify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", @@ -17092,6 +17126,15 @@ "graceful-fs": "^4.1.6" } }, + "node_modules/jsonify": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.1.tgz", + "integrity": "sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/junk": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/junk/-/junk-3.1.0.tgz", @@ -17131,6 +17174,15 @@ "node": ">=0.10.0" } }, + "node_modules/klaw-sync": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/klaw-sync/-/klaw-sync-6.0.0.tgz", + "integrity": "sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ==", + "dev": true, + "dependencies": { + "graceful-fs": "^4.1.11" + } + }, "node_modules/kleur": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", @@ -19297,6 +19349,15 @@ "node": ">=0.10.0" } }, + "node_modules/os-tmpdir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/p-all": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/p-all/-/p-all-2.1.0.tgz", @@ -19548,6 +19609,170 @@ "node": ">=0.10.0" } }, + "node_modules/patch-package": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/patch-package/-/patch-package-8.0.0.tgz", + "integrity": "sha512-da8BVIhzjtgScwDJ2TtKsfT5JFWz1hYoBl9rUQ1f38MC2HwnEIkK8VN3dKMKcP7P7bvvgzNDbfNHtx3MsQb5vA==", + "dev": true, + "dependencies": { + "@yarnpkg/lockfile": "^1.1.0", + "chalk": "^4.1.2", + "ci-info": "^3.7.0", + "cross-spawn": "^7.0.3", + "find-yarn-workspace-root": "^2.0.0", + "fs-extra": "^9.0.0", + "json-stable-stringify": "^1.0.2", + "klaw-sync": "^6.0.0", + "minimist": "^1.2.6", + "open": "^7.4.2", + "rimraf": "^2.6.3", + "semver": "^7.5.3", + "slash": "^2.0.0", + "tmp": "^0.0.33", + "yaml": "^2.2.2" + }, + "bin": { + "patch-package": "index.js" + }, + "engines": { + "node": ">=14", + "npm": ">5" + } + }, + "node_modules/patch-package/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/patch-package/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/patch-package/node_modules/ci-info": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], + "engines": { + "node": ">=8" + } + }, + "node_modules/patch-package/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/patch-package/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/patch-package/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/patch-package/node_modules/open": { + "version": "7.4.2", + "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz", + "integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==", + "dev": true, + "dependencies": { + "is-docker": "^2.0.0", + "is-wsl": "^2.1.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/patch-package/node_modules/semver": { + "version": "7.6.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", + "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/patch-package/node_modules/slash": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz", + "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/patch-package/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/patch-package/node_modules/yaml": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.4.2.tgz", + "integrity": "sha512-B3VqDZ+JAg1nZpaEmWtTXUlBneoGx6CPM9b0TENK6aoSu5t73dItudwdgmi6tHlIZZId4dZ9skcAQ2UbcyAeVA==", + "dev": true, + "bin": { + "yaml": "bin.mjs" + }, + "engines": { + "node": ">= 14" + } + }, "node_modules/path-browserify": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz", @@ -24708,6 +24933,18 @@ "node": ">=0.6.0" } }, + "node_modules/tmp": { + "version": "0.0.33", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", + "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", + "dev": true, + "dependencies": { + "os-tmpdir": "~1.0.2" + }, + "engines": { + "node": ">=0.6.0" + } + }, "node_modules/tmpl": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", @@ -33507,6 +33744,12 @@ "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", "dev": true }, + "@yarnpkg/lockfile": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz", + "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==", + "dev": true + }, "accepts": { "version": "1.3.8", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", @@ -37563,6 +37806,15 @@ "path-exists": "^4.0.0" } }, + "find-yarn-workspace-root": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz", + "integrity": "sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==", + "dev": true, + "requires": { + "micromatch": "^4.0.2" + } + }, "flat-cache": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", @@ -39699,6 +39951,18 @@ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", "dev": true }, + "json-stable-stringify": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.1.1.tgz", + "integrity": "sha512-SU/971Kt5qVQfJpyDveVhQ/vya+5hvrjClFOcr8c0Fq5aODJjMwutrOfCU+eCnVD5gpx1Q3fEqkyom77zH1iIg==", + "dev": true, + "requires": { + "call-bind": "^1.0.5", + "isarray": "^2.0.5", + "jsonify": "^0.0.1", + "object-keys": "^1.1.1" + } + }, "json-stable-stringify-without-jsonify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", @@ -39721,6 +39985,12 @@ "universalify": "^2.0.0" } }, + "jsonify": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.1.tgz", + "integrity": "sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==", + "dev": true + }, "junk": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/junk/-/junk-3.1.0.tgz", @@ -39751,6 +40021,15 @@ "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", "dev": true }, + "klaw-sync": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/klaw-sync/-/klaw-sync-6.0.0.tgz", + "integrity": "sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.11" + } + }, "kleur": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", @@ -41497,6 +41776,12 @@ "dev": true, "optional": true }, + "os-tmpdir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", + "dev": true + }, "p-all": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/p-all/-/p-all-2.1.0.tgz", @@ -41691,6 +41976,114 @@ "integrity": "sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==", "dev": true }, + "patch-package": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/patch-package/-/patch-package-8.0.0.tgz", + "integrity": "sha512-da8BVIhzjtgScwDJ2TtKsfT5JFWz1hYoBl9rUQ1f38MC2HwnEIkK8VN3dKMKcP7P7bvvgzNDbfNHtx3MsQb5vA==", + "dev": true, + "requires": { + "@yarnpkg/lockfile": "^1.1.0", + "chalk": "^4.1.2", + "ci-info": "^3.7.0", + "cross-spawn": "^7.0.3", + "find-yarn-workspace-root": "^2.0.0", + "fs-extra": "^9.0.0", + "json-stable-stringify": "^1.0.2", + "klaw-sync": "^6.0.0", + "minimist": "^1.2.6", + "open": "^7.4.2", + "rimraf": "^2.6.3", + "semver": "^7.5.3", + "slash": "^2.0.0", + "tmp": "^0.0.33", + "yaml": "^2.2.2" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "ci-info": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", + "dev": true + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "open": { + "version": "7.4.2", + "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz", + "integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==", + "dev": true, + "requires": { + "is-docker": "^2.0.0", + "is-wsl": "^2.1.1" + } + }, + "semver": { + "version": "7.6.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", + "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", + "dev": true + }, + "slash": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz", + "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + }, + "yaml": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.4.2.tgz", + "integrity": "sha512-B3VqDZ+JAg1nZpaEmWtTXUlBneoGx6CPM9b0TENK6aoSu5t73dItudwdgmi6tHlIZZId4dZ9skcAQ2UbcyAeVA==", + "dev": true + } + } + }, "path-browserify": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz", @@ -45567,6 +45960,15 @@ "setimmediate": "^1.0.4" } }, + "tmp": { + "version": "0.0.33", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", + "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", + "dev": true, + "requires": { + "os-tmpdir": "~1.0.2" + } + }, "tmpl": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", diff --git a/package.json b/package.json index d17b1b5..2efe936 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,8 @@ "story:build": "build-storybook", "story:serve": "npm run clean && npm run story:build && http-server ./storybook-static", "test": "wtr", - "test:tdd": "npm run test --watch" + "test:tdd": "npm run test --watch", + "postinstall": "patch-package" }, "dependencies": { "bootstrap": "4.0.0-alpha.4", @@ -69,6 +70,7 @@ "glob-promise": "^4.2.2", "http-server": "^14.1.1", "mime-types": "^2.1.34", + "patch-package": "^8.0.0", "postcss-nested": "^4.1.2", "rimraf": "^2.6.3", "rollup-plugin-analyzer": "^4.0.0", From dc8c75a3064fa181a485f5cadcf490e60e0beb82 Mon Sep 17 00:00:00 2001 From: Owen Buckley Date: Thu, 30 May 2024 21:51:09 -0400 Subject: [PATCH 06/26] refactor to use constructable stylesheets --- src/components/card/card.css | 2 -- src/components/card/card.ts | 3 ++- src/components/events-calendar/events-calendar.css | 2 -- src/components/events-calendar/events-calendar.ts | 8 +++----- src/components/footer/footer.css | 2 -- src/components/footer/footer.ts | 3 ++- src/components/header/header.css | 2 -- src/components/header/header.ts | 3 ++- src/components/navigation/navigation.css | 2 -- src/components/navigation/navigation.ts | 4 +++- src/components/posts-list/posts-list.ts | 8 ++++---- src/components/social-share/social-share.ts | 3 ++- src/routes/albums/albums.css | 3 --- src/routes/albums/albums.ts | 9 ++++----- src/routes/artists/artist-details.ts | 9 ++++----- src/routes/artists/artists.css | 3 --- src/routes/artists/artists.ts | 9 ++++----- src/routes/contact/contact.css | 2 -- src/routes/contact/contact.ts | 8 +++----- src/routes/events/event-details.ts | 8 +++----- src/routes/events/events.css | 2 -- src/routes/events/events.ts | 8 +++----- src/routes/home/home.css | 3 --- src/routes/home/home.ts | 9 ++++----- 24 files changed, 43 insertions(+), 72 deletions(-) diff --git a/src/components/card/card.css b/src/components/card/card.css index 2da2f38..3ad0df0 100644 --- a/src/components/card/card.css +++ b/src/components/card/card.css @@ -1,5 +1,3 @@ -@import "../../theme.css"; - .as-card { & a { diff --git a/src/components/card/card.ts b/src/components/card/card.ts index ec724dd..de8d3c2 100644 --- a/src/components/card/card.ts +++ b/src/components/card/card.ts @@ -3,13 +3,14 @@ import { customElement, property } from 'lit/decorators.js'; import { unsafeHTML } from 'lit/directives/unsafe-html.js'; import { Details } from './card.model.ts'; import cardCss from './card.css?type=raw'; +import theme from '../../theme.css' with { type: 'css' }; @customElement('app-card') export class CardComponent extends LitElement { @property() accessor details: Details; - static styles = css`${unsafeCSS(cardCss)}`; + static styles = [theme, css`${unsafeCSS(cardCss)}`]; protected render():TemplateResult { const { details } = this; diff --git a/src/components/events-calendar/events-calendar.css b/src/components/events-calendar/events-calendar.css index 1f1109f..55d21a5 100644 --- a/src/components/events-calendar/events-calendar.css +++ b/src/components/events-calendar/events-calendar.css @@ -1,5 +1,3 @@ -@import '../../theme.css'; - :host { & .as-events-calendar__header { diff --git a/src/components/events-calendar/events-calendar.ts b/src/components/events-calendar/events-calendar.ts index ba54b4f..ca818f2 100644 --- a/src/components/events-calendar/events-calendar.ts +++ b/src/components/events-calendar/events-calendar.ts @@ -1,12 +1,14 @@ /* eslint-disable max-depth */ -import { html, LitElement, TemplateResult } from 'lit'; +import { css, html, LitElement, TemplateResult, unsafeCSS } from 'lit'; import { customElement, property } from 'lit/decorators.js'; import { unsafeHTML } from 'lit/directives/unsafe-html.js'; import { getEvents } from '../../services/events/events-service.ts'; import eventsCalendarCss from './events-calendar.css?type=raw'; +import theme from '../../theme.css' with { type: 'css' }; @customElement('app-events-calendar') export class EventsCalendarComponent extends LitElement { + static styles = [theme, css`${unsafeCSS(eventsCalendarCss)}`]; private DAYS_IN_WEEK = 7; private MAX_CALENDAR_SPACES = 42; @@ -133,10 +135,6 @@ export class EventsCalendarComponent extends LitElement { protected render(): TemplateResult { return html` - -