feat(build): 各个插件转为ESM格式 (#39)

ecomfe · Jan 18, 2022 · 068090c · 068090c
1 parent 54d9ade
commit 068090c
Show file tree

Hide file tree

Showing 28 changed files with 62 additions and 49 deletions.
diff --git a/packages/babel-plugin-add-react-display-name/package.json b/packages/babel-plugin-add-react-display-name/package.json
@@ -3,11 +3,11 @@
   "version": "3.0.2",
   "license": "MIT",
   "type": "module",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "exports": {
     ".": "./dist/index.js"
   },
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
   "engines": {
     "node": ">=14.18.0"
   },

diff --git a/packages/babel-plugin-debug-react-component-file-name/package.json b/packages/babel-plugin-debug-react-component-file-name/package.json
@@ -3,12 +3,12 @@
   "version": "3.0.2",
   "license": "MIT",
   "type": "module",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "exports": {
     ".": "./dist/index.js",
     "./useComponentFile": "./dist/useComponentFile.js"
   },
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
   "engines": {
     "node": ">=14.18.0"
   },

diff --git a/packages/babel-utils/package.json b/packages/babel-utils/package.json
@@ -3,11 +3,11 @@
   "version": "3.0.2",
   "license": "MIT",
   "type": "module",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "exports": {
     ".": "./dist/index.js"
   },
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
   "engines": {
     "node": ">=14.18.0"
   },

diff --git a/packages/cli-babel/package.json b/packages/cli-babel/package.json
@@ -4,11 +4,10 @@
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "exports": {
     ".": "./dist/index.js"
   },
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
   "engines": {
     "node": ">=14.18.0"
   },

diff --git a/packages/cli-build/package.json b/packages/cli-build/package.json
@@ -4,11 +4,10 @@
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "exports": {
     ".": "./dist/index.js"
   },
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
   "engines": {
     "node": ">=14.18.0"
   },

diff --git a/packages/cli-dev/package.json b/packages/cli-dev/package.json
@@ -4,11 +4,10 @@
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "exports": {
     ".": "./dist/index.js"
   },
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
   "engines": {
     "node": ">=14.18.0"
   },

diff --git a/packages/cli-lint/package.json b/packages/cli-lint/package.json
@@ -4,11 +4,10 @@
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "exports": {
     ".": "./dist/index.js"
   },
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
   "engines": {
     "node": ">=14.18.0"
   },

diff --git a/packages/cli-play/package.json b/packages/cli-play/package.json
@@ -4,11 +4,10 @@
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "exports": {
     ".": "./dist/index.js"
   },
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
   "engines": {
     "node": ">=14.18.0"
   },

diff --git a/packages/cli-test/package.json b/packages/cli-test/package.json
@@ -4,11 +4,10 @@
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "exports": {
     ".": "./dist/index.js"
   },
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
   "engines": {
     "node": ">=14.18.0"
   },

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -3,11 +3,11 @@
   "version": "3.0.2",
   "license": "MIT",
   "type": "module",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "exports": {
     ".": "./dist/index.js"
   },
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
   "engines": {
     "node": ">=14.18.0"
   },

diff --git a/packages/config-babel/package.json b/packages/config-babel/package.json
@@ -3,12 +3,12 @@
   "version": "3.0.2",
   "license": "MIT",
   "type": "module",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "exports": {
     ".": "./dist/index.js",
     "./willBreakingInternalUseOnly": "./dist/internal.cjs"
   },
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
   "engines": {
     "node": ">=14.18.0"
   },

diff --git a/packages/config-lint/package.json b/packages/config-lint/package.json
@@ -3,13 +3,13 @@
   "version": "3.0.2",
   "license": "MIT",
   "type": "module",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "exports": {
     ".": "./dist/index.js",
     "./patch": "./config/patch.cjs",
     "./config/*": "./config/*.cjs"
   },
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
   "engines": {
     "node": ">=14.18.0"
   },

diff --git a/packages/config-webpack-dev-server/package.json b/packages/config-webpack-dev-server/package.json
@@ -3,11 +3,11 @@
   "version": "3.0.2",
   "license": "MIT",
   "type": "module",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "exports": {
     ".": "./dist/index.js"
   },
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
   "engines": {
     "node": ">=14.18.0"
   },

diff --git a/packages/config-webpack/package.json b/packages/config-webpack/package.json
@@ -3,11 +3,11 @@
   "version": "3.0.2",
   "license": "MIT",
   "type": "module",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "exports": {
     ".": "./dist/index.js"
   },
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
   "engines": {
     "node": ">=14.18.0"
   },

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -3,11 +3,11 @@
   "version": "3.0.2",
   "license": "MIT",
   "type": "commonjs",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "exports": {
     ".": "./dist/index.js"
   },
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
   "engines": {
     "node": ">=14.18.0"
   },

diff --git a/packages/plugin-qiankun/package.json b/packages/plugin-qiankun/package.json
@@ -2,9 +2,12 @@
   "name": "@reskript/plugin-qiankun",
   "version": "3.0.2",
   "license": "MIT",
-  "type": "commonjs",
+  "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
+  "exports": {
+    ".": "./dist/index.js"
+  },
   "engines": {
     "node": ">=14.18.0"
   },
@@ -30,6 +33,7 @@
     "typescript": "4.6.0-dev.20220105"
   },
   "dependencies": {
+    "@reskript/core": "3.0.2",
     "@reskript/settings": "3.0.2",
     "dedent": "^0.7.0",
     "esbuild": "^0.14.8",

diff --git a/packages/plugin-qiankun/src/htmlEntry.ts b/packages/plugin-qiankun/src/htmlEntry.ts
@@ -1,6 +1,7 @@
 import fs from 'fs/promises';
+// @ts-expect-error
 import dedent from 'dedent';
-import {Options, TemplateConfig, PlaceholderConfig} from './interface';
+import {Options, TemplateConfig, PlaceholderConfig} from './interface.js';
 
 const DEFAULT_BACKGROUND_COLOR = '#f5f5f5';
 

diff --git a/packages/plugin-qiankun/src/index.ts b/packages/plugin-qiankun/src/index.ts
@@ -1,8 +1,8 @@
 import {SettingsPlugin, BuildSettings, DevServerSettings} from '@reskript/settings';
 import {Request, Response} from 'webpack-dev-server';
-import {Options} from './interface';
-import htmlEntry from './htmlEntry';
-import runtimeEntry from './runtimeEntry';
+import {Options} from './interface.js';
+import htmlEntry from './htmlEntry.js';
+import runtimeEntry from './runtimeEntry.js';
 
 export default (appName: string, options?: Options): SettingsPlugin => {
     const finalizeBuild: BuildSettings['finalize'] = config => {

diff --git a/packages/plugin-qiankun/src/runtimeEntry.ts b/packages/plugin-qiankun/src/runtimeEntry.ts
@@ -1,5 +1,7 @@
 import {build, BuildOptions} from 'esbuild';
+// @ts-expect-error
 import dedent from 'dedent';
+import {dirFromImportMeta} from '@reskript/core';
 
 const content = (appName: string) => dedent`
     import {registerMicroApps, start} from 'qiankun';
@@ -20,7 +22,7 @@ export default async (appName: string) => {
     const options: BuildOptions = {
         stdin: {
             contents: content(appName),
-            resolveDir: __dirname,
+            resolveDir: dirFromImportMeta(import.meta.url),
         },
         bundle: true,
         format: 'iife',

diff --git a/packages/plugin-sass/package.json b/packages/plugin-sass/package.json
@@ -2,9 +2,12 @@
   "name": "@reskript/plugin-sass",
   "version": "3.0.2",
   "license": "MIT",
-  "type": "commonjs",
+  "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
+  "exports": {
+    ".": "./dist/index.js"
+  },
   "engines": {
     "node": ">=14.18.0"
   },

diff --git a/packages/plugin-sass/src/index.ts b/packages/plugin-sass/src/index.ts
@@ -2,7 +2,7 @@ import resolve from 'resolve';
 import sass from 'sass';
 import {normalizeRuleMatch} from '@reskript/core';
 import {SettingsPlugin, BuildSettings, LoaderType} from '@reskript/settings';
-import {SassLoaderOptions} from './interface';
+import {SassLoaderOptions} from './interface.js';
 
 export default (options: SassLoaderOptions = {}): SettingsPlugin => {
     const finalizeBuild: BuildSettings['finalize'] = (config, entry, internals) => {

diff --git a/packages/plugin-workspace-no-build/package.json b/packages/plugin-workspace-no-build/package.json
@@ -2,9 +2,12 @@
   "name": "@reskript/plugin-workspace-no-build",
   "version": "3.0.2",
   "license": "MIT",
-  "type": "commonjs",
+  "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
+  "exports": {
+    ".": "./dist/index.js"
+  },
   "engines": {
     "node": ">=14.18.0"
   },

diff --git a/packages/plugin-workspace-no-build/src/index.ts b/packages/plugin-workspace-no-build/src/index.ts
@@ -1,8 +1,14 @@
 import path from 'path';
 import {logger, isMonorepo, normalizeRuleMatch} from '@reskript/core';
 import {SettingsPlugin} from '@reskript/settings';
-import {Options, LocalPackageInfo} from './interface';
-import {resolveParticipant, findSiblingPackages, buildPackageInfo, buildPeerAlias, checkDependencyGraph} from './utils';
+import {Options, LocalPackageInfo} from './interface.js';
+import {
+    resolveParticipant,
+    findSiblingPackages,
+    buildPackageInfo,
+    buildPeerAlias,
+    checkDependencyGraph,
+} from './utils.js';
 
 export default (options: Options = {}): SettingsPlugin => async (settings, {cwd}) => {
     const isWorkspace = await isMonorepo(cwd);

diff --git a/packages/plugin-workspace-no-build/src/utils.ts b/packages/plugin-workspace-no-build/src/utils.ts
@@ -1,7 +1,7 @@
 import path from 'path';
 import {findMonorepoRoot, resolveMonorepoPackageDirectories, logger, readPackageConfig, pMap} from '@reskript/core';
 import {minVersion, satisfies} from 'semver';
-import {Options, LocalPackageInfo} from './interface';
+import {Options, LocalPackageInfo} from './interface.js';
 
 export const resolveParticipant = (defaults: LocalPackageInfo[], {includes, excludes}: Options) => {
     // 如果2个都没有，就用默认的

diff --git a/packages/webpack-plugin-extra-script/package.json b/packages/webpack-plugin-extra-script/package.json
@@ -3,11 +3,11 @@
   "version": "3.0.2",
   "license": "MIT",
   "type": "module",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "exports": {
     ".": "./dist/index.js"
   },
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
   "engines": {
     "node": ">=14.18.0"
   },

diff --git a/packages/webpack-plugin-interpolate-html/package.json b/packages/webpack-plugin-interpolate-html/package.json
@@ -3,11 +3,11 @@
   "version": "3.0.2",
   "license": "MIT",
   "type": "module",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "exports": {
     ".": "./dist/index.js"
   },
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
   "engines": {
     "node": ">=14.18.0"
   },

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/showcase/todo/reskript.config.ts b/showcase/todo/reskript.config.ts
@@ -1,9 +1,7 @@
 import path from 'path';
 import {configure} from '@reskript/settings';
 import ExtraScriptPlugin from '@reskript/webpack-plugin-extra-script';
-import qiankunExports from '@reskript/plugin-qiankun';
-
-const {default: qiankun} = qiankunExports as any;
+import qiankun from '@reskript/plugin-qiankun';
 
 const EXTERNAL_NONE = 'https://code.bdstatic.com/npm/none@1.0.0/dist/none.min.js';