fix: worker extension active

Ricbet · Ricbet · commit dc6667ab902d · 2023-08-24T11:09:54.000+08:00
diff --git a/packages/cli/src/extension/scanner.ts b/packages/cli/src/extension/scanner.ts
@@ -106,9 +106,9 @@ export async function getExtension(
     }
   }
 
-  // merge for `sumiContributes` and `contributes`
+  // merge for `kaitianContributes` and `contributes`
   packageJSON.contributes = mergeContributes(
-    packageJSON.sumiContributes,
+    packageJSON.kaitianContributes,
     packageJSON.contributes
   );
 
@@ -137,7 +137,7 @@ export async function getExtension(
       'description',
       'icon',
       'activationEvents',
-      'sumiContributes',
+      'kaitianContributes',
       'contributes',
       'browser',
     ]),
diff --git a/packages/common/src/types/extension.ts b/packages/common/src/types/extension.ts
@@ -39,7 +39,7 @@ export interface IExtensionBasicMetadata {
     description?: string;
     repository?: any;
     activationEvents?: string[];
-    sumiContributes?: JSONType;
+    kaitianContributes?: JSONType;
     contributes?: JSONType;
   };
   defaultPkgNlsJSON?: JSONType;
diff --git a/packages/core/extensions/codeblitz.css-language-features-worker.js b/packages/core/extensions/codeblitz.css-language-features-worker.js
@@ -17,6 +17,9 @@ module.exports = {
       "onLanguage:scss",
       "onCommand:_css.applyCodeAction"
     ],
+    "kaitianContributes": {
+      "workerMain": "client/dist/browser/cssClientMain.js"
+    },
     "contributes": {
       "configuration": [
         {
@@ -793,7 +796,8 @@ module.exports = {
           "fileMatch": "package.json",
           "url": "./schemas/package.schema.json"
         }
-      ]
+      ],
+      "workerMain": "client/dist/browser/cssClientMain.js"
     },
     "browser": "./client/dist/browser/cssClientMain"
   },
diff --git a/packages/core/extensions/codeblitz.git-graph.js b/packages/core/extensions/codeblitz.git-graph.js
@@ -18,6 +18,9 @@ module.exports = {
     "activationEvents": [
       "*"
     ],
+    "kaitianContributes": {
+      "workerMain": "./dist/extension.js"
+    },
     "contributes": {
       "commands": [
         {
@@ -1409,7 +1412,8 @@ module.exports = {
             "group": "inline"
           }
         ]
-      }
+      },
+      "workerMain": "./dist/extension.js"
     }
   },
   "pkgNlsJSON": {},
diff --git a/packages/core/extensions/codeblitz.gitlens.js b/packages/core/extensions/codeblitz.gitlens.js
@@ -13,6 +13,9 @@ module.exports = {
     "activationEvents": [
       "*"
     ],
+    "kaitianContributes": {
+      "workerMain": "dist/extension.js"
+    },
     "contributes": {
       "configuration": {
         "type": "object",
@@ -1279,7 +1282,8 @@ module.exports = {
           "mac": "cmd+c",
           "when": "gitlens:enabled && focusedView =~ /^gitlens\\.views\\.search/"
         }
-      ]
+      ],
+      "workerMain": "dist/extension.js"
     }
   },
   "pkgNlsJSON": {},
diff --git a/packages/core/extensions/codeblitz.html-language-features-worker.js b/packages/core/extensions/codeblitz.html-language-features-worker.js
@@ -15,6 +15,9 @@ module.exports = {
       "onLanguage:html",
       "onLanguage:handlebars"
     ],
+    "kaitianContributes": {
+      "workerMain": "client/dist/browser/htmlClientMain.js"
+    },
     "contributes": {
       "configuration": {
         "id": "html",
@@ -225,7 +228,8 @@ module.exports = {
           "fileMatch": "package.json",
           "url": "./schemas/package.schema.json"
         }
-      ]
+      ],
+      "workerMain": "client/dist/browser/htmlClientMain.js"
     },
     "browser": "./client/dist/browser/htmlClientMain"
   },
diff --git a/packages/core/extensions/codeblitz.image-preview.js b/packages/core/extensions/codeblitz.image-preview.js
@@ -16,6 +16,9 @@ module.exports = {
       "onCommand:imagePreview.zoomIn",
       "onCommand:imagePreview.zoomOut"
     ],
