release: v2.1.0-0

guqiankun · guqiankun · commit 10b524c881f1 · 2022-11-22T11:26:20.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+# [2.1.0-0](https://code.alipay.com/cloud-ide/crew-dragon/compare/v2.0.21...v2.1.0-0) (2022-11-22)
+
+
+### Bug Fixes
+
+* 修复ACR样式 ([090a57a](https://code.alipay.com/cloud-ide/crew-dragon/commits/090a57a0feed35f48ea4932ac7867a04fcf76fe3))
+
+
+### Features
+
+* 增加解决冲突能力 ([4245757](https://code.alipay.com/cloud-ide/crew-dragon/commits/4245757b631fd2c436cc7903fc6081df40e807d4))
+
+
+
 ## [2.0.21](https://code.alipay.com/cloud-ide/crew-dragon/compare/v2.0.20...v2.0.21) (2022-10-26)
 
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "alex",
-  "version": "2.0.21",
+  "version": "2.1.0-0",
   "workspaces": [
     "packages/*"
   ],
diff --git a/packages/acr/package.json b/packages/acr/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@alipay/alex-acr",
-  "version": "2.0.21",
+  "version": "2.1.0-0",
   "description": "@alipay/alex-acr",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -19,9 +19,9 @@
     "@alipay/yuyan-monitor-web": "^2.0.28"
   },
   "dependencies": {
-    "@alipay/alex": "2.0.21",
-    "@alipay/alex-core": "2.0.21",
-    "@alipay/alex-shared": "2.0.21",
+    "@alipay/alex": "2.1.0-0",
+    "@alipay/alex-core": "2.1.0-0",
+    "@alipay/alex-shared": "2.1.0-0",
     "@alipay/geek-theme": "^1.6.0",
     "@alipay/lsif-client": "^2.0.0",
     "crypto-js": "^4.0.0",
diff --git a/packages/alex/package.json b/packages/alex/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@alipay/alex",
-  "version": "2.0.21",
+  "version": "2.1.0-0",
   "description": "@alipay/alex",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -72,15 +72,15 @@
     "@opensumi/ide-testing": "2.19.10",
     "@opensumi/ide-variable": "2.19.10",
     "@ali/kaitian-textmate-languages": "^2.7.0",
-    "@alipay/alex-cli": "2.0.21",
-    "@alipay/alex-code-api": "2.0.21",
-    "@alipay/alex-core": "2.0.21",
-    "@alipay/alex-registry": "2.0.21",
-    "@alipay/alex-shared": "2.0.21",
-    "@alipay/alex-code-service": "2.0.21",
-    "@alipay/alex-i18n": "2.0.21",
-    "@alipay/alex-lsif-service": "2.0.21",
-    "@alipay/alex-plugin": "2.0.21",
+    "@alipay/alex-cli": "2.1.0-0",
+    "@alipay/alex-code-api": "2.1.0-0",
+    "@alipay/alex-core": "2.1.0-0",
+    "@alipay/alex-registry": "2.1.0-0",
+    "@alipay/alex-shared": "2.1.0-0",
+    "@alipay/alex-code-service": "2.1.0-0",
+    "@alipay/alex-i18n": "2.1.0-0",
+    "@alipay/alex-lsif-service": "2.1.0-0",
+    "@alipay/alex-plugin": "2.1.0-0",
     "tslib": "^2.2.0"
   },
   "tnpm": {
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@alipay/alex-cli",
-  "version": "2.0.21",
+  "version": "2.1.0-0",
   "description": "@alipay/alex-cli",
   "main": "lib/commander.js",
   "files": [
@@ -20,7 +20,7 @@
   "dependencies": {
     "@ali/ide-extension-installer": "^2.0.0",
     "@opensumi/ide-extension": "2.19.10",
-    "@alipay/alex-shared": "2.0.21",
+    "@alipay/alex-shared": "2.1.0-0",
     "commander": "^7.2.0",
     "fs-extra": "^9.0.1",
     "lodash.pick": "^4.4.0",
diff --git a/packages/code-api/package.json b/packages/code-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@alipay/alex-code-api",
-  "version": "2.0.21",
+  "version": "2.1.0-0",
   "description": "@alipay/alex-code-api",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -19,9 +19,9 @@
     "lockfile": "enable"
   },
   "dependencies": {
-    "@alipay/alex-core": "2.0.21",
-    "@alipay/alex-code-service": "2.0.21",
-    "@alipay/alex-shared": "2.0.21",
+    "@alipay/alex-core": "2.1.0-0",
+    "@alipay/alex-code-service": "2.1.0-0",
+    "@alipay/alex-shared": "2.1.0-0",
     "tslib": "^2.2.0"
   }
 }
diff --git a/packages/code-service/package.json b/packages/code-service/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@alipay/alex-code-service",
-  "version": "2.0.21",
+  "version": "2.1.0-0",
   "description": "@alipay/alex-code-service",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -19,8 +19,8 @@
     "lockfile": "enable"
   },
   "dependencies": {
-    "@alipay/alex-core": "2.0.21",
-    "@alipay/alex-code-api": "2.0.21",
+    "@alipay/alex-core": "2.1.0-0",
+    "@alipay/alex-code-api": "2.1.0-0",
     "umi-request": "^1.3.5",
     "tslib": "^2.2.0"
   }
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@alipay/alex-core",
-  "version": "2.0.21",
+  "version": "2.1.0-0",
   "description": "core",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -28,8 +28,8 @@
     "@opensumi/ide-extension": "2.19.10",
     "@opensumi/ide-logs": "2.19.10",
     "@alipay/alex-browserfs": "~2.1.0",
-    "@alipay/alex-registry": "2.0.21",
-    "@alipay/alex-shared": "2.0.21",
+    "@alipay/alex-registry": "2.1.0-0",
+    "@alipay/alex-shared": "2.1.0-0",
     "assert": "^2.0.0",
     "fs-extra-factory": "^0.2.1",
     "iconv-lite-umd": "^0.6.8",
diff --git a/packages/i18n/package.json b/packages/i18n/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@alipay/alex-i18n",
-  "version": "2.0.21",
+  "version": "2.1.0-0",
   "description": "@alipay/alex-i18n",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -19,8 +19,8 @@
     "lockfile": "enable"
   },
   "dependencies": {
-    "@alipay/alex-core": "2.0.21",
-    "@alipay/alex-shared": "2.0.21",
+    "@alipay/alex-core": "2.1.0-0",
+    "@alipay/alex-shared": "2.1.0-0",
     "tslib": "^2.2.0"
   }
 }
diff --git a/packages/integrations/package.json b/packages/integrations/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@alipay/alex-integrations",
-  "version": "2.0.21",
+  "version": "2.1.0-0",
   "description": "@alipay/alex-integrations",
   "main": "lib/index.js",
   "typing": "types/index.d.ts",
@@ -15,15 +15,15 @@
     "registry": "https://registry.npm.alibaba-inc.com"
   },
   "dependencies": {
-    "@alipay/alex": "2.0.21",
-    "@alipay/alex-acr": "2.0.21",
-    "@alipay/alex-cli": "2.0.21",
-    "@alipay/alex-code-api": "2.0.21",
-    "@alipay/alex-code-service": "2.0.21",
-    "@alipay/alex-core": "2.0.21",
-    "@alipay/alex-i18n": "2.0.21",
-    "@alipay/alex-lsif-service": "2.0.21",
-    "@alipay/alex-shared": "2.0.21",
+    "@alipay/alex": "2.1.0-0",
+    "@alipay/alex-acr": "2.1.0-0",
+    "@alipay/alex-cli": "2.1.0-0",
+    "@alipay/alex-code-api": "2.1.0-0",
+    "@alipay/alex-code-service": "2.1.0-0",
+    "@alipay/alex-core": "2.1.0-0",
+    "@alipay/alex-i18n": "2.1.0-0",
+    "@alipay/alex-lsif-service": "2.1.0-0",
+    "@alipay/alex-shared": "2.1.0-0",
     "@ant-design/icons": "~2.1.1",
     "ahooks": "2",
     "antd": "^3.20.3",
diff --git a/packages/lsif-service/package.json b/packages/lsif-service/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@alipay/alex-lsif-service",
-  "version": "2.0.21",
+  "version": "2.1.0-0",
   "description": "@alipay/alex-lsif-service",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -19,8 +19,8 @@
     "lockfile": "enable"
   },
   "dependencies": {
-    "@alipay/alex-core": "2.0.21",
-    "@alipay/alex-shared": "2.0.21",
+    "@alipay/alex-core": "2.1.0-0",
+    "@alipay/alex-shared": "2.1.0-0",
     "@alipay/lsif-client": "^2.0.0",
     "tslib": "^2.2.0"
   },
