Skip to content

Commit

Permalink
partial cleanup, need to regen package-lock still
Browse files Browse the repository at this point in the history
  • Loading branch information
daniellacosse committed Jan 21, 2025
1 parent 6e237e4 commit c670386
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 13 deletions.
6 changes: 5 additions & 1 deletion client/src/www/webpack_base.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
43 changes: 35 additions & 8 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -45,8 +44,5 @@
"node-fetch": "^2.6.7",
"storybook": "^8.2.6",
"typescript": "^5.4.5"
},
"overrides": {
"@lit/reactive-element": "$@lit/reactive-element"
}
}
4 changes: 4 additions & 0 deletions server_manager/base.webpack.js
Original file line number Diff line number Diff line change
Expand Up @@ -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: [
Expand Down

0 comments on commit c670386

Please sign in to comment.