Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"@canonical/cookie-policy": "3.6.5",
"@canonical/global-nav": "3.8.0",
"@canonical/react-components": "3.6.0",
"@canonical/store-components": "0.54.2",
"@canonical/store-components": "0.55.0",
"@dnd-kit/core": "6.3.1",
"@dnd-kit/sortable": "8.0.0",
"@dnd-kit/utilities": "3.2.2",
Expand Down
13 changes: 11 additions & 2 deletions vite.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const flaskViteImportPlugin = () => ({
const viteImports =
execSync(
// TODO: do it in Node to make it truly portable`
`grep -rnoh --include '*.html' -e 'vite_import\\((.*)\\)'`
`grep -rnoh --include '*.html' -e 'vite_import\\((.*)\\)'`,
).toString() || ""; // big multi-line string wit the format
// `vite_import(<filename>)`

Expand All @@ -37,7 +37,7 @@ const flaskViteImportPlugin = () => ({
} catch (e) {
throw new Error(
"Vite: Couldn't find any entry points for production build\n" +
e.toString()
e.toString(),
);
}

Expand Down Expand Up @@ -82,6 +82,15 @@ export default defineConfig({
define: {
global: "globalThis", // in dev mode "randomstring" uses `global` rather than `globalThis`
},
resolve: {
alias: [
// by default react-components exports a CJS module that can't be tree-shaken, we consume the ESM instead
{
find: /^@canonical\/react-components$/,
replacement: "@canonical/react-components/dist/esm",
},
],
},
build: {
manifest: true,
modulePreload: false,
Expand Down
62 changes: 5 additions & 57 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -954,23 +954,6 @@
dependencies:
vanilla-framework "4.35.0"

"@canonical/react-components@1.9.0":
version "1.9.0"
resolved "https://registry.yarnpkg.com/@canonical/react-components/-/react-components-1.9.0.tgz#9337b35e632d7419eddf51823a5243156893185e"
integrity sha512-CB2xHvGs/KFsCAbh79pSsJfg+j5Pxmye1qXCeAoirTWj1WIwRiDVV32R07Xys/bAafzINy6kStqJHkq8XUld/g==
dependencies:
"@types/jest" "29.5.12"
"@types/node" "20.16.3"
"@types/react" "18.3.5"
"@types/react-dom" "18.3.0"
"@types/react-table" "7.7.20"
classnames "2.5.1"
jest-environment-jsdom "29.7.0"
lodash.isequal "4.5.0"
prop-types "15.8.1"
react-table "7.8.0"
react-useportal "1.0.19"

"@canonical/react-components@3.6.0":
version "3.6.0"
resolved "https://registry.yarnpkg.com/@canonical/react-components/-/react-components-3.6.0.tgz#59a1c48ad6c0d4425e1a7a0f96b7d3e5d592b1bd"
Expand All @@ -987,12 +970,12 @@
prop-types "15.8.1"
react-table "7.8.0"

"@canonical/store-components@0.54.2":
version "0.54.2"
resolved "https://registry.yarnpkg.com/@canonical/store-components/-/store-components-0.54.2.tgz#d281835da2519530dda2b0b4faeaa6d10dac86ce"
integrity sha512-FzKAHNk1d0knvICPpOcis0fGnDU3ozJ4Fnx+X6iXX5K82ZKXB5bCYlcOPwKFmuSpbvjGkpM08WS2xBqHLgn1bw==
"@canonical/store-components@0.55.0":
version "0.55.0"
resolved "https://registry.yarnpkg.com/@canonical/store-components/-/store-components-0.55.0.tgz#4ca8d7813f1c61a687ae9e8242557a9d0fa82c63"
integrity sha512-h5BJcBJ/13zzd86QspTdpX8FOdCh/lzoW3EZLjTt/eyj7DRKaDMbjIjHtkK6K6D/CvBTkKfQgwwUIyhTjkXvPA==
dependencies:
"@canonical/react-components" "1.9.0"
"@canonical/react-components" "3.6.0"
"@types/jest" "27.5.2"
"@types/node" "18.19.71"
"@types/react" "17.0.83"
Expand Down Expand Up @@ -2487,14 +2470,6 @@
jest-matcher-utils "^27.0.0"
pretty-format "^27.0.0"

"@types/jest@29.5.12":
version "29.5.12"
resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.5.12.tgz#7f7dc6eb4cf246d2474ed78744b05d06ce025544"
integrity sha512-eDC8bTvT/QhYdxJAulQikueigY5AsdBRH2yDKW3yveW7svY3+DzN84/2NUgkw10RTiJbWqZrTtoGVdYlvFJdLw==
dependencies:
expect "^29.0.0"
pretty-format "^29.0.0"

"@types/jest@29.5.14":
version "29.5.14"
resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.5.14.tgz#2b910912fa1d6856cadcd0c1f95af7df1d6049e5"
Expand Down Expand Up @@ -2531,13 +2506,6 @@
dependencies:
undici-types "~5.26.4"

"@types/node@20.16.3":
version "20.16.3"
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.16.3.tgz#7b4f9a37091cf03a0c2561bf76a9a55f03f4f523"
integrity sha512-/wdGiWRkMOm53gAsSyFMXFZHbVg7C6CbkrzHNpaHoYfsUWPg7m6ZRKtvQjgvQ9i8WT540a3ydRlRQbxjY30XxQ==
dependencies:
undici-types "~6.19.2"

"@types/node@20.17.19":
version "20.17.19"
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.17.19.tgz#0f2869555719bef266ca6e1827fcdca903c1a697"
Expand All @@ -2560,13 +2528,6 @@
resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.26.tgz#fa7891ba70fd39ddbaa7e85b6ff9175bb546bc1b"
integrity sha512-Z+2VcYXJwOqQ79HreLU/1fyQ88eXSSFh6I3JdrEHQIfYSI0kCQpTGvOrbE6jFGGYXKsHuwY9tBa/w5Uo6KzrEg==

"@types/react-dom@18.3.0":
version "18.3.0"
resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.3.0.tgz#0cbc818755d87066ab6ca74fbedb2547d74a82b0"
integrity sha512-EhwApuTmMBmXuFOikhQLIBUn6uFg81SwLMOAUgodJF14SOBOCMdU04gDoYi0WOJJHD144TL32z4yDqCW3dnkQg==
dependencies:
"@types/react" "*"

"@types/react-dom@19.0.4":
version "19.0.4"
resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-19.0.4.tgz#bedba97f9346bd4c0fe5d39e689713804ec9ac89"
Expand Down Expand Up @@ -2610,14 +2571,6 @@
"@types/scheduler" "^0.16"
csstype "^3.0.2"

"@types/react@18.3.5":
version "18.3.5"
resolved "https://registry.yarnpkg.com/@types/react/-/react-18.3.5.tgz#5f524c2ad2089c0ff372bbdabc77ca2c4dbadf8f"
integrity sha512-WeqMfGJLGuLCqHGYRGHxnKrXcTitc6L/nBUWfWPcTarG3t9PsquqUMuVeXZeca+mglY4Vo5GZjCi0A3Or2lnxA==
dependencies:
"@types/prop-types" "*"
csstype "^3.0.2"

"@types/react@19.0.10":
version "19.0.10"
resolved "https://registry.yarnpkg.com/@types/react/-/react-19.0.10.tgz#d0c66dafd862474190fe95ce11a68de69ed2b0eb"
Expand Down Expand Up @@ -6075,11 +6028,6 @@ lodash.debounce@^4.0.8:
resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==

lodash.isequal@4.5.0:
version "4.5.0"
resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
integrity sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==

lodash.isplainobject@^4.0.6:
version "4.0.6"
resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
Expand Down
Loading