From c6703868129a7e3601b07d5ef0d88b2f9c2b09fc Mon Sep 17 00:00:00 2001 From: Daniel LaCosse <3759828+daniellacosse@users.noreply.github.com> Date: Tue, 21 Jan 2025 17:22:21 -0500 Subject: [PATCH] partial cleanup, need to regen package-lock still --- client/src/www/webpack_base.mjs | 6 ++++- package-lock.json | 43 +++++++++++++++++++++++++++------ package.json | 4 --- server_manager/base.webpack.js | 4 +++ 4 files changed, 44 insertions(+), 13 deletions(-) diff --git a/client/src/www/webpack_base.mjs b/client/src/www/webpack_base.mjs index 3667a2288b..90d7b6dc9d 100644 --- a/client/src/www/webpack_base.mjs +++ b/client/src/www/webpack_base.mjs @@ -40,12 +40,16 @@ export const baseConfig = { resolve: { extensions: ['.ts', '.js', '.mts', '.mjs'], fallback: {url: require.resolve('url/')}, - // This alias prevents multiple copies of lit from creeping into the build: + // These aliai prevents multiple copies of lit from creeping into the build: // See: https://lit.dev/docs/tools/development/#multiple-lit-versions alias: { lit: path.resolve(getRootDir(), 'node_modules/lit'), 'lit/*': path.resolve(getRootDir(), 'node_modules/lit/*'), 'lit-html': path.resolve(getRootDir(), 'node_modules/lit-html'), + '@lit/reactive-element': path.resolve( + getRootDir(), + 'node_modules/@lit/reactive-element' + ), }, }, optimization: { diff --git a/package-lock.json b/package-lock.json index 6598f6e719..a0ee006264 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,6 @@ "client" ], "devDependencies": { - "@lit/reactive-element": "^1.6.3", "@storybook/addon-essentials": "^8.2.6", "@storybook/addon-links": "^8.2.6", "@storybook/blocks": "^8.2.6", @@ -86,7 +85,6 @@ "element-internals-polyfill": "^1.3.12", "fs-extra": "^11.2.0", "koffi": "^2.9.1", - "lit": "^3.0.0", "ShadowsocksConfig": "github:Jigsaw-Code/outline-shadowsocksconfig#v0.2.1", "socks": "^1.1.10", "sudo-prompt": "^9.2.1", @@ -23624,6 +23622,14 @@ "lit-html": "^3.2.0" } }, + "node_modules/lit-element/node_modules/@lit/reactive-element": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@lit/reactive-element/-/reactive-element-2.0.4.tgz", + "integrity": "sha512-GFn91inaUa2oHLak8awSIigYz0cU0Payr1rcFsrkf5OJ5eSPxElyZfKh0f2p9FsTiZWXQdWGJeXZICEfXXYSXQ==", + "dependencies": { + "@lit-labs/ssr-dom-shim": "^1.2.0" + } + }, "node_modules/lit-element/node_modules/lit-html": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-3.2.1.tgz", @@ -23640,6 +23646,14 @@ "@types/trusted-types": "^2.0.2" } }, + "node_modules/lit/node_modules/@lit/reactive-element": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@lit/reactive-element/-/reactive-element-2.0.4.tgz", + "integrity": "sha512-GFn91inaUa2oHLak8awSIigYz0cU0Payr1rcFsrkf5OJ5eSPxElyZfKh0f2p9FsTiZWXQdWGJeXZICEfXXYSXQ==", + "dependencies": { + "@lit-labs/ssr-dom-shim": "^1.2.0" + } + }, "node_modules/lit/node_modules/lit-html": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-3.2.1.tgz", @@ -34860,7 +34874,6 @@ "google-auth-library": "^8.9.0", "intl-messageformat": "^7.8.4", "jsonic": "^0.3.1", - "lit": "^3.0.0", "minimist": "^1.2.8", "node-fetch": "^3.3.2", "node-forge": "^1.3.1", @@ -39061,7 +39074,7 @@ "integrity": "sha512-Qe+vWsuVHFzUkdChwlmJGuQf9cA3I+QOsSHULV/6qf6wsqLM2/32svNRH+rbBIMwiPEwzZprZlkvkqQRucYnVA==", "dev": true, "requires": { - "@lit/reactive-element": "^1.6.3", + "@lit/reactive-element": "^1.0.0", "@open-wc/dedupe-mixin": "^1.4.0" } }, @@ -39436,7 +39449,6 @@ "karma-jasmine": "^4.0.1", "karma-webpack": "^5.0.0", "koffi": "^2.9.1", - "lit": "^3.0.0", "minimist": "^1.2.6", "node-fetch": "^3.3.0", "node-gyp": "^10.0.1", @@ -40345,7 +40357,6 @@ "karma-chrome-launcher": "^3.1.0", "karma-jasmine": "^5.1.0", "karma-webpack": "^5.0.0", - "lit": "^3.0.0", "minimist": "^1.2.8", "node-fetch": "^3.3.2", "node-forge": "^1.3.1", @@ -54789,11 +54800,19 @@ "resolved": "https://registry.npmjs.org/lit/-/lit-3.2.1.tgz", "integrity": "sha512-1BBa1E/z0O9ye5fZprPtdqnc0BFzxIxTTOO/tQFmyC/hj1O3jL4TfmLBw0WEwjAokdLwpclkvGgDJwTIh0/22w==", "requires": { - "@lit/reactive-element": "^1.6.3", + "@lit/reactive-element": "^2.0.4", "lit-element": "^4.1.0", "lit-html": "^3.2.0" }, "dependencies": { + "@lit/reactive-element": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@lit/reactive-element/-/reactive-element-2.0.4.tgz", + "integrity": "sha512-GFn91inaUa2oHLak8awSIigYz0cU0Payr1rcFsrkf5OJ5eSPxElyZfKh0f2p9FsTiZWXQdWGJeXZICEfXXYSXQ==", + "requires": { + "@lit-labs/ssr-dom-shim": "^1.2.0" + } + }, "lit-html": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-3.2.1.tgz", @@ -54810,10 +54829,18 @@ "integrity": "sha512-HO9Tkkh34QkTeUmEdNYhMT8hzLid7YlMlATSi1q4q17HE5d9mrrEHJ/o8O2D0cMi182zK1F3v7x0PWFjrhXFew==", "requires": { "@lit-labs/ssr-dom-shim": "^1.2.0", - "@lit/reactive-element": "^1.6.3", + "@lit/reactive-element": "^2.0.4", "lit-html": "^3.2.0" }, "dependencies": { + "@lit/reactive-element": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@lit/reactive-element/-/reactive-element-2.0.4.tgz", + "integrity": "sha512-GFn91inaUa2oHLak8awSIigYz0cU0Payr1rcFsrkf5OJ5eSPxElyZfKh0f2p9FsTiZWXQdWGJeXZICEfXXYSXQ==", + "requires": { + "@lit-labs/ssr-dom-shim": "^1.2.0" + } + }, "lit-html": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-3.2.1.tgz", diff --git a/package.json b/package.json index 2ab3ae16bd..317cebdf6f 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,6 @@ "client" ], "devDependencies": { - "@lit/reactive-element": "^1.6.3", "@storybook/addon-essentials": "^8.2.6", "@storybook/addon-links": "^8.2.6", "@storybook/blocks": "^8.2.6", @@ -45,8 +44,5 @@ "node-fetch": "^2.6.7", "storybook": "^8.2.6", "typescript": "^5.4.5" - }, - "overrides": { - "@lit/reactive-element": "$@lit/reactive-element" } } diff --git a/server_manager/base.webpack.js b/server_manager/base.webpack.js index 50ce232ce7..6c8d96bc08 100644 --- a/server_manager/base.webpack.js +++ b/server_manager/base.webpack.js @@ -76,6 +76,10 @@ exports.makeConfig = options => { lit: path.resolve(__dirname, '../node_modules/lit'), 'lit/*': path.resolve(__dirname, '../node_modules/lit/*'), 'lit-html': path.resolve(__dirname, '../node_modules/lit-html'), + '@lit/reactive-element': path.resolve( + __dirname, + '../node_modules/@lit/reactive-element' + ), }, }, plugins: [