diff --git a/packages/plugin/package.json b/packages/plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@alipay/alex-plugin",
-  "version": "2.0.21",
+  "version": "2.1.0-0",
   "description": "@alipay/alex-plugin",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -19,8 +19,8 @@
     "lockfile": "enable"
   },
   "dependencies": {
-    "@alipay/alex-core": "2.0.21",
-    "@alipay/alex-shared": "2.0.21",
+    "@alipay/alex-core": "2.1.0-0",
+    "@alipay/alex-shared": "2.1.0-0",
     "tslib": "^2.2.0"
   }
 }
diff --git a/packages/registry/package.json b/packages/registry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@alipay/alex-registry",
-  "version": "2.0.21",
+  "version": "2.1.0-0",
   "description": "@alipay/alex-registry",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
diff --git a/packages/shared/package.json b/packages/shared/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@alipay/alex-shared",
-  "version": "2.0.21",
+  "version": "2.1.0-0",
   "description": "@alipay/alex-shared",
   "main": "lib/index.js",
   "typing": "lib/index.d.ts",
diff --git a/packages/toolkit/package.json b/packages/toolkit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@alipay/alex-toolkit",
-  "version": "2.0.21",
+  "version": "2.1.0-0",
   "description": "@alipay/alex-toolkit",
   "main": "index.js",
   "files": [

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "alex",`
`3`		`- "version": "2.0.21",`
	`3`	`+ "version": "2.1.0-0",`
`4`	`4`	`"workspaces": [`
`5`	`5`	`"packages/*"`
`6`	`6`	`],`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@alipay/alex-i18n",`
`3`		`- "version": "2.0.21",`
	`3`	`+ "version": "2.1.0-0",`
`4`	`4`	`"description": "@alipay/alex-i18n",`
`5`	`5`	`"main": "lib/index.js",`
`6`	`6`	`"typings": "lib/index.d.ts",`
`@@ -19,8 +19,8 @@`
`19`	`19`	`"lockfile": "enable"`
`20`	`20`	`},`
`21`	`21`	`"dependencies": {`
`22`		`- "@alipay/alex-core": "2.0.21",`
`23`		`- "@alipay/alex-shared": "2.0.21",`
	`22`	`+ "@alipay/alex-core": "2.1.0-0",`
	`23`	`+ "@alipay/alex-shared": "2.1.0-0",`
`24`	`24`	`"tslib": "^2.2.0"`
`25`	`25`	`}`
`26`	`26`	`}`