feat(build): 支持各个loader的ESM化 (#39)

ecomfe · Feb 1, 2022 · d7451e5 · d7451e5
1 parent 341190f
commit d7451e5
Show file tree

Hide file tree

Showing 42 changed files with 959 additions and 934 deletions.
diff --git a/packages/babel-plugin-add-react-display-name/package.json b/packages/babel-plugin-add-react-display-name/package.json
@@ -27,7 +27,7 @@
     "@babel/preset-react": "^7.16.5",
     "@reskript/core": "4.0.0-beta.0",
     "@types/babel__core": "^7.1.17",
-    "@types/node": "^17.0.13",
+    "@types/node": "^17.0.14",
     "c8": "^7.10.0",
     "eslint": "^8.8.0",
     "typescript": "^4.6.0-beta",

diff --git a/packages/babel-plugin-debug-react-component-file-name/package.json b/packages/babel-plugin-debug-react-component-file-name/package.json
@@ -31,7 +31,7 @@
     "@reskript/core": "4.0.0-beta.0",
     "@types/babel__core": "^7.1.17",
     "@types/babel__traverse": "^7.14.2",
-    "@types/node": "^17.0.13",
+    "@types/node": "^17.0.14",
     "@types/react": "^17.0.38",
     "c8": "^7.10.0",
     "eslint": "^8.8.0",

diff --git a/packages/babel-utils/package.json b/packages/babel-utils/package.json
@@ -30,7 +30,7 @@
     "@types/babel__core": "^7.1.17",
     "@types/babel__traverse": "^7.14.2",
     "@types/glob": "^7.2.0",
-    "@types/node": "^17.0.13",
+    "@types/node": "^17.0.14",
     "c8": "^7.10.0",
     "eslint": "^8.8.0",
     "typescript": "^4.6.0-beta",

diff --git a/packages/cli-babel/package.json b/packages/cli-babel/package.json
@@ -25,7 +25,7 @@
   },
   "devDependencies": {
     "@types/babel__core": "^7.1.17",
-    "@types/node": "^17.0.13",
+    "@types/node": "^17.0.14",
     "eslint": "^8.8.0",
     "typescript": "^4.6.0-beta"
   },

