diff --git a/.changeset/funny-pigs-travel.md b/.changeset/funny-pigs-travel.md new file mode 100644 index 000000000000..a41f6cb4cdc3 --- /dev/null +++ b/.changeset/funny-pigs-travel.md @@ -0,0 +1,7 @@ +--- +'@modern-js/utils': patch +--- + +fix(utils): using universal build config and fix compatibility issue + +fix(utils): 使用 universal 构建配置,修复兼容性问题 diff --git a/packages/server/server/src/dev-tools/dev-middleware/index.ts b/packages/server/server/src/dev-tools/dev-middleware/index.ts index d25839fbfd66..57086a26cb5f 100644 --- a/packages/server/server/src/dev-tools/dev-middleware/index.ts +++ b/packages/server/server/src/dev-tools/dev-middleware/index.ts @@ -1,3 +1,4 @@ +import { sep } from 'path'; import { Server } from 'http'; import { EventEmitter } from 'events'; import { @@ -26,7 +27,11 @@ function getHMRClientPath(client: DevServerOptions['client']) { '@modern-js/server/hmr-client', )}?${host}${path}${port}${protocol}`; - return clientEntry; + // replace cjs with esm because we want to use the es5 version + return clientEntry.replace( + `${sep}cjs${sep}dev-tools`, + `${sep}esm${sep}dev-tools`, + ); } export default class DevMiddleware extends EventEmitter { diff --git a/packages/toolkit/utils/modern.config.js b/packages/toolkit/utils/modern.config.js index b854e1bb5b7a..76a4925d90ca 100644 --- a/packages/toolkit/utils/modern.config.js +++ b/packages/toolkit/utils/modern.config.js @@ -1,12 +1,9 @@ +const { universalBuildConfig } = require('@scripts/build'); + module.exports = { - buildConfig: [ - { - buildType: 'bundleless', - format: 'cjs', - target: 'es2019', - dts: false, - outDir: './dist/cjs', - copy: { + buildConfig: universalBuildConfig.map((item, index) => { + if (index === 0) { + item.copy = { patterns: [ { from: './compiled', @@ -14,24 +11,8 @@ module.exports = { to: '../compiled', }, ], - }, - externalHelpers: true, - }, - { - buildType: 'bundleless', - format: 'esm', - target: 'es2019', - dts: false, - outDir: './dist/esm', - externalHelpers: true, - }, - { - buildType: 'bundleless', - dts: { - only: true, - }, - outDir: './dist/types', - externalHelpers: true, - }, - ], + }; + } + return item; + }), };