+    "kaitianContributes": {
+      "workerMain": "./dist/browser/extension.js"
+    },
     "contributes": {
       "customEditors": [
         {
@@ -54,7 +57,8 @@ module.exports = {
             "group": "1_imagePreview"
           }
         ]
-      }
+      },
+      "workerMain": "./dist/browser/extension.js"
     },
     "browser": "./dist/browser/extension.js"
   },
diff --git a/packages/core/extensions/codeblitz.json-language-features-worker.js b/packages/core/extensions/codeblitz.json-language-features-worker.js
@@ -15,6 +15,9 @@ module.exports = {
       "onLanguage:json",
       "onLanguage:jsonc"
     ],
+    "kaitianContributes": {
+      "workerMain": "client/dist/browser/jsonClientMain.js"
+    },
     "contributes": {
       "configuration": {
         "id": "json",
@@ -115,7 +118,8 @@ module.exports = {
           "fileMatch": "*.schema.json",
           "url": "http://json-schema.org/draft-07/schema#"
         }
-      ]
+      ],
+      "workerMain": "client/dist/browser/jsonClientMain.js"
     },
     "browser": "./client/dist/browser/jsonClientMain"
   },
diff --git a/packages/core/extensions/codeblitz.markdown-language-features-worker.js b/packages/core/extensions/codeblitz.markdown-language-features-worker.js
@@ -24,6 +24,9 @@ module.exports = {
       "onWebviewPanel:markdown.preview",
       "onCustomEditor:vscode.markdown.preview.editor"
     ],
+    "kaitianContributes": {
+      "workerMain": "./dist/browser/extension.js"
+    },
     "contributes": {
       "commands": [
         {
@@ -295,7 +298,8 @@ module.exports = {
       ],
       "markdown.previewScripts": [
         "./media/index.js"
-      ]
+      ],
+      "workerMain": "./dist/browser/extension.js"
     },
     "browser": "./dist/browser/extension"
   },
diff --git a/packages/core/extensions/codeblitz.typescript-language-features-worker.js b/packages/core/extensions/codeblitz.typescript-language-features-worker.js
@@ -28,6 +28,9 @@ module.exports = {
       "onCommand:_typescript.learnMoreAboutRefactorings",
       "onLanguage:jsonc"
     ],
+    "kaitianContributes": {
+      "workerMain": "./dist/browser/extension.js"
+    },
     "contributes": {
       "jsonValidation": [
         {
@@ -1128,7 +1131,8 @@ module.exports = {
           "name": "typescript-vscode-sh-plugin",
           "enableForWorkspaceTypeScriptVersions": true
         }
-      ]
+      ],
+      "workerMain": "./dist/browser/extension.js"
     },
     "browser": "./dist/browser/extension"
   },