diff --git a/packages/cli-build/package.json b/packages/cli-build/package.json
@@ -24,11 +24,11 @@
     "test": "echo 'No test in @reskript/cli-build'"
   },
   "devDependencies": {
-    "@types/node": "^17.0.13",
+    "@types/node": "^17.0.14",
     "@types/ramda": "^0.27.64",
     "eslint": "^8.8.0",
     "typescript": "^4.6.0-beta",
-    "webpack": "^5.67.0"
+    "webpack": "^5.68.0"
   },
   "dependencies": {
     "@reskript/config-webpack": "4.0.0-beta.0",

diff --git a/packages/cli-dev/package.json b/packages/cli-dev/package.json
@@ -25,10 +25,10 @@
   },
   "devDependencies": {
     "@types/express": "^4.17.13",
-    "@types/node": "^17.0.13",
+    "@types/node": "^17.0.14",
     "eslint": "^8.8.0",
     "typescript": "^4.6.0-beta",
-    "webpack": "^5.67.0"
+    "webpack": "^5.68.0"
   },
   "dependencies": {
     "@reskript/config-webpack": "4.0.0-beta.0",

diff --git a/packages/cli-lint/package.json b/packages/cli-lint/package.json
@@ -25,7 +25,7 @@
   },
   "devDependencies": {
     "@types/eslint": "^8.4.1",
-    "@types/node": "^17.0.13",
+    "@types/node": "^17.0.14",
     "@types/ramda": "^0.27.64",
     "eslint": "^8.8.0",
     "stylelint": "^14.3.0",

diff --git a/packages/cli-play/package.json b/packages/cli-play/package.json
@@ -27,21 +27,22 @@
     "@types/body-parser": "^1.19.2",
     "@types/debounce": "^1.2.1",
     "@types/dedent": "^0.7.0",
-    "@types/marked": "^4.0.1",
+    "@types/marked": "^4.0.2",
     "@types/mdast": "^3.0.10",
-    "@types/node": "^17.0.13",
+    "@types/node": "^17.0.14",
     "@types/ramda": "^0.27.64",
     "@types/react": "^17.0.38",
     "c8": "^7.10.0",
     "cpy-cli": "^3.1.1",
     "dedent": "^0.7.0",
     "eslint": "^8.8.0",
+    "loader-of-loader": "^1.0.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "typescript": "^4.6.0-beta",
     "vite": "^2.7.12",
     "vitest": "^0.2.5",
-    "webpack": "^5.67.0"
+    "webpack": "^5.68.0"
   },
   "dependencies": {
     "@monaco-editor/react": "^4.3.1",

diff --git a/packages/cli-play/src/webpack.ts b/packages/cli-play/src/webpack.ts
@@ -1,7 +1,7 @@
 import path from 'node:path';
 import webpack from 'webpack';
 import {reject, isNil} from 'ramda';
-import {dirFromImportMeta} from '@reskript/core';
+import {dirFromImportMeta, resolve} from '@reskript/core';
 import {createWebpackConfig as createBaseWebpackConfig, BuildContext} from '@reskript/config-webpack';
 import * as loaders from '@reskript/config-webpack/loaders';
 import {createWebpackDevServerPartial} from '@reskript/config-webpack-dev-server';
@@ -23,15 +23,23 @@ export const createWebpackConfig = async (target: string, cmd: PlayCommandLineAr
     const entryLoaders = [
         await loaders.babel(buildContext),
         {
-            loader: path.join(currentDirectory, 'loader'),
+            loader: await resolve('loader-of-loader'),
             options: {
-                ...buildContext.projectSettings.play,
-                componentTypeName,
-                cwd: buildContext.cwd,
-                componentModulePath: path.resolve(buildContext.cwd, target),
-                globalSetupModulePath: cmd.setup
-                    ? path.resolve(cmd.cwd, cmd.setup)
-                    : buildContext.projectSettings.play.defaultGlobalSetup,
+                resolveLoader: async () => {
+                    return {
+                        loader: path.join(currentDirectory, 'loader.js'),
+                        type: 'module',
+                        options: {
+                            ...buildContext.projectSettings.play,
+                            componentTypeName,
+                            cwd: buildContext.cwd,
+                            componentModulePath: path.resolve(buildContext.cwd, target),
+                            globalSetupModulePath: cmd.setup
+                                ? path.resolve(cmd.cwd, cmd.setup)
+                                : buildContext.projectSettings.play.defaultGlobalSetup,
+                        },
+                    };
+                },
             },
         },
     ];

diff --git a/packages/cli-test/package.json b/packages/cli-test/package.json
@@ -24,7 +24,7 @@
     "test": "echo 'No test in @reskript/cli-test'"
   },
   "devDependencies": {
-    "@types/node": "^17.0.13",
+    "@types/node": "^17.0.14",
     "@types/ramda": "^0.27.64",
     "eslint": "^8.8.0",
     "typescript": "^4.6.0-beta"

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -34,7 +34,7 @@
     "@reskript/cli-lint": "4.0.0-beta.0",
     "@reskript/cli-play": "4.0.0-beta.0",
     "@reskript/cli-test": "4.0.0-beta.0",
-    "@types/node": "^17.0.13",
+    "@types/node": "^17.0.14",
     "eslint": "^8.8.0",
     "typescript": "^4.6.0-beta"
   },

diff --git a/packages/config-babel/package.json b/packages/config-babel/package.json
@@ -29,7 +29,7 @@
     "@reskript/core": "4.0.0-beta.0",
     "@rollup/plugin-babel": "^5.3.0",
     "@types/babel__core": "^7.1.17",
-    "@types/node": "^17.0.13",
+    "@types/node": "^17.0.14",
     "c8": "^7.10.0",
     "eslint": "^8.8.0",
     "rollup": "^2.66.1",

diff --git a/packages/config-img-loader/package.json b/packages/config-img-loader/package.json
@@ -27,10 +27,10 @@
     "@types/imagemin-gifsicle": "^7.0.1",
     "@types/imagemin-mozjpeg": "^8.0.1",
     "@types/imagemin-optipng": "^5.2.1",
-    "@types/node": "^17.0.13",
+    "@types/node": "^17.0.14",
     "eslint": "^8.8.0",
     "typescript": "^4.6.0-beta",
-    "webpack": "^5.67.0"
+    "webpack": "^5.68.0"
   },
   "dependencies": {
     "@reskript/core": "4.0.0-beta.0",

diff --git a/packages/config-jest/package.json b/packages/config-jest/package.json
@@ -30,7 +30,7 @@
     "@types/enzyme": "^3.10.10",
     "@types/enzyme-adapter-react-16": "^1.0.6",
     "@types/jest": "^27.0.3",
-    "@types/node": "^17.0.13",
+    "@types/node": "^17.0.14",
     "@types/resolve": "^1.20.1",
     "eslint": "^8.8.0",
     "prettier": "^2.5.1",

diff --git a/packages/config-lint/package.json b/packages/config-lint/package.json
@@ -29,7 +29,7 @@
   "devDependencies": {
     "@babel/plugin-transform-typescript": "^7.16.7",
     "@rollup/plugin-babel": "^5.3.0",
-    "@types/node": "^17.0.13",
+    "@types/node": "^17.0.14",
     "@types/postcss-less": "^4.0.1",
     "@types/resolve": "^1.20.1",
     "eslint": "^8.8.0",
@@ -47,14 +47,14 @@
     "@reskript/core": "4.0.0-beta.0",
     "@reskript/eslint-plugin": "4.0.0-beta.0",
     "@rushstack/eslint-patch": "^1.1.0",
-    "@typescript-eslint/eslint-plugin": "^5.10.1",
-    "@typescript-eslint/parser": "^5.10.1",
+    "@typescript-eslint/eslint-plugin": "^5.10.2",
+    "@typescript-eslint/parser": "^5.10.2",
     "eslint-plugin-babel": "^5.3.1",
     "eslint-plugin-jest": "^26.0.0",
     "eslint-plugin-react": "^7.28.0",
     "eslint-plugin-react-hooks": "^4.3.0",
     "eslint-plugin-reskript": "^0.1.2",
-    "postcss": "^8.4.5",
+    "postcss": "^8.4.6",
     "postcss-less": "^6.0.0",
     "resolve": "^1.22.0"
   },

diff --git a/packages/config-webpack-dev-server/package.json b/packages/config-webpack-dev-server/package.json
@@ -25,13 +25,13 @@
   },
   "devDependencies": {
     "@types/cli-progress": "^3.9.2",
-    "@types/node": "^17.0.13",
+    "@types/node": "^17.0.14",
     "c8": "^7.10.0",
     "eslint": "^8.8.0",
     "typescript": "^4.6.0-beta",
     "vite": "^2.7.12",
     "vitest": "^0.2.5",
-    "webpack": "^5.67.0",
+    "webpack": "^5.68.0",
     "webpack-dev-server": "^4.7.1"
   },
   "dependencies": {

diff --git a/packages/config-webpack/package.json b/packages/config-webpack/package.json
@@ -29,17 +29,18 @@
     "@reskript/config-img-loader": "4.0.0-beta.0",
     "@types/cssnano": "^5.0.0",
     "@types/less": "^3.0.3",
-    "@types/node": "^17.0.13",
+    "@types/node": "^17.0.14",
     "@types/postcss-preset-env": "^6.7.3",
     "@types/tailwindcss": "^3.0.4",
     "@types/workbox-webpack-plugin": "^5.1.8",
     "c8": "^7.10.0",
     "eslint": "^8.8.0",
+    "loader-of-loader": "^1.0.1",
     "semver": "^7.3.5",
     "typescript": "^4.6.0-beta",
     "vite": "^2.7.12",
     "vitest": "^0.2.5",
-    "webpack": "^5.67.0"
+    "webpack": "^5.68.0"
   },
   "dependencies": {
     "@babel/core": "^7.16.12",
@@ -69,9 +70,9 @@
     "less-plugin-functions": "^1.0.0",
     "less-plugin-npm-import": "^2.1.0",
     "mini-css-extract-plugin": "^2.5.3",
-    "postcss": "^8.4.5",
+    "postcss": "^8.4.6",
     "postcss-loader": "^6.2.1",
-    "postcss-preset-env": "^7.1.0",
+    "postcss-preset-env": "^7.3.0",
     "ramda": "^0.28.0",
     "regenerator-runtime": "^0.13.9",
     "resolve-typescript-plugin": "^1.1.3",

diff --git a/packages/config-webpack/src/loaders/lessSafe.ts b/packages/config-webpack/src/loaders/lessSafe.ts
@@ -3,7 +3,15 @@ import {LoaderFactory} from '../interface.js';
 
 const factory: LoaderFactory = async () => {
     return {
-        loader: await resolve('@reskript/less-safe-loader'),
+        loader: await resolve('loader-of-loader'),
+        options: {
+            resolveLoader: async () => {
+                return {
+                    loader: await resolve('@reskript/less-safe-loader'),
+                    type: 'module',
+                };
+            },
+        },
     };
 };
 

diff --git a/packages/config-webpack/src/loaders/svgToComponent.ts b/packages/config-webpack/src/loaders/svgToComponent.ts
@@ -5,9 +5,17 @@ const factory: LoaderFactory = async entry => {
     const {mode, projectSettings: {build: {script: {displayName}}}} = entry;
 
     return {
-        loader: await resolve('@reskript/svg-to-component-loader'),
+        loader: await resolve('loader-of-loader'),
         options: {
-            displayName: displayName === 'auto' ? mode === 'development' : displayName,
+            resolveLoader: async () => {
+                return {
+                    loader: await resolve('@reskript/svg-to-component-loader'),
+                    type: 'module',
+                    options: {
+                        displayName: displayName === 'auto' ? mode === 'development' : displayName,
+                    },
+                };
+            },
         },
     };
 };

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -30,7 +30,7 @@
     "@rollup/plugin-babel": "^5.3.0",
     "@types/caller": "^1.0.0",
     "@types/dedent": "^0.7.0",
-    "@types/node": "^17.0.13",
+    "@types/node": "^17.0.14",
     "@types/ramda": "^0.27.64",
     "@types/resolve": "^1.20.1",
     "@types/unixify": "^1.0.0",
@@ -45,9 +45,9 @@
     "bundle-require": "^3.0.4",
     "caller": "^1.0.1",
     "dedent": "^0.7.0",
-    "dotenv": "^14.3.2",
+    "dotenv": "^15.0.0",
     "dotenv-expand": "^6.0.1",
-    "esbuild": "^0.14.14",
+    "esbuild": "^0.14.16",
     "find-up": "^6.2.0",
     "g-status": "^2.0.2",
     "globby": "^13.1.0",

diff --git a/packages/doctor/package.json b/packages/doctor/package.json
@@ -22,7 +22,7 @@
     "test": "echo 'No test in @reskript/doctor'"
   },
   "devDependencies": {
-    "@types/node": "^17.0.13",
+    "@types/node": "^17.0.14",
     "@types/semver": "^7.3.9",
     "eslint": "^8.8.0",
     "typescript": "^4.6.0-beta"

diff --git a/packages/init/package.json b/packages/init/package.json
@@ -24,7 +24,7 @@
   },
   "devDependencies": {
     "@types/inquirer": "^8.2.0",
-    "@types/node": "^17.0.13",
+    "@types/node": "^17.0.14",
     "eslint": "^8.8.0",
     "typescript": "^4.6.0-beta"
   },

