diff --git a/package-lock.json b/package-lock.json index 1060a31..a19a137 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,10 +16,10 @@ "open-props": "^1.7.23" }, "devDependencies": { - "@greenwood/cli": "~0.34.0-alpha.4", - "@greenwood/plugin-css-modules": "^0.34.0-alpha.4", - "@greenwood/plugin-import-jsx": "^0.34.0-alpha.4", - "@greenwood/plugin-import-raw": "^0.34.0-alpha.4", + "@greenwood/cli": "~0.34.0-alpha.6", + "@greenwood/plugin-css-modules": "^0.34.0-alpha.6", + "@greenwood/plugin-import-jsx": "^0.34.0-alpha.6", + "@greenwood/plugin-import-raw": "^0.34.0-alpha.6", "@typescript/native-preview": "^7.0.0-dev.20260506.1", "husky": "^9.1.7", "lint-staged": "^16.2.7", @@ -30,9 +30,9 @@ } }, "node_modules/@greenwood/cli": { - "version": "0.34.0-alpha.4", - "resolved": "https://registry.npmjs.org/@greenwood/cli/-/cli-0.34.0-alpha.4.tgz", - "integrity": "sha512-UagmjO9AxuGPf3YKB1YINTMAABTEBbQGNby75At2q7Wpov1wz9aUUB0xrqX8VzyqUM3yIg45uTP8qB3GNnXlBA==", + "version": "0.34.0-alpha.6", + "resolved": "https://registry.npmjs.org/@greenwood/cli/-/cli-0.34.0-alpha.6.tgz", + "integrity": "sha512-tnYniTs+YGmd1D1edb8drJWNoKzv0Smqi0Xyi/xK1ShUpttgJZF9E1BHpB8Pr8r2Q8unAvV9xUNuAXpmn8P+iw==", "dev": true, "license": "MIT", "dependencies": { @@ -49,9 +49,9 @@ "koa-body": "^6.0.1", "livereload": "^0.9.1", "node-html-parser": "^7.0.1", - "rollup": "^4.26.0", + "rollup": "^4.59.0", "urlpattern-polyfill": "^10.1.0", - "wc-compiler": "~0.19.0" + "wc-compiler": "~0.22.0" }, "bin": { "greenwood": "src/bin.js" @@ -61,9 +61,9 @@ } }, "node_modules/@greenwood/plugin-css-modules": { - "version": "0.34.0-alpha.4", - "resolved": "https://registry.npmjs.org/@greenwood/plugin-css-modules/-/plugin-css-modules-0.34.0-alpha.4.tgz", - "integrity": "sha512-gH0LJ0QkyCFOQnxwJRNpVJMoTa33ypVA8gzooGbEu0CzfWS0iuptfuzaD8s2wt4oOt4AXmmH7ICW2Gj5LAmXrQ==", + "version": "0.34.0-alpha.6", + "resolved": "https://registry.npmjs.org/@greenwood/plugin-css-modules/-/plugin-css-modules-0.34.0-alpha.6.tgz", + "integrity": "sha512-xzOkEiVc1vUpFUWMIHsmLnKmgBlfYJY9nXY/GMvhqcXKRb1kxsaPNMNLY6jJ+ji1TJ4qubAqBXcypzvlAUyXoQ==", "dev": true, "license": "MIT", "dependencies": { @@ -77,23 +77,24 @@ } }, "node_modules/@greenwood/plugin-import-jsx": { - "version": "0.34.0-alpha.4", - "resolved": "https://registry.npmjs.org/@greenwood/plugin-import-jsx/-/plugin-import-jsx-0.34.0-alpha.4.tgz", - "integrity": "sha512-PDIglK6CtSNeFileA7mF79jnWacvMVAUtQnXhoBzg9/dGFsYrzYuF85Gv1dDi+mGKNFOME0BzDQwxqt+N9bP/A==", + "version": "0.34.0-alpha.6", + "resolved": "https://registry.npmjs.org/@greenwood/plugin-import-jsx/-/plugin-import-jsx-0.34.0-alpha.6.tgz", + "integrity": "sha512-d2kwIUrfgwo7EOUtZwaEizhAhDKK6/UluA5+rKTY+WSOE0G+Hsb4QMGL/2qr276Idnduxmu0sJ/NF6jFDtjW9Q==", "dev": true, "license": "MIT", "dependencies": { "astring": "^1.9.0", - "wc-compiler": "~0.19.0" + "node-html-parser": "^7.0.1", + "wc-compiler": "~0.22.0" }, "peerDependencies": { "@greenwood/cli": "^0.33.0" } }, "node_modules/@greenwood/plugin-import-raw": { - "version": "0.34.0-alpha.4", - "resolved": "https://registry.npmjs.org/@greenwood/plugin-import-raw/-/plugin-import-raw-0.34.0-alpha.4.tgz", - "integrity": "sha512-oZAnonBzg0zsPzbAWqEVtj+XmBs0UNjtslXxQ/F9FP7qE+hFX+MWVF5E8mDORacHKewOqweIsoz8rdAiSf1tPA==", + "version": "0.34.0-alpha.6", + "resolved": "https://registry.npmjs.org/@greenwood/plugin-import-raw/-/plugin-import-raw-0.34.0-alpha.6.tgz", + "integrity": "sha512-OPssPemPnXjVcrbbu5SpbgnFrQ/cHQxLL891VQlRY4vngsVNJMFADu3FpEBlwWQgTq8vARaxrZKExQfk/qGiWg==", "dev": true, "license": "MIT", "dependencies": { @@ -516,9 +517,9 @@ } }, "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.57.0.tgz", - "integrity": "sha512-tPgXB6cDTndIe1ah7u6amCI1T0SsnlOuKgg10Xh3uizJk4e5M1JGaUMk7J4ciuAUcFpbOiNhm2XIjP9ON0dUqA==", + "version": "4.61.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.61.0.tgz", + "integrity": "sha512-dnxczajOqt0gesZlN5pGQ1s1imQVrsmCw5G2Ci4oM+0WvNz3pyRnlWrT7McoZIb8VlFwCawdmbWRmxRn7HI+VQ==", "cpu": [ "arm" ], @@ -530,9 +531,9 @@ ] }, "node_modules/@rollup/rollup-android-arm64": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.57.0.tgz", - "integrity": "sha512-sa4LyseLLXr1onr97StkU1Nb7fWcg6niokTwEVNOO7awaKaoRObQ54+V/hrF/BP1noMEaaAW6Fg2d/CfLiq3Mg==", + "version": "4.61.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.61.0.tgz", + "integrity": "sha512-Bp3JpGP00Vu3f238ivRrjf7z3xSzVPXqCmaJYA9t2c+c8vKYvOzmXF7LkkeUalTEGd6cZcSWe+PFIP3Vy48fRg==", "cpu": [ "arm64" ], @@ -544,9 +545,9 @@ ] }, "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.57.0.tgz", - "integrity": "sha512-/NNIj9A7yLjKdmkx5dC2XQ9DmjIECpGpwHoGmA5E1AhU0fuICSqSWScPhN1yLCkEdkCwJIDu2xIeLPs60MNIVg==", + "version": "4.61.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.61.0.tgz", + "integrity": "sha512-zaYIpr670mUmmZ1tVzUFplbQbG7h3Gugx3L5FoqhsC2m/YnLlR1a7zVLmXNPy+iY1tFPEbNG+HHBXZGyId0G5w==", "cpu": [ "arm64" ], @@ -558,9 +559,9 @@ ] }, "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.57.0.tgz", - "integrity": "sha512-xoh8abqgPrPYPr7pTYipqnUi1V3em56JzE/HgDgitTqZBZ3yKCWI+7KUkceM6tNweyUKYru1UMi7FC060RyKwA==", + "version": "4.61.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.61.0.tgz", + "integrity": "sha512-+P49fvkv2dSoeevUW+lgZ/I2JHSsJCK1Lyjj7Cu6E4UHG4tS9XIefzIjo5qhgELjAclnen1rLzK2PMKJdo+Dyg==", "cpu": [ "x64" ], @@ -572,9 +573,9 @@ ] }, "node_modules/@rollup/rollup-freebsd-arm64": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.57.0.tgz", - "integrity": "sha512-PCkMh7fNahWSbA0OTUQ2OpYHpjZZr0hPr8lId8twD7a7SeWrvT3xJVyza+dQwXSSq4yEQTMoXgNOfMCsn8584g==", + "version": "4.61.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.61.0.tgz", + "integrity": "sha512-l3FAAOyKJXH2ea6KNFN+MMgC/rnE94YGLXs2ehYqDcCoHt1DpvgWX75BhUJxN38XojP7Ul+4H8PRn7EdyqSDrw==", "cpu": [ "arm64" ], @@ -586,9 +587,9 @@ ] }, "node_modules/@rollup/rollup-freebsd-x64": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.57.0.tgz", - "integrity": "sha512-1j3stGx+qbhXql4OCDZhnK7b01s6rBKNybfsX+TNrEe9JNq4DLi1yGiR1xW+nL+FNVvI4D02PUnl6gJ/2y6WJA==", + "version": "4.61.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.61.0.tgz", + "integrity": "sha512-VokPN3TSctKj65cyCNPaUh4vMFA8awxOot/0sp+4J7ZlNRKQEhXhawqPwajoi8H5ZFt61i0ugZJuTKXBjGJ17Q==", "cpu": [ "x64" ], @@ -600,9 +601,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.57.0.tgz", - "integrity": "sha512-eyrr5W08Ms9uM0mLcKfM/Uzx7hjhz2bcjv8P2uynfj0yU8GGPdz8iYrBPhiLOZqahoAMB8ZiolRZPbbU2MAi6Q==", + "version": "4.61.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.61.0.tgz", + "integrity": "sha512-DxH0P3wxm+Yzs/p3zrk9dw1rURu8p0Nv5+MRK/L7OtnLNg5rLZraSBFZ8iUXOd9f2BlhJyEpIZUH/emjq4UJ4g==", "cpu": [ "arm" ], @@ -614,9 +615,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-musleabihf": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.57.0.tgz", - "integrity": "sha512-Xds90ITXJCNyX9pDhqf85MKWUI4lqjiPAipJ8OLp8xqI2Ehk+TCVhF9rvOoN8xTbcafow3QOThkNnrM33uCFQA==", + "version": "4.61.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.61.0.tgz", + "integrity": "sha512-T6ZvMNe84kAz6TBWHC7hGAoEtzP1LWYw/AqayGWEF6uISt3Abk/st06LqRD9THd7Xz3NxzurUpzAuEAUbZf+nw==", "cpu": [ "arm" ], @@ -628,9 +629,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.57.0.tgz", - "integrity": "sha512-Xws2KA4CLvZmXjy46SQaXSejuKPhwVdaNinldoYfqruZBaJHqVo6hnRa8SDo9z7PBW5x84SH64+izmldCgbezw==", + "version": "4.61.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.61.0.tgz", + "integrity": "sha512-q/4hzvQkDs8b4jIBab1pnLiiM0ayTZsN2amBFPDzuyZxjEd4wDwx0UJFYM3cOZzSf5Kw8fnWSprJzIBMkcR44Q==", "cpu": [ "arm64" ], @@ -642,9 +643,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.57.0.tgz", - "integrity": "sha512-hrKXKbX5FdaRJj7lTMusmvKbhMJSGWJ+w++4KmjiDhpTgNlhYobMvKfDoIWecy4O60K6yA4SnztGuNTQF+Lplw==", + "version": "4.61.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.61.0.tgz", + "integrity": "sha512-vvYWX3akdEAY6km+9wAqFDnk6pQsbJKVnj7xawcvs/+fdlYBGp+U+Qq/lLfpIxYIZvZLHMAKD9HLdacSx/r3dw==", "cpu": [ "arm64" ], @@ -656,9 +657,9 @@ ] }, "node_modules/@rollup/rollup-linux-loong64-gnu": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.57.0.tgz", - "integrity": "sha512-6A+nccfSDGKsPm00d3xKcrsBcbqzCTAukjwWK6rbuAnB2bHaL3r9720HBVZ/no7+FhZLz/U3GwwZZEh6tOSI8Q==", + "version": "4.61.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.61.0.tgz", + "integrity": "sha512-DePa5cqOxDP/Zp0VOXpeWaGew5iIv5DXp9NYbzkX5PFQyWVX9184WCTh3hvr/7lhXo8ZVlbFLkz8+o/q1dU6gA==", "cpu": [ "loong64" ], @@ -670,9 +671,9 @@ ] }, "node_modules/@rollup/rollup-linux-loong64-musl": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.57.0.tgz", - "integrity": "sha512-4P1VyYUe6XAJtQH1Hh99THxr0GKMMwIXsRNOceLrJnaHTDgk1FTcTimDgneRJPvB3LqDQxUmroBclQ1S0cIJwQ==", + "version": "4.61.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.61.0.tgz", + "integrity": "sha512-LV8aWMB8UChglMCEzs7RkN0GsH29RJaLLqwm9fCIjlqwxQTiWAqNcc7wjBkH31hV0PU/yVxGYvrYsgfea2qw6g==", "cpu": [ "loong64" ], @@ -684,9 +685,9 @@ ] }, "node_modules/@rollup/rollup-linux-ppc64-gnu": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.57.0.tgz", - "integrity": "sha512-8Vv6pLuIZCMcgXre6c3nOPhE0gjz1+nZP6T+hwWjr7sVH8k0jRkH+XnfjjOTglyMBdSKBPPz54/y1gToSKwrSQ==", + "version": "4.61.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.61.0.tgz", + "integrity": "sha512-QoNSnwQtaeNu5grdBbsL0tt1uyl5EnS8DA8Mr3nluMXbhdQNyhN+G4tBax7VCdxLKj8YJ0/4OO9Ho84jMnJtKA==", "cpu": [ "ppc64" ], @@ -698,9 +699,9 @@ ] }, "node_modules/@rollup/rollup-linux-ppc64-musl": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.57.0.tgz", - "integrity": "sha512-r1te1M0Sm2TBVD/RxBPC6RZVwNqUTwJTA7w+C/IW5v9Ssu6xmxWEi+iJQlpBhtUiT1raJ5b48pI8tBvEjEFnFA==", + "version": "4.61.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.61.0.tgz", + "integrity": "sha512-/zZp5MKapIIApE8trN8qLGNSiRN9TUoaUZ1cmVu4XnVdd5LQLOXTtyi+vtfUbNnT3iyjzpPqYeKXmvJ+gJGYWw==", "cpu": [ "ppc64" ], @@ -712,9 +713,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.57.0.tgz", - "integrity": "sha512-say0uMU/RaPm3CDQLxUUTF2oNWL8ysvHkAjcCzV2znxBr23kFfaxocS9qJm+NdkRhF8wtdEEAJuYcLPhSPbjuQ==", + "version": "4.61.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.61.0.tgz", + "integrity": "sha512-RbrzcD3aJ1k3UbtMRRBNwojdVVyXjuVAFTfn/xPa6EEl6GE9Sm/akPgFTb9aAC9pMKGJ6CtWxaGrqWcabH+ySg==", "cpu": [ "riscv64" ], @@ -726,9 +727,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-musl": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.57.0.tgz", - "integrity": "sha512-/MU7/HizQGsnBREtRpcSbSV1zfkoxSTR7wLsRmBPQ8FwUj5sykrP1MyJTvsxP5KBq9SyE6kH8UQQQwa0ASeoQQ==", + "version": "4.61.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.61.0.tgz", + "integrity": "sha512-ZF+onDsBso8PJf1XaG9lB+O9RnBpKGnY6OrzC4CSHrtC1jb6jWLTKK4bRqdoCXHd22gyr2hiYmEAm8Wns/BOCw==", "cpu": [ "riscv64" ], @@ -740,9 +741,9 @@ ] }, "node_modules/@rollup/rollup-linux-s390x-gnu": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.57.0.tgz", - "integrity": "sha512-Q9eh+gUGILIHEaJf66aF6a414jQbDnn29zeu0eX3dHMuysnhTvsUvZTCAyZ6tJhUjnvzBKE4FtuaYxutxRZpOg==", + "version": "4.61.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.61.0.tgz", + "integrity": "sha512-Atk0aSIk5Zx2Wuh9dgRQgLP0Koc8hOeYpbWryMXyk8G8/HmPkwPPkMqIIDhrXHHYqfUzSJA/I7IWSBv8xSmRBA==", "cpu": [ "s390x" ], @@ -754,9 +755,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.57.0.tgz", - "integrity": "sha512-OR5p5yG5OKSxHReWmwvM0P+VTPMwoBS45PXTMYaskKQqybkS3Kmugq1W+YbNWArF8/s7jQScgzXUhArzEQ7x0A==", + "version": "4.61.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.61.0.tgz", + "integrity": "sha512-0uMOcf3eZ5K+K4cYHkdxShFMPlPXCOdfDFEFn9dNYAEEd2cVvmOfH7zFgRVoDgmtQ1m9k5q7qfrHzyMAubKYUA==", "cpu": [ "x64" ], @@ -768,9 +769,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.57.0.tgz", - "integrity": "sha512-XeatKzo4lHDsVEbm1XDHZlhYZZSQYym6dg2X/Ko0kSFgio+KXLsxwJQprnR48GvdIKDOpqWqssC3iBCjoMcMpw==", + "version": "4.61.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.61.0.tgz", + "integrity": "sha512-mvFtE4A/t/7hRJ7X8Ozmu8FsIkAUat2nzl12pgU337BRmq87AQUJztwHz2Zv5/tjo9/C95E66CK03SI/ToEDJw==", "cpu": [ "x64" ], @@ -782,9 +783,9 @@ ] }, "node_modules/@rollup/rollup-openbsd-x64": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.57.0.tgz", - "integrity": "sha512-Lu71y78F5qOfYmubYLHPcJm74GZLU6UJ4THkf/a1K7Tz2ycwC2VUbsqbJAXaR6Bx70SRdlVrt2+n5l7F0agTUw==", + "version": "4.61.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.61.0.tgz", + "integrity": "sha512-z9b9+aTxvt8n2rNltMPvyaUfB8NJ+CVyOrGK/MdIKHx7B+lXmZpm/XbRsU7Rpf3fRqJ2uS6mBJiJveCtq8LHDg==", "cpu": [ "x64" ], @@ -796,9 +797,9 @@ ] }, "node_modules/@rollup/rollup-openharmony-arm64": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.57.0.tgz", - "integrity": "sha512-v5xwKDWcu7qhAEcsUubiav7r+48Uk/ENWdr82MBZZRIm7zThSxCIVDfb3ZeRRq9yqk+oIzMdDo6fCcA5DHfMyA==", + "version": "4.61.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.61.0.tgz", + "integrity": "sha512-jXaXFqKMehsOc+g8R6oo33RRC6w07G9jDBxAE5eAKX7mOcCbZloYIPNhfG9Wl+P9O9IWHFO4OJgPi1Ml2qkt7w==", "cpu": [ "arm64" ], @@ -810,9 +811,9 @@ ] }, "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.57.0.tgz", - "integrity": "sha512-XnaaaSMGSI6Wk8F4KK3QP7GfuuhjGchElsVerCplUuxRIzdvZ7hRBpLR0omCmw+kI2RFJB80nenhOoGXlJ5TfQ==", + "version": "4.61.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.61.0.tgz", + "integrity": "sha512-OXNWVFocS2IA4+QplhTZZ2a+8hPZR7T8KuozsNmJKK8y7cp83StHvGksfHzPG3wczWTczyWHVQuqeiTUbjiyBg==", "cpu": [ "arm64" ], @@ -824,9 +825,9 @@ ] }, "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.57.0.tgz", - "integrity": "sha512-3K1lP+3BXY4t4VihLw5MEg6IZD3ojSYzqzBG571W3kNQe4G4CcFpSUQVgurYgib5d+YaCjeFow8QivWp8vuSvA==", + "version": "4.61.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.61.0.tgz", + "integrity": "sha512-AlAbNtBO637LxSldqV43z0FfXoGfl2TW1DgAg/bs7aQswFbDewz2SJm3BUhiGfbOVtW571xbc9p+REdxhyN/Eg==", "cpu": [ "ia32" ], @@ -838,9 +839,9 @@ ] }, "node_modules/@rollup/rollup-win32-x64-gnu": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.57.0.tgz", - "integrity": "sha512-MDk610P/vJGc5L5ImE4k5s+GZT3en0KoK1MKPXCRgzmksAMk79j4h3k1IerxTNqwDLxsGxStEZVBqG0gIqZqoA==", + "version": "4.61.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.61.0.tgz", + "integrity": "sha512-QRSrQXyJ1M4tjNXdR0/G/IgV6lzfQQJYBjlWIEYkY2Xs86DRl/iEpQ4blMDjJxSl7n19eDKKXMg0AmuBVYy8pQ==", "cpu": [ "x64" ], @@ -852,9 +853,9 @@ ] }, "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.57.0.tgz", - "integrity": "sha512-Zv7v6q6aV+VslnpwzqKAmrk5JdVkLUzok2208ZXGipjb+msxBr/fJPZyeEXiFgH7k62Ak0SLIfxQRZQvTuf7rQ==", + "version": "4.61.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.61.0.tgz", + "integrity": "sha512-tkuFxhvKO/HlGd0VsINF6vHSYH8AF8W0TcNxKDK6JZmrehngFj78pToc8iemtnvwilDjs2G/qSzYFhe9U8q+fw==", "cpu": [ "x64" ], @@ -928,9 +929,9 @@ } }, "node_modules/@types/estree": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz", - "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==", + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.9.tgz", + "integrity": "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==", "dev": true, "license": "MIT" }, @@ -3469,13 +3470,13 @@ "license": "MIT" }, "node_modules/rollup": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.57.0.tgz", - "integrity": "sha512-e5lPJi/aui4TO1LpAXIRLySmwXSE8k3b9zoGfd42p67wzxog4WHjiZF3M2uheQih4DGyc25QEV4yRBbpueNiUA==", + "version": "4.61.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.61.0.tgz", + "integrity": "sha512-T9mWdbWfQtp0B5lv/HX+wrhYsmXRlcWnXXmJbXqKJhlRaoS6KMhq0gpyzW4UJfclcxrEdLnTgjT2NjruLONu0g==", "dev": true, "license": "MIT", "dependencies": { - "@types/estree": "1.0.8" + "@types/estree": "1.0.9" }, "bin": { "rollup": "dist/bin/rollup" @@ -3485,31 +3486,31 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.57.0", - "@rollup/rollup-android-arm64": "4.57.0", - "@rollup/rollup-darwin-arm64": "4.57.0", - "@rollup/rollup-darwin-x64": "4.57.0", - "@rollup/rollup-freebsd-arm64": "4.57.0", - "@rollup/rollup-freebsd-x64": "4.57.0", - "@rollup/rollup-linux-arm-gnueabihf": "4.57.0", - "@rollup/rollup-linux-arm-musleabihf": "4.57.0", - "@rollup/rollup-linux-arm64-gnu": "4.57.0", - "@rollup/rollup-linux-arm64-musl": "4.57.0", - "@rollup/rollup-linux-loong64-gnu": "4.57.0", - "@rollup/rollup-linux-loong64-musl": "4.57.0", - "@rollup/rollup-linux-ppc64-gnu": "4.57.0", - "@rollup/rollup-linux-ppc64-musl": "4.57.0", - "@rollup/rollup-linux-riscv64-gnu": "4.57.0", - "@rollup/rollup-linux-riscv64-musl": "4.57.0", - "@rollup/rollup-linux-s390x-gnu": "4.57.0", - "@rollup/rollup-linux-x64-gnu": "4.57.0", - "@rollup/rollup-linux-x64-musl": "4.57.0", - "@rollup/rollup-openbsd-x64": "4.57.0", - "@rollup/rollup-openharmony-arm64": "4.57.0", - "@rollup/rollup-win32-arm64-msvc": "4.57.0", - "@rollup/rollup-win32-ia32-msvc": "4.57.0", - "@rollup/rollup-win32-x64-gnu": "4.57.0", - "@rollup/rollup-win32-x64-msvc": "4.57.0", + "@rollup/rollup-android-arm-eabi": "4.61.0", + "@rollup/rollup-android-arm64": "4.61.0", + "@rollup/rollup-darwin-arm64": "4.61.0", + "@rollup/rollup-darwin-x64": "4.61.0", + "@rollup/rollup-freebsd-arm64": "4.61.0", + "@rollup/rollup-freebsd-x64": "4.61.0", + "@rollup/rollup-linux-arm-gnueabihf": "4.61.0", + "@rollup/rollup-linux-arm-musleabihf": "4.61.0", + "@rollup/rollup-linux-arm64-gnu": "4.61.0", + "@rollup/rollup-linux-arm64-musl": "4.61.0", + "@rollup/rollup-linux-loong64-gnu": "4.61.0", + "@rollup/rollup-linux-loong64-musl": "4.61.0", + "@rollup/rollup-linux-ppc64-gnu": "4.61.0", + "@rollup/rollup-linux-ppc64-musl": "4.61.0", + "@rollup/rollup-linux-riscv64-gnu": "4.61.0", + "@rollup/rollup-linux-riscv64-musl": "4.61.0", + "@rollup/rollup-linux-s390x-gnu": "4.61.0", + "@rollup/rollup-linux-x64-gnu": "4.61.0", + "@rollup/rollup-linux-x64-musl": "4.61.0", + "@rollup/rollup-openbsd-x64": "4.61.0", + "@rollup/rollup-openharmony-arm64": "4.61.0", + "@rollup/rollup-win32-arm64-msvc": "4.61.0", + "@rollup/rollup-win32-ia32-msvc": "4.61.0", + "@rollup/rollup-win32-x64-gnu": "4.61.0", + "@rollup/rollup-win32-x64-msvc": "4.61.0", "fsevents": "~2.3.2" } }, @@ -3701,6 +3702,13 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/signal-polyfill": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/signal-polyfill/-/signal-polyfill-0.2.2.tgz", + "integrity": "sha512-p63Y4Er5/eMQ9RHg0M0Y64NlsQKpiu6MDdhBXpyywRuWiPywhJTpKJ1iB5K2hJEbFZ0BnDS7ZkJ+0AfTuL37Rg==", + "dev": true, + "license": "Apache-2.0" + }, "node_modules/slash": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz", @@ -4091,9 +4099,9 @@ } }, "node_modules/wc-compiler": { - "version": "0.20.0", - "resolved": "https://registry.npmjs.org/wc-compiler/-/wc-compiler-0.20.0.tgz", - "integrity": "sha512-+zFMIkaPjSRFrcLXrFmHEnOJQN1QMhUPDm5Di1wyyuvY1Il/EIWauEdbQ5ZWmHlEK9X+w0ABnzsl41jR1SLmfw==", + "version": "0.22.0", + "resolved": "https://registry.npmjs.org/wc-compiler/-/wc-compiler-0.22.0.tgz", + "integrity": "sha512-3oOntrBpI3kHIaz9uuC71EE5h6vzsATE6mqjU2Y0A33Dee4Shmlf3cNBFEdnfjijXmXj6IN2TMPrBzkCRhjjpQ==", "dev": true, "license": "MIT", "dependencies": { @@ -4102,6 +4110,7 @@ "acorn-walk": "^8.3.4", "astring": "^1.9.0", "parse5": "^7.2.1", + "signal-polyfill": "^0.2.2", "sucrase": "^3.35.0" }, "engines": { diff --git a/package.json b/package.json index ed74f61..d6de92d 100644 --- a/package.json +++ b/package.json @@ -33,10 +33,10 @@ "open-props": "^1.7.23" }, "devDependencies": { - "@greenwood/cli": "~0.34.0-alpha.4", - "@greenwood/plugin-css-modules": "^0.34.0-alpha.4", - "@greenwood/plugin-import-jsx": "^0.34.0-alpha.4", - "@greenwood/plugin-import-raw": "^0.34.0-alpha.4", + "@greenwood/cli": "~0.34.0-alpha.6", + "@greenwood/plugin-css-modules": "^0.34.0-alpha.6", + "@greenwood/plugin-import-jsx": "^0.34.0-alpha.6", + "@greenwood/plugin-import-raw": "^0.34.0-alpha.6", "@typescript/native-preview": "^7.0.0-dev.20260506.1", "husky": "^9.1.7", "lint-staged": "^16.2.7", @@ -44,8 +44,5 @@ "oxlint": "^1.43.0", "patch-package": "^8.0.1", "typescript": "^6.0.2" - }, - "overrides": { - "wc-compiler": "~0.20.0" } } diff --git a/patches/@greenwood+cli+0.34.0-alpha.4.patch b/patches/@greenwood+cli+0.34.0-alpha.4.patch deleted file mode 100644 index 606a919..0000000 --- a/patches/@greenwood+cli+0.34.0-alpha.4.patch +++ /dev/null @@ -1,87 +0,0 @@ -diff --git a/node_modules/@greenwood/cli/src/config/rollup.config.js b/node_modules/@greenwood/cli/src/config/rollup.config.js -index 5490610..4affb35 100644 ---- a/node_modules/@greenwood/cli/src/config/rollup.config.js -+++ b/node_modules/@greenwood/cli/src/config/rollup.config.js -@@ -553,6 +553,7 @@ function greenwoodSyncImportAttributes(compilation) { - }; - const ref = that.emitFile(emitConfig); - const importRef = `import.meta.ROLLUP_ASSET_URL_${ref}`; -+ console.log({ ref, importRef }) - - bundles[bundle].code = bundles[bundle].code.replace( - value, -@@ -584,6 +585,7 @@ function greenwoodSyncImportAttributes(compilation) { - // since it seems that Rollup will not do it after the bundling hook - // https://github.com/rollup/rollup/blob/v3.29.4/docs/plugin-development/index.md#generatebundle - async writeBundle(options, bundles) { -+ console.log('----------------------------------') - const resourcePlugins = compilation.config.plugins - .filter((plugin) => { - return plugin.type === "resource"; -@@ -599,8 +601,9 @@ function greenwoodSyncImportAttributes(compilation) { - - if (externalizedResources.includes(ext)) { - const hash = fileName.split(".")[fileName.split(".").length - 2]; -+ console.log({ fileName, asset, hash }) - -- if (fileName.replace(`.${hash}`, "") === asset) { -+ if (fileName.replace(`.${hash}`, "").replace(/_20/g, '%20') === asset) { - unbundledAssetsRefMapper[asset].importers.forEach((importer, idx) => { - let contents = fs.readFileSync( - new URL(`./${importer}`, compilation.context.outputDir), -diff --git a/node_modules/@greenwood/cli/src/lifecycles/serve.js b/node_modules/@greenwood/cli/src/lifecycles/serve.js -index beff516..d4c24ce 100644 ---- a/node_modules/@greenwood/cli/src/lifecycles/serve.js -+++ b/node_modules/@greenwood/cli/src/lifecycles/serve.js -@@ -70,9 +70,9 @@ async function getDevServer(compilation) { - (await plugin.shouldServe(url, request)) - ) { - const current = await plugin.serve(url, request); -- const merged = mergeResponse(response.clone(), current.clone()); -+ const merged = mergeResponse(response, current); - -- response = merged.clone(); -+ response = merged; - } - } - -@@ -106,16 +106,18 @@ async function getDevServer(compilation) { - // when looping through and sharing responses between plugins - const response = await resourcePlugins.reduce(async (responsePromise, plugin) => { - const intermediateResponse = await responsePromise; -+ // Create a single snapshot to avoid multiple clone() calls failing on exhausted bodies -+ const responseSnapshot = intermediateResponse.clone(); - if ( - plugin.shouldPreIntercept && -- (await plugin.shouldPreIntercept(url, request, intermediateResponse.clone())) -+ (await plugin.shouldPreIntercept(url, request, responseSnapshot.clone())) - ) { - const current = await plugin.preIntercept( - url, - request, -- await intermediateResponse.clone(), -+ await responseSnapshot.clone(), - ); -- const merged = mergeResponse(intermediateResponse.clone(), current); -+ const merged = mergeResponse(responseSnapshot, current); - - return Promise.resolve(merged); - } else { -@@ -152,12 +154,14 @@ async function getDevServer(compilation) { - // when looping through and sharing responses between plugins - const response = await resourcePlugins.reduce(async (responsePromise, plugin) => { - const intermediateResponse = await responsePromise; -+ // Create a single snapshot to avoid multiple clone() calls failing on exhausted bodies -+ const responseSnapshot = intermediateResponse.clone(); - if ( - plugin.shouldIntercept && -- (await plugin.shouldIntercept(url, request, intermediateResponse.clone())) -+ (await plugin.shouldIntercept(url, request, responseSnapshot.clone())) - ) { -- const current = await plugin.intercept(url, request, await intermediateResponse.clone()); -- const merged = mergeResponse(intermediateResponse.clone(), current); -+ const current = await plugin.intercept(url, request, await responseSnapshot.clone()); -+ const merged = mergeResponse(responseSnapshot, current); - - return Promise.resolve(merged); - } else { diff --git a/patches/@greenwood+cli+0.34.0-alpha.6.patch b/patches/@greenwood+cli+0.34.0-alpha.6.patch new file mode 100644 index 0000000..31901a7 --- /dev/null +++ b/patches/@greenwood+cli+0.34.0-alpha.6.patch @@ -0,0 +1,44 @@ +diff --git a/node_modules/@greenwood/cli/src/lifecycles/serve.js b/node_modules/@greenwood/cli/src/lifecycles/serve.js +index beff516..fcee286 100644 +--- a/node_modules/@greenwood/cli/src/lifecycles/serve.js ++++ b/node_modules/@greenwood/cli/src/lifecycles/serve.js +@@ -106,16 +106,14 @@ async function getDevServer(compilation) { + // when looping through and sharing responses between plugins + const response = await resourcePlugins.reduce(async (responsePromise, plugin) => { + const intermediateResponse = await responsePromise; ++ // Create a single snapshot to avoid multiple clone() calls failing on exhausted bodies ++ const responseSnapshot = intermediateResponse.clone(); + if ( + plugin.shouldPreIntercept && +- (await plugin.shouldPreIntercept(url, request, intermediateResponse.clone())) ++ (await plugin.shouldPreIntercept(url, request, responseSnapshot.clone())) + ) { +- const current = await plugin.preIntercept( +- url, +- request, +- await intermediateResponse.clone(), +- ); +- const merged = mergeResponse(intermediateResponse.clone(), current); ++ const current = await plugin.preIntercept(url, request, await responseSnapshot.clone()); ++ const merged = mergeResponse(responseSnapshot, current); + + return Promise.resolve(merged); + } else { +@@ -152,12 +150,14 @@ async function getDevServer(compilation) { + // when looping through and sharing responses between plugins + const response = await resourcePlugins.reduce(async (responsePromise, plugin) => { + const intermediateResponse = await responsePromise; ++ // Create a single "snapshot" to avoid multiple clone() calls failing on exhausted bodies ++ const responseSnapshot = intermediateResponse.clone(); + if ( + plugin.shouldIntercept && +- (await plugin.shouldIntercept(url, request, intermediateResponse.clone())) ++ (await plugin.shouldIntercept(url, request, responseSnapshot.clone())) + ) { +- const current = await plugin.intercept(url, request, await intermediateResponse.clone()); +- const merged = mergeResponse(intermediateResponse.clone(), current); ++ const current = await plugin.intercept(url, request, await responseSnapshot.clone()); ++ const merged = mergeResponse(responseSnapshot, current); + + return Promise.resolve(merged); + } else { diff --git a/patches/@greenwood+plugin-import-jsx+0.34.0-alpha.4.patch b/patches/@greenwood+plugin-import-jsx+0.34.0-alpha.4.patch deleted file mode 100644 index 674820e..0000000 --- a/patches/@greenwood+plugin-import-jsx+0.34.0-alpha.4.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/node_modules/@greenwood/plugin-import-jsx/src/index.js b/node_modules/@greenwood/plugin-import-jsx/src/index.js -index 5fe6e11..15fdad2 100644 ---- a/node_modules/@greenwood/plugin-import-jsx/src/index.js -+++ b/node_modules/@greenwood/plugin-import-jsx/src/index.js -@@ -4,7 +4,7 @@ - * - */ - import { generate } from "astring"; --import { parseJsx } from "wc-compiler/src/jsx-loader.js"; -+import { parseJsx } from "wc-compiler/jsx-loader"; - - class ImportJsxResource { - constructor(compilation, options) { diff --git a/patches/wc-compiler+0.20.0.patch b/patches/wc-compiler+0.20.0.patch deleted file mode 100644 index ac18c1c..0000000 --- a/patches/wc-compiler+0.20.0.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/node_modules/wc-compiler/src/jsx-loader.js b/node_modules/wc-compiler/src/jsx-loader.js -index 55b17e2..aae5af4 100644 ---- a/node_modules/wc-compiler/src/jsx-loader.js -+++ b/node_modules/wc-compiler/src/jsx-loader.js -@@ -27,7 +27,8 @@ function getParse(html) { - } - - export function getParser(moduleURL) { -- const ext = moduleURL.pathname.split('.').pop(); -+ // TODO: we only get a Blob URL for the REPL, so will have to craft a "faux" URL -+ const ext = moduleURL?.pathname?.split('.')?.pop(); - const isJSX = ext === 'jsx' || ext === 'tsx'; - - if (!isJSX) { -diff --git a/node_modules/wc-compiler/src/jsx.d.ts b/node_modules/wc-compiler/src/jsx.d.ts -index 4c9286b..ca6e96a 100644 ---- a/node_modules/wc-compiler/src/jsx.d.ts -+++ b/node_modules/wc-compiler/src/jsx.d.ts -@@ -9,13 +9,15 @@ type ElementAttributes = { - class?: string; - }; - -+type PopoverState = 'auto' | 'manual' | 'hint'; - type PopoverTargetAction = 'show' | 'hide' | 'toggle'; --type PopoverTargetAttributes = { -+type PopoverAttributes = { - // have to manage this manually, can't seem to get this from TypeScript itself (not sure if just skill issue? :D) - // https://github.com/microsoft/TypeScript-DOM-lib-generator/issues/1790 - // it should be there per https://github.com/mdn/browser-compat-data/pull/21875 - // https://github.com/ProjectEvergreen/wcc/issues/236 - // per the spec, this should only apply to