diff --git a/packages/core/extensions/codeblitz.web-scm.js b/packages/core/extensions/codeblitz.web-scm.js
@@ -2,18 +2,64 @@ module.exports = {
   "extension": {
     "publisher": "codeblitz",
     "name": "web-scm",
-    "version": "0.3.1"
+    "version": "0.3.7"
   },
   "packageJSON": {
     "name": "web-scm",
-    "publisher": "cloud-ide-ext",
-    "version": "0.3.1",
-    "repository": "git@code.alipay.com:alexgroup/web-scm.git",
+    "publisher": "codeblitz",
+    "version": "0.3.7",
     "displayName": "web-scm",
     "description": "web-scm",
     "activationEvents": [
       "*"
     ],
+    "kaitianContributes": {
+      "workerMain": "./out/worker/index.js",
+      "browserMain": "./out/browser/index.js",
+      "configuration": {
+        "title": "WebSCM",
+        "type": "object",
+        "properties": {
+          "git.mergeEditor": {
+            "type": "boolean",
+            "default": true,
+            "markdownDescription": "%config.mergeEditor%",
+            "scope": "window"
+          },
+          "webscm.commitType": {
+            "type": "string",
+            "default": "baseBranch",
+            "enum": [
+              "baseBranch",
+              "newBranch"
+            ],
+            "markdownDescription": "%config.commitType%",
+            "scope": "window"
+          },
+          "webscm.createPR": {
+            "type": "boolean",
+            "default": false,
+            "markdownDescription": "%config.createPR%",
+            "scope": "window"
+          }
+        }
+      },
+      "viewsProxies": [
+        "CommitPanel"
+      ],
+      "browserViews": {
+        "scm": {
+          "type": "add",
+          "view": [
+            {
+              "id": "CommitPanel",
+              "component": "CommitPanel",
+              "title": "提交信息"
+            }
+          ]
+        }
+      }
+    },
     "contributes": {
       "commands": [
         {
@@ -236,7 +282,52 @@ module.exports = {
           "mac": "cmd+enter",
           "when": "scmRepository"
         }
-      ]
+      ],
+      "workerMain": "./out/worker/index.js",
+      "browserMain": "./out/browser/index.js",
+      "configuration": {
+        "title": "WebSCM",
+        "type": "object",
+        "properties": {
+          "git.mergeEditor": {
+            "type": "boolean",
+            "default": true,
+            "markdownDescription": "%config.mergeEditor%",
+            "scope": "window"
+          },
+          "webscm.commitType": {
+            "type": "string",
+            "default": "baseBranch",
+            "enum": [
+              "baseBranch",
+              "newBranch"
+            ],
+            "markdownDescription": "%config.commitType%",
+            "scope": "window"
+          },
+          "webscm.createPR": {
+            "type": "boolean",
+            "default": false,
+            "markdownDescription": "%config.createPR%",
+            "scope": "window"
+          }
+        }
+      },
+      "viewsProxies": [
+        "CommitPanel"
+      ],
+      "browserViews": {
+        "scm": {
+          "type": "add",
+          "view": [
+            {
+              "id": "CommitPanel",
+              "component": "CommitPanel",
+              "title": "提交信息"
+            }
+          ]
+        }
+      }
     }
   },
   "defaultPkgNlsJSON": {
diff --git a/packages/startup/src/startup/web-scm.plugin.ts b/packages/startup/src/startup/web-scm.plugin.ts
@@ -77,17 +77,6 @@ export const activate = ({ commands }: IPluginAPI) => {
     }
   });
 
-  /*
-      21 修改次数
-      22 新增文件
-      23 删除文件
-      24 提交次数
-   */
-  commands.registerCommand('web-scm.yuyanlog', (code, msg, extra) => {
-    // 埋点数据
-    console.log(' >>> log', code, msg, extra);
-  });
-
   commands.registerCommand('alex.gty.workerReady', () => {
     return workerReady.resolve();
   });
diff --git a/packages/toolkit/fixtures/worker-example/package.json b/packages/toolkit/fixtures/worker-example/package.json
@@ -8,7 +8,7 @@
   "activationEvents": [
     "*"
   ],
-  "sumiContributes": {
+  "kaitianContributes": {
     "workerMain": "./worker.js",
     "browserMain": "./browser.js",
     "browserViews": {

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,9 @@ module.exports = {`
`18`	`18`	`"activationEvents": [`
`19`	`19`	`"*"`
`20`	`20`	`],`
	`21`	`+ "kaitianContributes": {`
	`22`	`+ "workerMain": "./dist/extension.js"`
	`23`	`+ },`
`21`	`24`	`"contributes": {`
`22`	`25`	`"commands": [`
`23`	`26`	`{`
`@@ -1409,7 +1412,8 @@ module.exports = {`
`1409`	`1412`	`"group": "inline"`
`1410`	`1413`	`}`
`1411`	`1414`	`]`
`1412`		`- }`
	`1415`	`+ },`
	`1416`	`+ "workerMain": "./dist/extension.js"`
`1413`	`1417`	`}`
`1414`	`1418`	`},`
`1415`	`1419`	`"pkgNlsJSON": {},`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,9 @@ module.exports = {`
`16`	`16`	`"onCommand:imagePreview.zoomIn",`
`17`	`17`	`"onCommand:imagePreview.zoomOut"`
`18`	`18`	`],`
	`19`	`+ "kaitianContributes": {`
	`20`	`+ "workerMain": "./dist/browser/extension.js"`
	`21`	`+ },`
`19`	`22`	`"contributes": {`
`20`	`23`	`"customEditors": [`
`21`	`24`	`{`
`@@ -54,7 +57,8 @@ module.exports = {`
`54`	`57`	`"group": "1_imagePreview"`
`55`	`58`	`}`
`56`	`59`	`]`
`57`		`- }`
	`60`	`+ },`
	`61`	`+ "workerMain": "./dist/browser/extension.js"`
`58`	`62`	`},`
`59`	`63`	`"browser": "./dist/browser/extension.js"`
`60`	`64`	`},`