chore: 修复 yarn workspace 把本地的 s2-core 隐射到 esm 目录的问题 (#1301)

lijinke666 · web-flow · commit 51cc33e34e60 · 2022-04-25T15:01:23.000+08:00
diff --git a/package.json b/package.json
@@ -33,9 +33,9 @@
     "vue:build": "yarn workspace @antv/s2-vue build",
     "vue:test": "yarn workspace @antv/s2-vue test",
     "vue:watch": " yarn workspace @antv/s2-vue watch",
-    "build": "lerna run build --include-dependencies --stream --concurrency 1",
-    "build:esm": "lerna run build:esm --include-dependencies --stream --concurrency 1",
-    "build:umd": "lerna run build:umd --include-dependencies --stream --concurrency 1",
+    "build": "lerna run build --include-dependencies --stream",
+    "build:esm": "lerna run build:esm --include-dependencies --stream",
+    "build:umd": "lerna run build:umd --include-dependencies --stream",
     "bundle:size": "lerna run bundle:size --stream",
     "release": "lerna exec --concurrency 1 --ignore @antv/s2-vue -- npx --no-install semantic-release",
     "prepublish:manual": "yarn build",
@@ -91,26 +91,26 @@
     "@babel/core": "^7.17.9",
     "@commitlint/cli": "^16.2.3",
     "@commitlint/config-conventional": "^16.2.1",
-    "@originjs/vite-plugin-commonjs": "^1.0.1",
-    "@rollup/plugin-alias": "^3.1.5",
-    "@rollup/plugin-commonjs": "^21.0.0",
-    "@rollup/plugin-node-resolve": "^13.0.5",
+    "@originjs/vite-plugin-commonjs": "^1.0.3",
+    "@rollup/plugin-alias": "^3.1.9",
+    "@rollup/plugin-commonjs": "^21.1.0",
+    "@rollup/plugin-node-resolve": "^13.2.1",
     "@rollup/plugin-replace": "^3.0.0",
     "@rollup/plugin-typescript": "^8.2.5",
-    "@rushstack/eslint-patch": "^1.1.0",
+    "@rushstack/eslint-patch": "^1.1.3",
     "@semantic-release/changelog": "^6.0.1",
     "@semantic-release/git": "^10.0.1",
-    "@swc/core": "^1.2.159",
+    "@swc/core": "^1.2.171",
     "@swc/jest": "^0.2.20",
-    "@types/jest": "^27.0.2",
-    "@types/lodash": "^4.14.175",
-    "@types/node": "^16.10.4",
+    "@types/jest": "^27.4.1",
+    "@types/lodash": "^4.14.182",
+    "@types/node": "^17.0.26",
     "@types/rollup-plugin-peer-deps-external": "^2.2.1",
     "@typescript-eslint/eslint-plugin": "^5.0.0",
     "@typescript-eslint/parser": "^5.0.0",
-    "@vitejs/plugin-react": "^1.0.6",
-    "@vitejs/plugin-vue": "^2.2.4",
-    "@vitejs/plugin-vue-jsx": "^1.3.8",
+    "@vitejs/plugin-react": "^1.3.1",
+    "@vitejs/plugin-vue": "^2.3.1",
+    "@vitejs/plugin-vue-jsx": "^1.3.10",
     "@vue/eslint-config-prettier": "^7.0.0",
     "@vue/eslint-config-typescript": "^10.0.0",
     "@vue/vue3-jest": "^27.0.0-alpha.4",
@@ -120,7 +120,7 @@
     "bundlesize": "^0.18.1",
     "case-police": "^0.5.3",
     "concurrently": "^7.1.0",
-    "conventional-changelog-cli": "^2.1.1",
+    "conventional-changelog-cli": "^2.2.2",
     "cpx": "^1.5.0",
     "cross-env": "^7.0.3",
     "eslint": "^7.32.0",
@@ -143,30 +143,30 @@
     "jest-url-loader": "^0.1.0",
     "lerna": "^4.0.0",
     "less": "^4.1.2",
-    "lint-staged": "^12.3.6",
+    "lint-staged": "^12.4.0",
     "lodash-es": "^4.17.21",
     "markdownlint-cli": "^0.31.1",
     "npm-run-all": "^4.1.5",
     "ora": "^6.1.0",
-    "postcss": "^8.4.7",
-    "prettier": "2.6.0",
+    "postcss": "^8.4.12",
+    "prettier": "2.6.2",
     "rimraf": "^3.0.2",
-    "rollup": "^2.58.0",
+    "rollup": "^2.70.2",
     "rollup-plugin-peer-deps-external": "^2.2.4",
-    "rollup-plugin-postcss": "^4.0.1",
+    "rollup-plugin-postcss": "^4.0.2",
     "rollup-plugin-terser": "^7.0.2",
-    "rollup-plugin-typescript2": "^0.30.0",
-    "rollup-plugin-visualizer": "^5.5.2",
+    "rollup-plugin-typescript2": "^0.31.2",
+    "rollup-plugin-visualizer": "^5.6.0",
     "semantic-release": "^18.0.1",
     "semantic-release-monorepo": "^7.0.5",
     "stylelint": "^13.13.1",
     "stylelint-config-standard": "^22.0.0",
     "ts-jest": "^26.5.6",
-    "tslib": "^2.3.1",
+    "tslib": "^2.4.0",
     "ttypescript": "^1.5.13",
-    "typescript": "^4.6.2",
-    "vite": "^2.8.6",
-    "vite-plugin-imp": "^2.1.6",
+    "typescript": "^4.6.3",
+    "vite": "^2.9.5",
+    "vite-plugin-imp": "^2.1.8",
     "vue-jest": "^5.0.0-alpha.10"
   },
   "license": "MIT"
