refactor: 全部依赖更新至ESM最新版 (#39)

package.json

@@ -24,8 +24,8 @@
     "prepare": "husky install"
   },
   "devDependencies": {
-    "@commitlint/cli": "^15.0.0",
-    "@commitlint/config-conventional": "^15.0.0",
+    "@commitlint/cli": "^16.0.2",
+    "@commitlint/config-conventional": "^16.0.0",
     "cpy": "^8.1.2",
     "husky": "^7.0.4",
     "lerna": "^4.0.0",

packages/babel-plugin-add-react-display-name/package.json

@@ -30,10 +30,10 @@
     "@types/babel__traverse": "^7.14.2",
     "@types/node": "^17.0.4",
     "c8": "^7.10.0",
-    "eslint": "^8.6.0",
-    "typescript": "4.6.0-dev.20220105",
-    "vite": "^2.7.7",
-    "vitest": "^0.0.115"
+    "eslint": "^8.7.0",
+    "typescript": "4.6.0-dev.20220114",
+    "vite": "^2.7.12",
+    "vitest": "^0.1.17"
   },
   "dependencies": {
     "@babel/core": "^7.16.5",

packages/babel-plugin-debug-react-component-file-name/package.json

@@ -34,11 +34,11 @@
     "@types/node": "^17.0.4",
     "@types/react": "^17.0.38",
     "c8": "^7.10.0",
-    "eslint": "^8.6.0",
+    "eslint": "^8.7.0",
     "react": "^17.0.2",
-    "typescript": "4.6.0-dev.20220105",
-    "vite": "^2.7.7",
-    "vitest": "^0.0.115"
+    "typescript": "4.6.0-dev.20220114",
+    "vite": "^2.7.12",
+    "vitest": "^0.1.17"
   },
   "dependencies": {
     "@babel/core": "^7.16.5",

packages/babel-utils/package.json

@@ -32,10 +32,10 @@
     "@types/glob": "^7.2.0",
     "@types/node": "^17.0.4",
     "c8": "^7.10.0",
-    "eslint": "^8.6.0",
-    "typescript": "4.6.0-dev.20220105",
-    "vite": "^2.7.7",
-    "vitest": "^0.0.115"
+    "eslint": "^8.7.0",
+    "typescript": "4.6.0-dev.20220114",
+    "vite": "^2.7.12",
+    "vitest": "^0.1.17"
   },
   "peerDependencies": {
     "@babel/core": "^7.14.6",

packages/cli-babel/package.json

@@ -27,8 +27,8 @@
     "@types/babel__core": "^7.1.17",
     "@types/jest": "^27.0.3",
     "@types/node": "^17.0.4",
-    "eslint": "^8.6.0",
-    "typescript": "4.6.0-dev.20220105"
+    "eslint": "^8.7.0",
+    "typescript": "4.6.0-dev.20220114"
   },
   "dependencies": {
     "@babel/core": "^7.16.5",

packages/cli-build/package.json

@@ -26,19 +26,19 @@
   "devDependencies": {
     "@types/jest": "^27.0.3",
     "@types/node": "^17.0.4",
-    "@types/ramda": "^0.27.62",
-    "typescript": "4.6.0-dev.20220105",
+    "@types/ramda": "^0.27.64",
+    "typescript": "4.6.0-dev.20220114",
     "webpack": "^5.65.0"
   },
   "dependencies": {
     "@reskript/config-webpack": "3.0.6",
     "@reskript/core": "3.0.6",
     "@reskript/settings": "3.0.6",
-    "eslint": "^8.6.0",
+    "eslint": "^8.7.0",
     "kolorist": "^1.5.1",
     "matcher": "^5.0.0",
     "pretty-bytes": "^5.6.0",
-    "ramda": "^0.27.1",
+    "ramda": "^0.28.0",
     "tty-table": "^4.1.5",
     "webpack-bundle-analyzer": "^4.5.0"
   },

packages/cli-dev/package.json

@@ -26,8 +26,8 @@
   "devDependencies": {
     "@types/jest": "^27.0.3",
     "@types/node": "^17.0.4",
-    "eslint": "^8.6.0",
-    "typescript": "4.6.0-dev.20220105",
+    "eslint": "^8.7.0",
+    "typescript": "4.6.0-dev.20220114",
     "webpack": "^5.65.0"
   },
   "dependencies": {

packages/cli-lint/package.json

@@ -24,20 +24,20 @@
     "test": "echo 'No test in @reskript/cli-lint'"
   },
   "devDependencies": {
-    "@types/eslint": "^7.29.0",
+    "@types/eslint": "^8.2.2",
     "@types/jest": "^27.0.3",
     "@types/node": "^17.0.4",
-    "@types/ramda": "^0.27.62",
-    "typescript": "4.6.0-dev.20220105"
+    "@types/ramda": "^0.27.64",
+    "typescript": "4.6.0-dev.20220114"
   },
   "dependencies": {
     "@reskript/config-lint": "3.0.6",
     "@reskript/core": "3.0.6",
-    "eslint": "^8.6.0",
+    "eslint": "^8.7.0",
     "eslint-formatter-pretty": "^4.1.0",
     "execa": "^6.0.0",
     "globby": "^12.2.0",
-    "ramda": "^0.27.1",
+    "ramda": "^0.28.0",
     "stylelint": "^14.2.0"
   },
   "peerDependencies": {

packages/cli-play/package.json

@@ -27,20 +27,20 @@
     "@types/body-parser": "^1.19.2",
     "@types/debounce": "^1.2.1",
     "@types/dedent": "^0.7.0",
-    "@types/marked": "^3.0.3",
+    "@types/marked": "^4.0.1",
     "@types/mdast": "^3.0.10",
     "@types/node": "^17.0.4",
-    "@types/ramda": "^0.27.62",
+    "@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.6.0",
+    "eslint": "^8.7.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "typescript": "4.6.0-dev.20220105",
-    "vite": "^2.7.7",
-    "vitest": "^0.0.115",
+    "typescript": "4.6.0-dev.20220114",
+    "vite": "^2.7.12",
+    "vitest": "^0.1.17",
     "webpack": "^5.65.0"
   },
   "dependencies": {
@@ -54,14 +54,14 @@
     "debounce": "^1.2.1",
     "internal-ip": "^7.0.0",
     "localforage": "^1.10.0",
-    "marked": "^3.0.8",
-    "ramda": "^0.27.1",
-    "remark-gfm": "^1.0.0",
-    "remark-parse": "^9.0.0",
-    "remark-stringify": "^9.0.1",
+    "marked": "^4.0.10",
+    "ramda": "^0.28.0",
+    "remark-gfm": "^3.0.1",
+    "remark-parse": "^10.0.1",
+    "remark-stringify": "^10.0.2",
     "socket.io": "^4.4.0",
     "socket.io-client": "^4.4.0",
-    "unified": "^9.2.2",
+    "unified": "^10.1.1",
     "webpack-dev-server": "^4.7.1"
   },
   "peerDependencies": {

packages/cli-play/src/Playground/CaseDescription/index.tsx

@@ -1,4 +1,4 @@
-import marked from 'marked';
+import {marked} from 'marked';
 import {PlayCase} from '../../interface.js';
 import './index.css';
 

packages/cli-play/src/utils/case.ts

@@ -2,7 +2,7 @@ import {findLast, reject, isNil} from 'ramda';
 import parse from 'remark-parse';
 import gfm from 'remark-gfm';
 import stringify from 'remark-stringify';
-import unified from 'unified';
+import {unified} from 'unified';
 import {Content, Root, Text, Code, List} from 'mdast';
 import {currentUserName, pMap} from '@reskript/core';
 import {PlayCase, PlayCaseMeta} from '../interface.js';
@@ -106,7 +106,7 @@ interface ParseContext {
 }
 
 export const splitToCaseNodes = (markdown: string): Content[][] => {
-    const root = parser.parse(markdown) as Root;
+    const root = parser.parse(markdown);
     const {saved, workingInProgress} = root.children.reduce(
         (context, node) => {
             // 每个二级标题是一个用例

packages/cli-test/package.json

@@ -26,16 +26,16 @@
   "devDependencies": {
     "@types/jest": "^27.0.3",
     "@types/node": "^17.0.4",
-    "@types/ramda": "^0.27.62",
-    "eslint": "^8.6.0",
-    "typescript": "4.6.0-dev.20220105"
+    "@types/ramda": "^0.27.64",
+    "eslint": "^8.7.0",
+    "typescript": "4.6.0-dev.20220114"
   },
   "dependencies": {
     "@reskript/config-jest": "3.0.6",
     "@reskript/core": "3.0.6",
     "@reskript/settings": "3.0.6",
     "jest-cli": "^27.4.5",
-    "ramda": "^0.27.1"
+    "ramda": "^0.28.0"
   },
   "peerDependencies": {
     "core-js": "3.x"

packages/cli/package.json

@@ -36,8 +36,8 @@
     "@reskript/cli-test": "3.0.6",
     "@types/jest": "^27.0.3",
     "@types/node": "^17.0.4",
-    "eslint": "^8.6.0",
-    "typescript": "4.6.0-dev.20220105"
+    "eslint": "^8.7.0",
+    "typescript": "4.6.0-dev.20220114"
   },
   "dependencies": {
     "@reskript/core": "3.0.6",

packages/config-babel/package.json

@@ -26,16 +26,16 @@
   },
   "devDependencies": {
     "@babel/plugin-transform-typescript": "^7.16.7",
-    "@rollup/plugin-babel": "^5.3.0",
     "@reskript/core": "3.0.6",
+    "@rollup/plugin-babel": "^5.3.0",
     "@types/babel__core": "^7.1.17",
     "@types/node": "^17.0.4",
     "c8": "^7.10.0",
-    "eslint": "^8.6.0",
-    "rollup": "^2.62.0",
-    "typescript": "4.6.0-dev.20220105",
-    "vite": "^2.7.7",
-    "vitest": "^0.0.115"
+    "eslint": "^8.7.0",
+    "rollup": "^2.64.0",
+    "typescript": "4.6.0-dev.20220114",
+    "vite": "^2.7.12",
+    "vitest": "^0.1.17"
   },
   "dependencies": {
     "@babel/core": "^7.16.5",

packages/config-img-loader/package.json

@@ -28,18 +28,17 @@
     "@types/imagemin-mozjpeg": "^8.0.1",
     "@types/imagemin-optipng": "^5.2.1",
     "@types/node": "^17.0.4",
-    "@types/resolve": "^1.20.1",
-    "eslint": "^8.6.0",
-    "typescript": "4.6.0-dev.20220105",
+    "eslint": "^8.7.0",
+    "typescript": "4.6.0-dev.20220114",
     "webpack": "^5.65.0"
   },
   "dependencies": {
-    "imagemin": "^7.0.1",
+    "@reskript/core": "3.0.6",
+    "imagemin": "^8.0.1",
     "imagemin-gifsicle": "^7.0.0",
-    "imagemin-mozjpeg": "^9.0.0",
+    "imagemin-mozjpeg": "^10.0.0",
     "imagemin-optipng": "^8.0.0",
-    "img-loader": "^3.0.2",
-    "resolve": "^1.20.0"
+    "img-loader": "^4.0.0"
   },
   "peerDependencies": {
     "webpack": "5.x"

packages/config-img-loader/src/index.ts

@@ -1,8 +1,8 @@
-import resolve from 'resolve';
 import {RuleSetUseItem} from 'webpack';
 import gif from 'imagemin-gifsicle';
 import jpeg from 'imagemin-mozjpeg';
 import png from 'imagemin-optipng';
+import {resolveSync} from '@reskript/core';
 
 const pluginOptions = {
     gifsicle: {
@@ -26,7 +26,7 @@ export default (): RuleSetUseItem => {
     ];
 
     return {
-        loader: resolve.sync('img-loader'),
+        loader: resolveSync('img-loader'),
         options: {plugins},
     };
 };

packages/config-jest/package.json

@@ -5,6 +5,10 @@
   "type": "commonjs",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
+  "exports": {
+    ".": "./dist/index.js",
+    "./config/*": "./config/*.js"
+  },
   "engines": {
     "node": ">=14.18.0"
   },
@@ -17,7 +21,7 @@
   },
   "scripts": {
     "clean": "rm -rf dist",
-    "build": "rm -rf dist config && tsc -p tsconfig.build.json && node scripts/post-build.js",
+    "build": "rm -rf dist config && tsc -p tsconfig.build.json && node scripts/post-build.mjs",
     "lint": "eslint --max-warnings=0 src",
     "test": "echo 'No test in @reskript/config-jest'"
   },
@@ -29,9 +33,9 @@
     "@types/lodash": "^4.14.178",
     "@types/node": "^17.0.4",
     "@types/resolve": "^1.20.1",
-    "eslint": "^8.6.0",
+    "eslint": "^8.7.0",
     "prettier": "^2.5.1",
-    "typescript": "4.6.0-dev.20220105"
+    "typescript": "4.6.0-dev.20220114"
   },
   "dependencies": {
     "@babel/core": "^7.16.5",
@@ -45,7 +49,7 @@
     "enzyme-to-json": "^3.6.2",
     "identity-obj-proxy": "^3.0.0",
     "jest-raw-loader": "^1.0.1",
-    "ramda": "^0.27.1",
+    "ramda": "^0.28.0",
     "resolve": "^1.20.0",
     "unixify": "^1.0.0"
   },

packages/config-jest/scripts/post-build.js → packages/config-jest/scripts/post-build.mjs

@@ -1,7 +1,8 @@
-const fs = require('fs');
-const path = require('path');
-const prettier = require('prettier');
-const {getJestPresetConfig} = require('../dist');
+import fs from 'fs';
+import path from 'path';
+import prettier from 'prettier';
+import {dirFromImportMeta} from '@reskript/core';
+import {getJestPresetConfig} from '../dist/index.js';
 
 const dumpAsModule = (json, destination) => {
     // 有几个东西是用了`resolve('xxx')`变成了绝对路径，在这里要换回来再替换成`require.resolve`
@@ -41,7 +42,7 @@ const dumpAsModule = (json, destination) => {
 };
 
 const jestPresetConfig = target => getJestPresetConfig(target, '%RESKRIPT_NODE_MODULE_JEST_PATH%');
-const destination = path.join(__dirname, '..', 'config');
+const destination = path.join(dirFromImportMeta(import.meta.url), '..', 'config');
 fs.mkdirSync(destination, {recursive: true});
 dumpAsModule(jestPresetConfig('react'), path.join(destination, 'jest-react.js'));
 dumpAsModule(jestPresetConfig('node'), path.join(destination, 'jest-node.js'));

packages/config-jest/src/preset.ts

@@ -1,4 +1,4 @@
-import {merge} from 'ramda';
+import {mergeDeepRight} from 'ramda';
 import resolve from 'resolve';
 import unixify from 'unixify';
 import {JestConfigOptions} from './interface';
@@ -55,5 +55,5 @@ export const getJestPresetConfig = (target: 'react' | 'node', configBasePath: st
         coveragePathIgnorePatterns: ['/node_modules/', '/__tests__/'],
     };
     const targetConfig = target === 'react' ? reactJestConfig(configBasePath) : nodeJestConfig;
-    return merge(baseConfig, targetConfig);
+    return mergeDeepRight(baseConfig, targetConfig);
 };