From 86b6464cbdb6e90079a937c022c95ffce64c29d9 Mon Sep 17 00:00:00 2001 From: neverland Date: Tue, 14 May 2024 15:15:40 +0800 Subject: [PATCH] chore: set package type to module (#2334) --- packages/plugin-assets-retry/modern.config.ts | 2 +- packages/plugin-assets-retry/package.json | 8 ++++---- packages/plugin-babel/package.json | 8 ++++---- packages/plugin-basic-ssl/modern.config.ts | 2 +- packages/plugin-basic-ssl/package.json | 8 ++++---- packages/plugin-check-syntax/package.json | 8 ++++---- packages/plugin-css-minimizer/package.json | 8 ++++---- packages/plugin-eslint/modern.config.ts | 2 +- packages/plugin-eslint/package.json | 8 ++++---- packages/plugin-image-compress/package.json | 8 ++++---- packages/plugin-lightningcss/modern.config.ts | 2 +- packages/plugin-lightningcss/package.json | 8 ++++---- packages/plugin-lightningcss/src/plugin.ts | 2 +- .../tests/__snapshots__/index.test.ts.snap | 18 ++++++++--------- packages/plugin-mdx/modern.config.ts | 2 +- packages/plugin-mdx/package.json | 8 ++++---- packages/plugin-node-polyfill/package.json | 8 ++++---- packages/plugin-preact/package.json | 8 ++++---- packages/plugin-pug/modern.config.ts | 2 +- packages/plugin-pug/package.json | 8 ++++---- packages/plugin-react/package.json | 8 ++++---- packages/plugin-rem/modern.config.ts | 2 +- packages/plugin-rem/package.json | 8 ++++---- packages/plugin-solid/package.json | 8 ++++---- packages/plugin-source-build/package.json | 8 ++++---- .../plugin-styled-components/package.json | 8 ++++---- packages/plugin-stylus/modern.config.ts | 2 +- packages/plugin-stylus/package.json | 8 ++++---- packages/plugin-svelte/package.json | 8 ++++---- packages/plugin-svgr/modern.config.ts | 2 +- packages/plugin-svgr/package.json | 8 ++++---- packages/plugin-svgr/src/index.ts | 6 +++--- .../tests/__snapshots__/index.test.ts.snap | 20 +++++++++---------- packages/plugin-toml/modern.config.ts | 2 +- packages/plugin-toml/package.json | 8 ++++---- packages/plugin-type-check/package.json | 8 ++++---- packages/plugin-umd/modern.config.ts | 2 +- packages/plugin-umd/package.json | 8 ++++---- packages/plugin-vue-jsx/package.json | 8 ++++---- packages/plugin-vue/package.json | 8 ++++---- packages/plugin-vue2-jsx/package.json | 8 ++++---- packages/plugin-vue2/package.json | 8 ++++---- packages/plugin-yaml/modern.config.ts | 2 +- packages/plugin-yaml/package.json | 8 ++++---- packages/shared/package.json | 8 ++++---- 45 files changed, 151 insertions(+), 151 deletions(-) diff --git a/packages/plugin-assets-retry/modern.config.ts b/packages/plugin-assets-retry/modern.config.ts index 68cfd3e5a2..6c5403b739 100644 --- a/packages/plugin-assets-retry/modern.config.ts +++ b/packages/plugin-assets-retry/modern.config.ts @@ -1,4 +1,4 @@ -import moduleTools from '@modern-js/module-tools'; +import { moduleTools } from '@modern-js/module-tools'; import { buildConfigWithMjs } from '../../scripts/modern.base.config'; export default { diff --git a/packages/plugin-assets-retry/package.json b/packages/plugin-assets-retry/package.json index 4653152f43..0fabcb86a1 100644 --- a/packages/plugin-assets-retry/package.json +++ b/packages/plugin-assets-retry/package.json @@ -9,15 +9,15 @@ "directory": "packages/plugin-assets-retry" }, "license": "MIT", - "type": "commonjs", + "type": "module", "exports": { ".": { "types": "./dist/index.d.ts", - "import": "./dist/index.mjs", - "default": "./dist/index.js" + "import": "./dist/index.js", + "require": "./dist/index.cjs" } }, - "main": "./dist/index.js", + "main": "./dist/index.cjs", "types": "./dist/index.d.ts", "files": [ "dist" diff --git a/packages/plugin-babel/package.json b/packages/plugin-babel/package.json index 1afd576095..3d5d613d69 100644 --- a/packages/plugin-babel/package.json +++ b/packages/plugin-babel/package.json @@ -8,15 +8,15 @@ "directory": "packages/plugin-babel" }, "license": "MIT", - "type": "commonjs", + "type": "module", "exports": { ".": { "types": "./dist/index.d.ts", - "import": "./dist/index.mjs", - "default": "./dist/index.js" + "import": "./dist/index.js", + "require": "./dist/index.cjs" } }, - "main": "./dist/index.js", + "main": "./dist/index.cjs", "types": "./dist/index.d.ts", "files": [ "dist", diff --git a/packages/plugin-basic-ssl/modern.config.ts b/packages/plugin-basic-ssl/modern.config.ts index 68cfd3e5a2..6c5403b739 100644 --- a/packages/plugin-basic-ssl/modern.config.ts +++ b/packages/plugin-basic-ssl/modern.config.ts @@ -1,4 +1,4 @@ -import moduleTools from '@modern-js/module-tools'; +import { moduleTools } from '@modern-js/module-tools'; import { buildConfigWithMjs } from '../../scripts/modern.base.config'; export default { diff --git a/packages/plugin-basic-ssl/package.json b/packages/plugin-basic-ssl/package.json index 8212b0fae7..7ab4cc781a 100644 --- a/packages/plugin-basic-ssl/package.json +++ b/packages/plugin-basic-ssl/package.json @@ -9,15 +9,15 @@ "directory": "packages/plugin-basic-ssl" }, "license": "MIT", - "type": "commonjs", + "type": "module", "exports": { ".": { "types": "./dist/index.d.ts", - "import": "./dist/index.mjs", - "default": "./dist/index.js" + "import": "./dist/index.js", + "require": "./dist/index.cjs" } }, - "main": "./dist/index.js", + "main": "./dist/index.cjs", "types": "./dist/index.d.ts", "files": [ "dist" diff --git a/packages/plugin-check-syntax/package.json b/packages/plugin-check-syntax/package.json index 2fb95284a4..2082629d61 100644 --- a/packages/plugin-check-syntax/package.json +++ b/packages/plugin-check-syntax/package.json @@ -9,15 +9,15 @@ "directory": "packages/plugin-check-syntax" }, "license": "MIT", - "type": "commonjs", + "type": "module", "exports": { ".": { "types": "./dist/index.d.ts", - "import": "./dist/index.mjs", - "default": "./dist/index.js" + "import": "./dist/index.js", + "require": "./dist/index.cjs" } }, - "main": "./dist/index.js", + "main": "./dist/index.cjs", "types": "./dist/index.d.ts", "files": [ "dist" diff --git a/packages/plugin-css-minimizer/package.json b/packages/plugin-css-minimizer/package.json index 317af21c6b..40d6aff7f3 100644 --- a/packages/plugin-css-minimizer/package.json +++ b/packages/plugin-css-minimizer/package.json @@ -8,15 +8,15 @@ "directory": "packages/plugin-css-minimizer" }, "license": "MIT", - "type": "commonjs", + "type": "module", "exports": { ".": { "types": "./dist/index.d.ts", - "import": "./dist/index.mjs", - "default": "./dist/index.js" + "import": "./dist/index.js", + "require": "./dist/index.cjs" } }, - "main": "./dist/index.js", + "main": "./dist/index.cjs", "types": "./dist/index.d.ts", "files": [ "dist" diff --git a/packages/plugin-eslint/modern.config.ts b/packages/plugin-eslint/modern.config.ts index 68cfd3e5a2..6c5403b739 100644 --- a/packages/plugin-eslint/modern.config.ts +++ b/packages/plugin-eslint/modern.config.ts @@ -1,4 +1,4 @@ -import moduleTools from '@modern-js/module-tools'; +import { moduleTools } from '@modern-js/module-tools'; import { buildConfigWithMjs } from '../../scripts/modern.base.config'; export default { diff --git a/packages/plugin-eslint/package.json b/packages/plugin-eslint/package.json index 54b4ff2d67..317e00cf9f 100644 --- a/packages/plugin-eslint/package.json +++ b/packages/plugin-eslint/package.json @@ -9,15 +9,15 @@ "directory": "packages/plugin-eslint" }, "license": "MIT", - "type": "commonjs", + "type": "module", "exports": { ".": { "types": "./dist/index.d.ts", - "import": "./dist/index.mjs", - "default": "./dist/index.js" + "import": "./dist/index.js", + "require": "./dist/index.cjs" } }, - "main": "./dist/index.js", + "main": "./dist/index.cjs", "types": "./dist/index.d.ts", "files": [ "dist" diff --git a/packages/plugin-image-compress/package.json b/packages/plugin-image-compress/package.json index 5f1d990def..ad44063c75 100644 --- a/packages/plugin-image-compress/package.json +++ b/packages/plugin-image-compress/package.json @@ -9,15 +9,15 @@ "directory": "packages/plugin-image-compress" }, "license": "MIT", - "type": "commonjs", + "type": "module", "exports": { ".": { "types": "./dist/index.d.ts", - "import": "./dist/index.mjs", - "default": "./dist/index.js" + "import": "./dist/index.js", + "require": "./dist/index.cjs" } }, - "main": "./dist/index.js", + "main": "./dist/index.cjs", "types": "./dist/index.d.ts", "files": [ "dist" diff --git a/packages/plugin-lightningcss/modern.config.ts b/packages/plugin-lightningcss/modern.config.ts index 2f45b1e25f..89c9198934 100644 --- a/packages/plugin-lightningcss/modern.config.ts +++ b/packages/plugin-lightningcss/modern.config.ts @@ -1,4 +1,4 @@ -import moduleTools from '@modern-js/module-tools'; +import { moduleTools } from '@modern-js/module-tools'; import { buildConfigWithMjs } from '../../scripts/modern.base.config'; export default { diff --git a/packages/plugin-lightningcss/package.json b/packages/plugin-lightningcss/package.json index 5291119e3f..e26e5c4888 100644 --- a/packages/plugin-lightningcss/package.json +++ b/packages/plugin-lightningcss/package.json @@ -8,15 +8,15 @@ "directory": "packages/plugin-lightningcss" }, "license": "MIT", - "type": "commonjs", + "type": "module", "exports": { ".": { "types": "./dist/index.d.ts", - "import": "./dist/index.mjs", - "default": "./dist/index.js" + "import": "./dist/index.js", + "require": "./dist/index.cjs" } }, - "main": "./dist/index.js", + "main": "./dist/index.cjs", "types": "./dist/index.d.ts", "files": [ "dist" diff --git a/packages/plugin-lightningcss/src/plugin.ts b/packages/plugin-lightningcss/src/plugin.ts index df8b6cad7d..facc6225fa 100644 --- a/packages/plugin-lightningcss/src/plugin.ts +++ b/packages/plugin-lightningcss/src/plugin.ts @@ -101,7 +101,7 @@ const applyLightningCSSLoader = ({ const rule = chain.module.rule(ruleId); const use = rule.use(CHAIN_ID.USE.LIGHTNINGCSS); - use.loader(path.resolve(__dirname, './loader')).options(mergedOptions); + use.loader(path.resolve(__dirname, './loader.cjs')).options(mergedOptions); switch (ruleId) { case CHAIN_ID.RULE.SASS: diff --git a/packages/plugin-lightningcss/tests/__snapshots__/index.test.ts.snap b/packages/plugin-lightningcss/tests/__snapshots__/index.test.ts.snap index d6619845cb..56332db4da 100644 --- a/packages/plugin-lightningcss/tests/__snapshots__/index.test.ts.snap +++ b/packages/plugin-lightningcss/tests/__snapshots__/index.test.ts.snap @@ -28,7 +28,7 @@ exports[`plugins/lightningcss > plugin-lightningcss should be configurable by us }, }, { - "loader": "/packages/plugin-lightningcss/src/loader", + "loader": "/packages/plugin-lightningcss/src/loader.cjs", "options": { "cssModules": { "dashedIdents": true, @@ -76,7 +76,7 @@ exports[`plugins/lightningcss > plugin-lightningcss should be configurable by us }, }, { - "loader": "/packages/plugin-lightningcss/src/loader", + "loader": "/packages/plugin-lightningcss/src/loader.cjs", "options": { "cssModules": { "dashedIdents": true, @@ -137,7 +137,7 @@ exports[`plugins/lightningcss > plugin-lightningcss should be configurable by us }, }, { - "loader": "/packages/plugin-lightningcss/src/loader", + "loader": "/packages/plugin-lightningcss/src/loader.cjs", "options": { "cssModules": { "dashedIdents": true, @@ -246,7 +246,7 @@ exports[`plugins/lightningcss > plugin-lightningcss should be configurable by us }, }, { - "loader": "/packages/plugin-lightningcss/src/loader", + "loader": "/packages/plugin-lightningcss/src/loader.cjs", "options": { "targets": { "chrome": 5701632, @@ -282,7 +282,7 @@ exports[`plugins/lightningcss > plugin-lightningcss should be configurable by us }, }, { - "loader": "/packages/plugin-lightningcss/src/loader", + "loader": "/packages/plugin-lightningcss/src/loader.cjs", "options": { "targets": { "chrome": 5701632, @@ -331,7 +331,7 @@ exports[`plugins/lightningcss > plugin-lightningcss should be configurable by us }, }, { - "loader": "/packages/plugin-lightningcss/src/loader", + "loader": "/packages/plugin-lightningcss/src/loader.cjs", "options": { "targets": { "chrome": 5701632, @@ -422,7 +422,7 @@ exports[`plugins/lightningcss > plugin-lightningcss should replace postcss-loade }, }, { - "loader": "/packages/plugin-lightningcss/src/loader", + "loader": "/packages/plugin-lightningcss/src/loader.cjs", "options": { "targets": { "chrome": 5701632, @@ -458,7 +458,7 @@ exports[`plugins/lightningcss > plugin-lightningcss should replace postcss-loade }, }, { - "loader": "/packages/plugin-lightningcss/src/loader", + "loader": "/packages/plugin-lightningcss/src/loader.cjs", "options": { "targets": { "chrome": 5701632, @@ -507,7 +507,7 @@ exports[`plugins/lightningcss > plugin-lightningcss should replace postcss-loade }, }, { - "loader": "/packages/plugin-lightningcss/src/loader", + "loader": "/packages/plugin-lightningcss/src/loader.cjs", "options": { "targets": { "chrome": 5701632, diff --git a/packages/plugin-mdx/modern.config.ts b/packages/plugin-mdx/modern.config.ts index 68cfd3e5a2..6c5403b739 100644 --- a/packages/plugin-mdx/modern.config.ts +++ b/packages/plugin-mdx/modern.config.ts @@ -1,4 +1,4 @@ -import moduleTools from '@modern-js/module-tools'; +import { moduleTools } from '@modern-js/module-tools'; import { buildConfigWithMjs } from '../../scripts/modern.base.config'; export default { diff --git a/packages/plugin-mdx/package.json b/packages/plugin-mdx/package.json index ed0d411f67..f8793dbefd 100644 --- a/packages/plugin-mdx/package.json +++ b/packages/plugin-mdx/package.json @@ -9,15 +9,15 @@ "directory": "packages/plugin-mdx" }, "license": "MIT", - "type": "commonjs", + "type": "module", "exports": { ".": { "types": "./dist/index.d.ts", - "import": "./dist/index.mjs", - "default": "./dist/index.js" + "import": "./dist/index.js", + "require": "./dist/index.cjs" } }, - "main": "./dist/index.js", + "main": "./dist/index.cjs", "types": "./dist/index.d.ts", "files": [ "dist" diff --git a/packages/plugin-node-polyfill/package.json b/packages/plugin-node-polyfill/package.json index 1b55b662a1..65e6f0cd1e 100644 --- a/packages/plugin-node-polyfill/package.json +++ b/packages/plugin-node-polyfill/package.json @@ -9,15 +9,15 @@ "directory": "packages/plugin-node-polyfill" }, "license": "MIT", - "type": "commonjs", + "type": "module", "exports": { ".": { "types": "./dist/index.d.ts", - "import": "./dist/index.mjs", - "default": "./dist/index.js" + "import": "./dist/index.js", + "require": "./dist/index.cjs" } }, - "main": "./dist/index.js", + "main": "./dist/index.cjs", "types": "./dist/index.d.ts", "files": [ "dist" diff --git a/packages/plugin-preact/package.json b/packages/plugin-preact/package.json index cbfa22e6ad..560272fa8b 100644 --- a/packages/plugin-preact/package.json +++ b/packages/plugin-preact/package.json @@ -8,15 +8,15 @@ "directory": "packages/plugin-preact" }, "license": "MIT", - "type": "commonjs", + "type": "module", "exports": { ".": { "types": "./dist/index.d.ts", - "import": "./dist/index.mjs", - "default": "./dist/index.js" + "import": "./dist/index.js", + "require": "./dist/index.cjs" } }, - "main": "./dist/index.js", + "main": "./dist/index.cjs", "types": "./dist/index.d.ts", "files": [ "dist" diff --git a/packages/plugin-pug/modern.config.ts b/packages/plugin-pug/modern.config.ts index 68cfd3e5a2..6c5403b739 100644 --- a/packages/plugin-pug/modern.config.ts +++ b/packages/plugin-pug/modern.config.ts @@ -1,4 +1,4 @@ -import moduleTools from '@modern-js/module-tools'; +import { moduleTools } from '@modern-js/module-tools'; import { buildConfigWithMjs } from '../../scripts/modern.base.config'; export default { diff --git a/packages/plugin-pug/package.json b/packages/plugin-pug/package.json index 28ad2af75e..7931dc8253 100644 --- a/packages/plugin-pug/package.json +++ b/packages/plugin-pug/package.json @@ -9,15 +9,15 @@ "directory": "packages/plugin-pug" }, "license": "MIT", - "type": "commonjs", + "type": "module", "exports": { ".": { "types": "./dist/index.d.ts", - "import": "./dist/index.mjs", - "default": "./dist/index.js" + "import": "./dist/index.js", + "require": "./dist/index.cjs" } }, - "main": "./dist/index.js", + "main": "./dist/index.cjs", "types": "./dist/index.d.ts", "files": [ "dist" diff --git a/packages/plugin-react/package.json b/packages/plugin-react/package.json index ecfe9c4701..c293f63b62 100644 --- a/packages/plugin-react/package.json +++ b/packages/plugin-react/package.json @@ -8,15 +8,15 @@ "directory": "packages/plugin-react" }, "license": "MIT", - "type": "commonjs", + "type": "module", "exports": { ".": { "types": "./dist/index.d.ts", - "import": "./dist/index.mjs", - "default": "./dist/index.js" + "import": "./dist/index.js", + "require": "./dist/index.cjs" } }, - "main": "./dist/index.js", + "main": "./dist/index.cjs", "types": "./dist/index.d.ts", "files": [ "dist" diff --git a/packages/plugin-rem/modern.config.ts b/packages/plugin-rem/modern.config.ts index 68cfd3e5a2..6c5403b739 100644 --- a/packages/plugin-rem/modern.config.ts +++ b/packages/plugin-rem/modern.config.ts @@ -1,4 +1,4 @@ -import moduleTools from '@modern-js/module-tools'; +import { moduleTools } from '@modern-js/module-tools'; import { buildConfigWithMjs } from '../../scripts/modern.base.config'; export default { diff --git a/packages/plugin-rem/package.json b/packages/plugin-rem/package.json index 9e4cb3b6d4..431cf9cf78 100644 --- a/packages/plugin-rem/package.json +++ b/packages/plugin-rem/package.json @@ -9,15 +9,15 @@ "directory": "packages/plugin-rem" }, "license": "MIT", - "type": "commonjs", + "type": "module", "exports": { ".": { "types": "./dist/index.d.ts", - "import": "./dist/index.mjs", - "default": "./dist/index.js" + "import": "./dist/index.js", + "require": "./dist/index.cjs" } }, - "main": "./dist/index.js", + "main": "./dist/index.cjs", "types": "./dist/index.d.ts", "files": [ "dist", diff --git a/packages/plugin-solid/package.json b/packages/plugin-solid/package.json index 7f0fb51716..9269cb4a75 100644 --- a/packages/plugin-solid/package.json +++ b/packages/plugin-solid/package.json @@ -9,15 +9,15 @@ "directory": "packages/plugin-solid" }, "license": "MIT", - "type": "commonjs", + "type": "module", "exports": { ".": { "types": "./dist/index.d.ts", - "import": "./dist/index.mjs", - "default": "./dist/index.js" + "import": "./dist/index.js", + "require": "./dist/index.cjs" } }, - "main": "./dist/index.js", + "main": "./dist/index.cjs", "types": "./dist/index.d.ts", "files": [ "dist" diff --git a/packages/plugin-source-build/package.json b/packages/plugin-source-build/package.json index 7ff06cf858..446415f9d6 100644 --- a/packages/plugin-source-build/package.json +++ b/packages/plugin-source-build/package.json @@ -9,15 +9,15 @@ "directory": "packages/plugin-source-build" }, "license": "MIT", - "type": "commonjs", + "type": "module", "exports": { ".": { "types": "./dist/index.d.ts", - "import": "./dist/index.mjs", - "default": "./dist/index.js" + "import": "./dist/index.js", + "require": "./dist/index.cjs" } }, - "main": "./dist/index.js", + "main": "./dist/index.cjs", "types": "./dist/index.d.ts", "files": [ "dist" diff --git a/packages/plugin-styled-components/package.json b/packages/plugin-styled-components/package.json index 32b0c147da..1616a5319d 100644 --- a/packages/plugin-styled-components/package.json +++ b/packages/plugin-styled-components/package.json @@ -8,15 +8,15 @@ "directory": "packages/plugin-styled-components" }, "license": "MIT", - "type": "commonjs", + "type": "module", "exports": { ".": { "types": "./dist/index.d.ts", - "import": "./dist/index.mjs", - "default": "./dist/index.js" + "import": "./dist/index.js", + "require": "./dist/index.cjs" } }, - "main": "./dist/index.js", + "main": "./dist/index.cjs", "types": "./dist/index.d.ts", "files": [ "dist" diff --git a/packages/plugin-stylus/modern.config.ts b/packages/plugin-stylus/modern.config.ts index 429305ec29..bbd8295c4b 100644 --- a/packages/plugin-stylus/modern.config.ts +++ b/packages/plugin-stylus/modern.config.ts @@ -1,4 +1,4 @@ -import moduleTools from '@modern-js/module-tools'; +import { moduleTools } from '@modern-js/module-tools'; import { buildConfigWithMjs } from '../../scripts/modern.base.config'; export default { diff --git a/packages/plugin-stylus/package.json b/packages/plugin-stylus/package.json index 1bab48e1ae..5f9ef8f63f 100644 --- a/packages/plugin-stylus/package.json +++ b/packages/plugin-stylus/package.json @@ -9,15 +9,15 @@ "directory": "packages/plugin-stylus" }, "license": "MIT", - "type": "commonjs", + "type": "module", "exports": { ".": { "types": "./dist/index.d.ts", - "import": "./dist/index.mjs", - "default": "./dist/index.js" + "import": "./dist/index.js", + "require": "./dist/index.cjs" } }, - "main": "./dist/index.js", + "main": "./dist/index.cjs", "types": "./dist/index.d.ts", "files": [ "dist" diff --git a/packages/plugin-svelte/package.json b/packages/plugin-svelte/package.json index 4521d30cd6..8aaaed2cb8 100644 --- a/packages/plugin-svelte/package.json +++ b/packages/plugin-svelte/package.json @@ -8,15 +8,15 @@ "directory": "packages/plugin-svelte" }, "license": "MIT", - "type": "commonjs", + "type": "module", "exports": { ".": { "types": "./dist/index.d.ts", - "import": "./dist/index.mjs", - "default": "./dist/index.js" + "import": "./dist/index.js", + "require": "./dist/index.cjs" } }, - "main": "./dist/index.js", + "main": "./dist/index.cjs", "types": "./dist/index.d.ts", "files": [ "dist" diff --git a/packages/plugin-svgr/modern.config.ts b/packages/plugin-svgr/modern.config.ts index 2f45b1e25f..89c9198934 100644 --- a/packages/plugin-svgr/modern.config.ts +++ b/packages/plugin-svgr/modern.config.ts @@ -1,4 +1,4 @@ -import moduleTools from '@modern-js/module-tools'; +import { moduleTools } from '@modern-js/module-tools'; import { buildConfigWithMjs } from '../../scripts/modern.base.config'; export default { diff --git a/packages/plugin-svgr/package.json b/packages/plugin-svgr/package.json index e6be25a0ec..ca943c46d7 100644 --- a/packages/plugin-svgr/package.json +++ b/packages/plugin-svgr/package.json @@ -8,15 +8,15 @@ "directory": "packages/plugin-svgr" }, "license": "MIT", - "type": "commonjs", + "type": "module", "exports": { ".": { "types": "./dist/index.d.ts", - "import": "./dist/index.mjs", - "default": "./dist/index.js" + "import": "./dist/index.js", + "require": "./dist/index.cjs" } }, - "main": "./dist/index.js", + "main": "./dist/index.cjs", "types": "./dist/index.d.ts", "files": [ "dist", diff --git a/packages/plugin-svgr/src/index.ts b/packages/plugin-svgr/src/index.ts index 02b70c753e..82d56850fc 100644 --- a/packages/plugin-svgr/src/index.ts +++ b/packages/plugin-svgr/src/index.ts @@ -117,7 +117,7 @@ export const pluginSvgr = (options: PluginSvgrOptions = {}): RsbuildPlugin => ({ .type('javascript/auto') .resourceQuery(options.query || /react/) .use(CHAIN_ID.USE.SVGR) - .loader(path.resolve(__dirname, './loader')) + .loader(path.resolve(__dirname, './loader.cjs')) .options({ ...svgrOptions, exportType: 'default', @@ -145,7 +145,7 @@ export const pluginSvgr = (options: PluginSvgrOptions = {}): RsbuildPlugin => ({ // The issuer option ensures that SVGR will only apply if the SVG is imported from a JS file. .set('issuer', issuer) .use(CHAIN_ID.USE.SVGR) - .loader(path.resolve(__dirname, './loader')) + .loader(path.resolve(__dirname, './loader.cjs')) .options({ ...svgrOptions, exportType, @@ -159,7 +159,7 @@ export const pluginSvgr = (options: PluginSvgrOptions = {}): RsbuildPlugin => ({ if (mixedImport && exportType === 'named') { svgRule .use(CHAIN_ID.USE.URL) - .loader(path.join(__dirname, '../compiled', 'url-loader')) + .loader(path.join(__dirname, '../compiled', 'url-loader/index.js')) .options({ limit: maxSize, name: outputName, diff --git a/packages/plugin-svgr/tests/__snapshots__/index.test.ts.snap b/packages/plugin-svgr/tests/__snapshots__/index.test.ts.snap index 597f688ce1..5ff6b825a8 100644 --- a/packages/plugin-svgr/tests/__snapshots__/index.test.ts.snap +++ b/packages/plugin-svgr/tests/__snapshots__/index.test.ts.snap @@ -55,7 +55,7 @@ exports[`svgr > 'configure SVGR options' 1`] = ` }, }, { - "loader": "/packages/plugin-svgr/src/loader", + "loader": "/packages/plugin-svgr/src/loader.cjs", "options": { "exportType": "default", "svgo": true, @@ -148,7 +148,7 @@ exports[`svgr > 'exportType default / mixedImport false' 1`] = ` }, }, { - "loader": "/packages/plugin-svgr/src/loader", + "loader": "/packages/plugin-svgr/src/loader.cjs", "options": { "exportType": "default", "svgo": true, @@ -213,7 +213,7 @@ exports[`svgr > 'exportType default / mixedImport false' 1`] = ` }, }, { - "loader": "/packages/plugin-svgr/src/loader", + "loader": "/packages/plugin-svgr/src/loader.cjs", "options": { "exportType": "default", "svgo": true, @@ -305,7 +305,7 @@ exports[`svgr > 'exportType default / mixedImport true' 1`] = ` }, }, { - "loader": "/packages/plugin-svgr/src/loader", + "loader": "/packages/plugin-svgr/src/loader.cjs", "options": { "exportType": "default", "svgo": true, @@ -370,7 +370,7 @@ exports[`svgr > 'exportType default / mixedImport true' 1`] = ` }, }, { - "loader": "/packages/plugin-svgr/src/loader", + "loader": "/packages/plugin-svgr/src/loader.cjs", "options": { "exportType": "default", "svgo": true, @@ -462,7 +462,7 @@ exports[`svgr > 'exportType named / mixedImport false' 1`] = ` }, }, { - "loader": "/packages/plugin-svgr/src/loader", + "loader": "/packages/plugin-svgr/src/loader.cjs", "options": { "exportType": "default", "svgo": true, @@ -527,7 +527,7 @@ exports[`svgr > 'exportType named / mixedImport false' 1`] = ` }, }, { - "loader": "/packages/plugin-svgr/src/loader", + "loader": "/packages/plugin-svgr/src/loader.cjs", "options": { "exportType": "named", "svgo": true, @@ -619,7 +619,7 @@ exports[`svgr > 'exportType named / mixedImport true' 1`] = ` }, }, { - "loader": "/packages/plugin-svgr/src/loader", + "loader": "/packages/plugin-svgr/src/loader.cjs", "options": { "exportType": "default", "svgo": true, @@ -684,7 +684,7 @@ exports[`svgr > 'exportType named / mixedImport true' 1`] = ` }, }, { - "loader": "/packages/plugin-svgr/src/loader", + "loader": "/packages/plugin-svgr/src/loader.cjs", "options": { "exportType": "named", "svgo": true, @@ -704,7 +704,7 @@ exports[`svgr > 'exportType named / mixedImport true' 1`] = ` }, }, { - "loader": "/packages/plugin-svgr/compiled/url-loader", + "loader": "/packages/plugin-svgr/compiled/url-loader/index.js", "options": { "limit": 10000, "name": "static/svg/[name].[contenthash:8].svg", diff --git a/packages/plugin-toml/modern.config.ts b/packages/plugin-toml/modern.config.ts index 68cfd3e5a2..6c5403b739 100644 --- a/packages/plugin-toml/modern.config.ts +++ b/packages/plugin-toml/modern.config.ts @@ -1,4 +1,4 @@ -import moduleTools from '@modern-js/module-tools'; +import { moduleTools } from '@modern-js/module-tools'; import { buildConfigWithMjs } from '../../scripts/modern.base.config'; export default { diff --git a/packages/plugin-toml/package.json b/packages/plugin-toml/package.json index 3b3475847a..a162d51e5e 100644 --- a/packages/plugin-toml/package.json +++ b/packages/plugin-toml/package.json @@ -9,15 +9,15 @@ "directory": "packages/plugin-toml" }, "license": "MIT", - "type": "commonjs", + "type": "module", "exports": { ".": { "types": "./dist/index.d.ts", - "import": "./dist/index.mjs", - "default": "./dist/index.js" + "import": "./dist/index.js", + "require": "./dist/index.cjs" } }, - "main": "./dist/index.js", + "main": "./dist/index.cjs", "types": "./dist/index.d.ts", "files": [ "dist" diff --git a/packages/plugin-type-check/package.json b/packages/plugin-type-check/package.json index 54dc18996b..f4b44a0621 100644 --- a/packages/plugin-type-check/package.json +++ b/packages/plugin-type-check/package.json @@ -9,15 +9,15 @@ "directory": "packages/plugin-type-check" }, "license": "MIT", - "type": "commonjs", + "type": "module", "exports": { ".": { "types": "./dist/index.d.ts", - "import": "./dist/index.mjs", - "default": "./dist/index.js" + "import": "./dist/index.js", + "require": "./dist/index.cjs" } }, - "main": "./dist/index.js", + "main": "./dist/index.cjs", "types": "./dist/index.d.ts", "files": [ "dist" diff --git a/packages/plugin-umd/modern.config.ts b/packages/plugin-umd/modern.config.ts index 68cfd3e5a2..6c5403b739 100644 --- a/packages/plugin-umd/modern.config.ts +++ b/packages/plugin-umd/modern.config.ts @@ -1,4 +1,4 @@ -import moduleTools from '@modern-js/module-tools'; +import { moduleTools } from '@modern-js/module-tools'; import { buildConfigWithMjs } from '../../scripts/modern.base.config'; export default { diff --git a/packages/plugin-umd/package.json b/packages/plugin-umd/package.json index 923df6bf4d..38f52d1c00 100644 --- a/packages/plugin-umd/package.json +++ b/packages/plugin-umd/package.json @@ -9,15 +9,15 @@ "directory": "packages/plugin-umd" }, "license": "MIT", - "type": "commonjs", + "type": "module", "exports": { ".": { "types": "./dist/index.d.ts", - "import": "./dist/index.mjs", - "default": "./dist/index.js" + "import": "./dist/index.js", + "require": "./dist/index.cjs" } }, - "main": "./dist/index.js", + "main": "./dist/index.cjs", "types": "./dist/index.d.ts", "files": [ "dist" diff --git a/packages/plugin-vue-jsx/package.json b/packages/plugin-vue-jsx/package.json index c4699cc96f..b84b185743 100644 --- a/packages/plugin-vue-jsx/package.json +++ b/packages/plugin-vue-jsx/package.json @@ -9,15 +9,15 @@ "directory": "packages/plugin-vue-jsx" }, "license": "MIT", - "type": "commonjs", + "type": "module", "exports": { ".": { "types": "./dist/index.d.ts", - "import": "./dist/index.mjs", - "default": "./dist/index.js" + "import": "./dist/index.js", + "require": "./dist/index.cjs" } }, - "main": "./dist/index.js", + "main": "./dist/index.cjs", "types": "./dist/index.d.ts", "files": [ "dist" diff --git a/packages/plugin-vue/package.json b/packages/plugin-vue/package.json index aef9017897..cb413a15f9 100644 --- a/packages/plugin-vue/package.json +++ b/packages/plugin-vue/package.json @@ -9,15 +9,15 @@ "directory": "packages/plugin-vue" }, "license": "MIT", - "type": "commonjs", + "type": "module", "exports": { ".": { "types": "./dist/index.d.ts", - "import": "./dist/index.mjs", - "default": "./dist/index.js" + "import": "./dist/index.js", + "require": "./dist/index.cjs" } }, - "main": "./dist/index.js", + "main": "./dist/index.cjs", "types": "./dist/index.d.ts", "files": [ "dist" diff --git a/packages/plugin-vue2-jsx/package.json b/packages/plugin-vue2-jsx/package.json index 0663309dfb..f1964def19 100644 --- a/packages/plugin-vue2-jsx/package.json +++ b/packages/plugin-vue2-jsx/package.json @@ -9,15 +9,15 @@ "directory": "packages/plugin-vue2-jsx" }, "license": "MIT", - "type": "commonjs", + "type": "module", "exports": { ".": { "types": "./dist/index.d.ts", - "import": "./dist/index.mjs", - "default": "./dist/index.js" + "import": "./dist/index.js", + "require": "./dist/index.cjs" } }, - "main": "./dist/index.js", + "main": "./dist/index.cjs", "types": "./dist/index.d.ts", "files": [ "dist" diff --git a/packages/plugin-vue2/package.json b/packages/plugin-vue2/package.json index b2fcae6e51..83cf699eae 100644 --- a/packages/plugin-vue2/package.json +++ b/packages/plugin-vue2/package.json @@ -9,15 +9,15 @@ "directory": "packages/plugin-vue2" }, "license": "MIT", - "type": "commonjs", + "type": "module", "exports": { ".": { "types": "./dist/index.d.ts", - "import": "./dist/index.mjs", - "default": "./dist/index.js" + "import": "./dist/index.js", + "require": "./dist/index.cjs" } }, - "main": "./dist/index.js", + "main": "./dist/index.cjs", "types": "./dist/index.d.ts", "files": [ "dist" diff --git a/packages/plugin-yaml/modern.config.ts b/packages/plugin-yaml/modern.config.ts index 68cfd3e5a2..6c5403b739 100644 --- a/packages/plugin-yaml/modern.config.ts +++ b/packages/plugin-yaml/modern.config.ts @@ -1,4 +1,4 @@ -import moduleTools from '@modern-js/module-tools'; +import { moduleTools } from '@modern-js/module-tools'; import { buildConfigWithMjs } from '../../scripts/modern.base.config'; export default { diff --git a/packages/plugin-yaml/package.json b/packages/plugin-yaml/package.json index e698071022..a383b668ba 100644 --- a/packages/plugin-yaml/package.json +++ b/packages/plugin-yaml/package.json @@ -9,15 +9,15 @@ "directory": "packages/plugin-yaml" }, "license": "MIT", - "type": "commonjs", + "type": "module", "exports": { ".": { "types": "./dist/index.d.ts", - "import": "./dist/index.mjs", - "default": "./dist/index.js" + "import": "./dist/index.js", + "require": "./dist/index.cjs" } }, - "main": "./dist/index.js", + "main": "./dist/index.cjs", "types": "./dist/index.d.ts", "files": [ "dist", diff --git a/packages/shared/package.json b/packages/shared/package.json index 13d8b534c0..dbe4f60275 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -9,12 +9,12 @@ "directory": "packages/shared" }, "license": "MIT", - "type": "commonjs", + "type": "module", "exports": { ".": { "types": "./dist/index.d.ts", - "import": "./dist/index.mjs", - "default": "./dist/index.js" + "import": "./dist/index.js", + "require": "./dist/index.cjs" }, "./autoprefixer": { "types": "./compiled/autoprefixer/index.d.ts", @@ -105,7 +105,7 @@ "default": "./compiled/http-proxy-middleware/index.js" } }, - "main": "./dist/index.js", + "main": "./dist/index.cjs", "types": "./dist/index.d.ts", "files": [ "dist",