diff --git a/packages/s2-react/package.json b/packages/s2-react/package.json
@@ -66,7 +66,7 @@
     "react-beautiful-dnd": "^13.1.0"
   },
   "devDependencies": {
-    "@antv/s2": "^1.15.0-alpha.1",
+    "@antv/s2": "*",
     "@ant-design/icons": "^4.7.0",
     "@testing-library/react": "^12.1.4",
     "@testing-library/react-hooks": "^7.0.2",
diff --git a/packages/s2-react/vite.config.ts b/packages/s2-react/vite.config.ts
@@ -42,14 +42,16 @@ export default defineConfig({
       isDevMode ? 'development' : 'production',
     ),
   },
+
   plugins: [
     peerDepsExternal(),
-    viteCommonjs(),
+    !isDevMode && viteCommonjs(),
     react({
       jsxRuntime: 'classic',
     }),
     isAnalysisMode && visualizer({ gzipSize: true }),
   ].filter(Boolean) as PluginOption[],
+
   css: {
     preprocessorOptions: {
       less: {
diff --git a/packages/s2-vue/package.json b/packages/s2-vue/package.json
@@ -53,12 +53,13 @@
   },
   "peerDependencies": {
     "@antv/s2": ">=1.0.0",
-    "vue": "^3.2.31"
+    "vue": ">=3.x"
   },
   "dependencies": {
     "@vueuse/core": "^8.2.4"
   },
   "devDependencies": {
+    "@antv/s2": "*",
     "@testing-library/vue": "^6.5.1",
     "@vue/tsconfig": "^0.1.3",
     "vue": "^3.2.31",
diff --git a/packages/s2-vue/vite.config.ts b/packages/s2-vue/vite.config.ts
@@ -45,7 +45,7 @@ export default defineConfig({
   },
   plugins: [
     peerDepsExternal(),
-    viteCommonjs(),
+    !isDevMode && viteCommonjs(),
     vue(),
     vueJsx(),
     isAnalysisMode && visualizer({ gzipSize: true }),
diff --git a/yarn.lock b/yarn.lock
