From dfac85976441f252948144605093e8a46d4c74a1 Mon Sep 17 00:00:00 2001 From: codecalm Date: Wed, 28 Feb 2024 01:22:32 +0100 Subject: [PATCH] mjs extension to esm modules --- .build/rollup-plugins.mjs | 11 +++++++---- packages/icons-preact/package.json | 2 +- packages/icons-react-native/package.json | 2 +- packages/icons-react/package.json | 2 +- packages/icons-solidjs/package.json | 2 +- packages/icons-vue/package.json | 2 +- packages/icons/package.json | 5 ----- 7 files changed, 12 insertions(+), 14 deletions(-) diff --git a/.build/rollup-plugins.mjs b/.build/rollup-plugins.mjs index 7d9685c05..4cb1973d6 100644 --- a/.build/rollup-plugins.mjs +++ b/.build/rollup-plugins.mjs @@ -22,8 +22,10 @@ See the LICENSE file in the root directory of this source tree.` export const getRollupConfig = (pkg, outputFileName, bundles, globals) => { return bundles - .map(({ inputs, format, minify, preserveModules, outputDir = 'dist', extension = 'js' }) => - inputs.map(input => ({ + .map(({ inputs, format, minify, preserveModules, outputDir = 'dist', extension = 'js' }) => { + console.log(format, extension) + + return inputs.map(input => ({ input, plugins: getRollupPlugins(pkg, minify), external: Object.keys(globals), @@ -32,6 +34,7 @@ export const getRollupConfig = (pkg, outputFileName, bundles, globals) => { ...(preserveModules ? { dir: `${outputDir}/${format}`, + entryFileNames: `[name].${extension}`, } : { file: `${outputDir}/${format}/${outputFileName}${minify ? '.min' : ''}.${extension}`, @@ -41,7 +44,7 @@ export const getRollupConfig = (pkg, outputFileName, bundles, globals) => { preserveModules, globals, }, - })), - ) + })) + }) .flat(); } diff --git a/packages/icons-preact/package.json b/packages/icons-preact/package.json index 04445f857..40901ee6b 100644 --- a/packages/icons-preact/package.json +++ b/packages/icons-preact/package.json @@ -20,7 +20,7 @@ "amdName": "tabler-icons-preact", "main": "dist/cjs/tabler-icons-preact.js", "main:umd": "dist/umd/tabler-icons-preact.js", - "module": "dist/esm/tabler-icons-preact.js", + "module": "dist/esm/tabler-icons-preact.mjs", "unpkg": "dist/umd/tabler-icons-preact.min.js", "typings": "dist/tabler-icons-preact.d.ts", "files": [ diff --git a/packages/icons-react-native/package.json b/packages/icons-react-native/package.json index b1bc2c8e1..7ed8e6334 100644 --- a/packages/icons-react-native/package.json +++ b/packages/icons-react-native/package.json @@ -21,7 +21,7 @@ "amdName": "tabler-icons-react-native", "main": "dist/cjs/tabler-icons-react-native.js", "main:umd": "dist/umd/tabler-icons-react-native.js", - "module": "dist/esm/tabler-icons-react-native.js", + "module": "dist/esm/tabler-icons-react-native.mjs", "unpkg": "dist/umd/tabler-icons-react-native.min.js", "typings": "dist/tabler-icons-react-native.d.ts", "react-native": "dist/esm/tabler-icons-react-native.js", diff --git a/packages/icons-react/package.json b/packages/icons-react/package.json index 10b53bc9d..dea140e55 100644 --- a/packages/icons-react/package.json +++ b/packages/icons-react/package.json @@ -20,7 +20,7 @@ "type": "module", "main": "dist/cjs/tabler-icons-react.js", "main:umd": "dist/umd/tabler-icons-react.js", - "module": "dist/esm/tabler-icons-react.js", + "module": "dist/esm/tabler-icons-react.mjs", "unpkg": "dist/umd/tabler-icons-react.min.js", "typings": "dist/tabler-icons-react.d.ts", "sideEffects": false, diff --git a/packages/icons-solidjs/package.json b/packages/icons-solidjs/package.json index e3676c118..e7c0e0d9b 100644 --- a/packages/icons-solidjs/package.json +++ b/packages/icons-solidjs/package.json @@ -19,7 +19,7 @@ }, "source": "src/tabler-icons-solidjs.ts", "main": "dist/cjs/tabler-icons-solidjs.js", - "module": "dist/esm/tabler-icons-solidjs.js", + "module": "dist/esm/tabler-icons-solidjs.mjs", "types": "dist/types/tabler-icons-solidjs.d.ts", "files": [ "dist" diff --git a/packages/icons-vue/package.json b/packages/icons-vue/package.json index eac146e1a..5403a8fe0 100644 --- a/packages/icons-vue/package.json +++ b/packages/icons-vue/package.json @@ -20,7 +20,7 @@ "amdName": "tabler-icons-vue", "main": "dist/cjs/tabler-icons-vue.js", "main:umd": "dist/umd/tabler-icons-vue.js", - "module": "dist/esm/tabler-icons-vue.js", + "module": "dist/esm/tabler-icons-vue.mjs", "unpkg": "dist/umd/tabler-icons-vue.min.js", "typings": "dist/tabler-icons-vue.d.ts", "sideEffects": false, diff --git a/packages/icons/package.json b/packages/icons/package.json index 572db0a73..cd901b975 100644 --- a/packages/icons/package.json +++ b/packages/icons/package.json @@ -8,16 +8,11 @@ "type": "git", "url": "git+https://github.com/tabler/tabler-icons.git" }, - "main": "dist/cjs/tabler-icons.js", - "main:umd": "dist/umd/tabler-icons.js", "exports": { "./*": [ "./icons/*" ] }, - "module": "dist/esm/tabler-icons.js", - "unpkg": "dist/umd/tabler-icons.min.js", - "typings": "dist/tabler-icons.d.ts", "sideEffects": false, "files": [ "icons.json",