diff --git a/packages/less-safe-loader/jest.config.js b/packages/less-safe-loader/jest.config.js
diff --git a/packages/less-safe-loader/package.json b/packages/less-safe-loader/package.json
@@ -2,7 +2,7 @@
   "name": "@reskript/less-safe-loader",
   "version": "4.0.0-beta.0",
   "license": "MIT",
-  "type": "commonjs",
+  "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "exports": {
@@ -21,14 +21,14 @@
     "clean": "rm -rf dist",
     "build": "tsc -p tsconfig.build.json",
     "lint": "eslint --max-warnings=0 src",
-    "test": "jest"
+    "test": "vitest run"
   },
   "devDependencies": {
-    "@types/jest": "^27.0.3",
-    "@types/node": "^17.0.13",
+    "@types/node": "^17.0.14",
+    "c8": "^7.10.0",
     "eslint": "^8.8.0",
-    "jest": "^27.4.5",
-    "ts-jest": "^27.1.3",
-    "typescript": "^4.6.0-beta"
+    "typescript": "^4.6.0-beta",
+    "vite": "^2.7.12",
+    "vitest": "^0.2.5"
   }
 }
diff --git a/packages/less-safe-loader/src/__tests__/index.test.ts b/packages/less-safe-loader/src/__tests__/index.test.ts
@@ -1,4 +1,5 @@
-import loader from '../index';
+import {describe, test, expect} from 'vitest';
+import loader from '../index.js';
 
 describe('loader', () => {
     test('is a loader function', () => {

diff --git a/packages/less-safe-loader/src/__tests__/replace.test.ts b/packages/less-safe-loader/src/__tests__/replace.test.ts
@@ -1,4 +1,5 @@
-import replace from '../replace';
+import {describe, test, expect} from 'vitest';
+import replace from '../replace.js';
 
 describe('replace', () => {
     test('safe calc double quote', () => {

diff --git a/packages/less-safe-loader/src/index.ts b/packages/less-safe-loader/src/index.ts
@@ -1,4 +1,4 @@
-import replace from './replace';
+import replace from './replace.js';
 
 export default function lessSafeLoader(this: any, source: string) {
     this.cacheable();