From 86815cf95b69ecd594cf048184aef512e6381cba Mon Sep 17 00:00:00 2001 From: jbpenrath Date: Tue, 7 Jan 2025 17:45:12 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7(react)=20migrate=20to=20vite=206?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With the new major version of vite, some path resolution did not work so we update our vite config to resolve properly paths starting by 'src'. Furthermore there were some deprecation warning about the use of cjs files as vite configuration so we use 'mts' extension for all vite config files in react package to allow vite to detect them as ES Modules. --- packages/react/.eslintrc.cjs | 4 ++-- packages/react/package.json | 4 ++-- packages/react/src/components/Forms/Select/_index.scss | 2 +- packages/react/vite.config.mts | 5 +++++ .../react/{vite.fonts.config.ts => vite.fonts.config.mts} | 0 .../react/{vite.icons.config.ts => vite.icons.config.mts} | 0 6 files changed, 10 insertions(+), 5 deletions(-) rename packages/react/{vite.fonts.config.ts => vite.fonts.config.mts} (100%) rename packages/react/{vite.icons.config.ts => vite.icons.config.mts} (100%) diff --git a/packages/react/.eslintrc.cjs b/packages/react/.eslintrc.cjs index 7dcbfa9..b31b961 100644 --- a/packages/react/.eslintrc.cjs +++ b/packages/react/.eslintrc.cjs @@ -11,8 +11,8 @@ module.exports = { { devDependencies: [ "vite.config.ts", - "vite.icons.config.ts", - "vite.fonts.config.ts", + "vite.icons.config.mts", + "vite.fonts.config.mts", "cunningham.ts", "**/*.stories.tsx", "**/*.spec.tsx", diff --git a/packages/react/package.json b/packages/react/package.json index 063274d..a1651c8 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -30,8 +30,8 @@ "build": "bash ./build", "build:watch": "yarn build && vite build --mode watch", "build:watch-polling": "yarn build && vite build --mode watch-polling", - "build-fonts": "vite build -c vite.fonts.config.ts && rm -rf dist/fonts.js && make-dir dist/sass && cp src/fonts.scss dist/sass/", - "build-icons": "vite build -c vite.icons.config.ts && rm -rf dist/icons.js && make-dir dist/sass && cp src/icons.scss dist/sass/", + "build-fonts": "vite build -c vite.fonts.config.mts && rm -rf dist/fonts.js && make-dir dist/sass && cp src/fonts.scss dist/sass/", + "build-icons": "vite build -c vite.icons.config.mts && rm -rf dist/icons.js && make-dir dist/sass && cp src/icons.scss dist/sass/", "build-theme": "cunningham -o src -g css,ts,js,scss", "preview": "vite preview", "test": "cross-env FORCE_COLOR=1 vitest run", diff --git a/packages/react/src/components/Forms/Select/_index.scss b/packages/react/src/components/Forms/Select/_index.scss index b579853..ff16efa 100644 --- a/packages/react/src/components/Forms/Select/_index.scss +++ b/packages/react/src/components/Forms/Select/_index.scss @@ -1,4 +1,4 @@ -@use 'src/utils' as *;; +@use 'src/utils' as *; .c__select { position: relative; diff --git a/packages/react/vite.config.mts b/packages/react/vite.config.mts index 734fdf5..11fd501 100644 --- a/packages/react/vite.config.mts +++ b/packages/react/vite.config.mts @@ -39,6 +39,7 @@ export default defineConfig(({ mode }) => { index: "./src/index.ts", }, formats: ["es", "cjs"], + cssFileName: 'style' }, rollupOptions: { external: ["react", "react-dom"], @@ -84,6 +85,10 @@ export default defineConfig(({ mode }) => { find: ":", replacement: resolve(__dirname, "./src"), }, + { + find: "src", + replacement: resolve(__dirname, "./src"), + } ], }, }; diff --git a/packages/react/vite.fonts.config.ts b/packages/react/vite.fonts.config.mts similarity index 100% rename from packages/react/vite.fonts.config.ts rename to packages/react/vite.fonts.config.mts diff --git a/packages/react/vite.icons.config.ts b/packages/react/vite.icons.config.mts similarity index 100% rename from packages/react/vite.icons.config.ts rename to packages/react/vite.icons.config.mts