diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 3b9dbd82c..dc1c12ebf 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -12,27 +12,29 @@ labels: 'bug' 重启 VS Code 将自动升级插件。 --> -* 插件名: -* 插件版本: +插件名/Extension: -## 您的本地环境信息? +## 您的本地环境信息/Your local environment information -* 操作系统及其版本: -* Node 版本: -* npm 版本: +* 操作系统及其版本/System and Version: +* Node version: +* npm version: <!-- -查看 Node 版本:`node -v` -查看 npm 版本:`npm -v` + Check Node version: `node -v` + Check npm version: `npm -v` --> -## 您遇到的问题及复现步骤? +## 您遇到的问题及复现步骤/What are your problems and how to reproduce them <!-- - 如果可能的话,提供一个问题的最小演示。 - 请尽可能地提供截图或录屏。 + 如果可能的话,提供一个问题的最小演示/If possible, provide a minimal demonstration of the problem + 请尽可能地提供截图或录屏/Please provide screenshots or videos as much as possible --> -## 您期待的正确结果? +## 您期待的正确结果/The right result you're looking forward to -<!-- 如果您有建议的解决方案,亦可进行说明 --> +<!-- + 如果您有建议的解决方案,亦可进行说明。 + If you have a suggested solution, you can also explain it. +--> diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index 88f3ee188..77472bf8a 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -5,18 +5,30 @@ labels: 'enhancement' --- -### 问题描述 +### 问题描述/Problem Description -<!-- 您提交的需求是否与缺陷相关?请简要地说明问题是什么。 --> +<!-- + 您提交的需求是否与缺陷相关?请简要地说明问题是什么。 + Is the requirement you submitted related to the defect? Please briefly state what the problem is. +--> -### 建议的解决方案 +### 建议的方案/Proposal -<!-- 以简洁明了的方式描述您想要的解决方案 --> +<!-- + 以简洁明了的方式描述您想要的解决方案。 + Describe the solution you want in a concise way. +--> -### 考虑的备选方案 +### 备选的方案/Alternatives -<!-- 对您考虑过的任何替代解决方案或功能的清晰描述。 --> +<!-- + 对您考虑过的任何替代解决方案或功能的清晰描述。 + A clear description of any alternative solutions or features you have considered. +--> -### 附加信息 +### 附加信息/Other Information -<!-- 在此处添加有关该需求的任何其他上下文。 --> +<!-- + 在此处添加有关该需求的任何其他上下文。 + Add any other context here about the requirement. +--> diff --git a/.github/workflows/auto-publisher.yml b/.github/workflows/auto-publisher.yml index 6f9075a89..c1355fde3 100644 --- a/.github/workflows/auto-publisher.yml +++ b/.github/workflows/auto-publisher.yml @@ -3,7 +3,7 @@ name: Auto Publisher on: push: branches: - - product + - master jobs: build-and-publish: diff --git a/extensions/iceworks-app/CHANGELOG.md b/extensions/iceworks-app/CHANGELOG.md index 9a542499d..4ae341bff 100644 --- a/extensions/iceworks-app/CHANGELOG.md +++ b/extensions/iceworks-app/CHANGELOG.md @@ -1,5 +1,9 @@ # Change Log +## 0.5.3 + +- fix: compatible with scenarios without material source + ## 0.5.2 - fix: if there is an active window, then do not show the welcome page diff --git a/extensions/iceworks-app/package.json b/extensions/iceworks-app/package.json index 98e753742..7e9c85bd1 100644 --- a/extensions/iceworks-app/package.json +++ b/extensions/iceworks-app/package.json @@ -3,7 +3,7 @@ "displayName": "Iceworks Application Viewer", "description": "Quick view your Universal Application(React/Rax/Vue, etc).", "publisher": "iceworks-team", - "version": "0.5.2", + "version": "0.5.3", "engines": { "vscode": "^1.41.0" }, diff --git a/extensions/iceworks-config-helper/CHANGELOG.md b/extensions/iceworks-config-helper/CHANGELOG.md index 38da4a8bb..ae9d1bca6 100644 --- a/extensions/iceworks-config-helper/CHANGELOG.md +++ b/extensions/iceworks-config-helper/CHANGELOG.md @@ -1,5 +1,9 @@ # Change Log +## 0.3.6 + +- fix: compatible with scenarios without material source + ## 0.3.5 - fix: if there is an active window, then do not show the welcome page diff --git a/extensions/iceworks-config-helper/package.json b/extensions/iceworks-config-helper/package.json index a12b05679..17f42315e 100644 --- a/extensions/iceworks-config-helper/package.json +++ b/extensions/iceworks-config-helper/package.json @@ -3,7 +3,7 @@ "displayName": "Iceworks Config Helper", "description": "Easily write Config files in icejs(& rax-app)", "publisher": "iceworks-team", - "version": "0.3.5", + "version": "0.3.6", "engines": { "vscode": "^1.41.0" }, diff --git a/extensions/iceworks-doctor/CHANGELOG.md b/extensions/iceworks-doctor/CHANGELOG.md index 600672173..afdeef95c 100644 --- a/extensions/iceworks-doctor/CHANGELOG.md +++ b/extensions/iceworks-doctor/CHANGELOG.md @@ -1,5 +1,9 @@ # Change Log +## 0.1.3 + +- fix: compatible with scenarios without material source + ## 0.1.2 - fix: if there is an active window, then do not show the welcome page diff --git a/extensions/iceworks-doctor/package.json b/extensions/iceworks-doctor/package.json index d62c318d1..525d00be6 100644 --- a/extensions/iceworks-doctor/package.json +++ b/extensions/iceworks-doctor/package.json @@ -3,7 +3,7 @@ "displayName": "Iceworks Doctor", "description": "A free security and quality audit tool for modern DevOps teams", "publisher": "iceworks-team", - "version": "0.1.2", + "version": "0.1.3", "engines": { "vscode": "^1.41.0" }, diff --git a/extensions/iceworks-material-helper/CHANGELOG.md b/extensions/iceworks-material-helper/CHANGELOG.md index e3f4cd10e..d8392128f 100644 --- a/extensions/iceworks-material-helper/CHANGELOG.md +++ b/extensions/iceworks-material-helper/CHANGELOG.md @@ -1,5 +1,9 @@ # Change Log +## 0.3.9 + +- fix: add materilSource config + ## 0.3.8 - fix: if there is an active window, then do not show the welcome page diff --git a/extensions/iceworks-material-helper/package.json b/extensions/iceworks-material-helper/package.json index a04f1e6f6..8b81b99ce 100644 --- a/extensions/iceworks-material-helper/package.json +++ b/extensions/iceworks-material-helper/package.json @@ -3,7 +3,7 @@ "displayName": "React Component Helper", "description": "Easily use Component in React/Rax.", "publisher": "iceworks-team", - "version": "0.3.8", + "version": "0.3.9", "main": "./build/extension.js", "engines": { "vscode": "^1.41.0" @@ -65,6 +65,34 @@ "default": false, "description": "%iceworksMaterialHelper.configuration.openInBrowserDescription%", "title": "Open Doc Link Inside VSCode" + }, + "iceworks.materialSources": { + "type": "array", + "description": "%iceworksMaterialHelper.configuration.properties.iceworks.materialSources.description%", + "items": { + "type": "object", + "description": "Source", + "properties": { + "name": { + "type": "string", + "description": "name" + }, + "type": { + "type": "string", + "description": "react or rax" + }, + "source": { + "type": "string", + "description": "URL", + "format": "URL" + }, + "description": { + "type": "string", + "description": "description" + } + } + }, + "default": [] } } } diff --git a/extensions/iceworks-material-helper/package.nls.json b/extensions/iceworks-material-helper/package.nls.json index a879f40e9..4e66270b0 100644 --- a/extensions/iceworks-material-helper/package.nls.json +++ b/extensions/iceworks-material-helper/package.nls.json @@ -2,5 +2,6 @@ "iceworksMaterialHelper.commands.start.title": "Iceworks: Import Material", "iceworksMaterialHelper.commands.showAllMaterialQuickPicks.title": "Iceworks: Find Component", "iceworksMaterialHelper.commands.showDocumentMaterialQuickPicks.title": "Iceworks: Find Components In Current File", - "iceworksMaterialHelper.configuration.openInBrowserDescription": "Whether open doc url inside VSCode, this function relys on 「Browser Preview」 extension,you need to install it manually before you can use this function" + "iceworksMaterialHelper.configuration.openInBrowserDescription": "Whether open doc url inside VSCode, this function relys on 「Browser Preview」 extension,you need to install it manually before you can use this function", + "iceworksMaterialHelper.configuration.properties.iceworks.materialSources.description": "Iceworks material sources, decide which materials to use." } diff --git a/extensions/iceworks-material-helper/package.nls.zh-cn.json b/extensions/iceworks-material-helper/package.nls.zh-cn.json index 5974a2c88..b112a149a 100644 --- a/extensions/iceworks-material-helper/package.nls.zh-cn.json +++ b/extensions/iceworks-material-helper/package.nls.zh-cn.json @@ -2,5 +2,6 @@ "iceworksMaterialHelper.commands.start.title": "Iceworks: 添加组件", "iceworksMaterialHelper.commands.showAllMaterialQuickPicks.title": "Iceworks: 查找组件", "iceworksMaterialHelper.commands.showDocumentMaterialQuickPicks.title": "Iceworks: 查找当前文件的组件", - "iceworksMaterialHelper.configuration.openInBrowserDescription": "是否在 VSCode 中打开网页,这个功能的实现依赖于 「Browser Preview」 插件,您需要手动安装此插件后才能使用这个功能。" + "iceworksMaterialHelper.configuration.openInBrowserDescription": "是否在 VSCode 中打开网页,这个功能的实现依赖于 「Browser Preview」 插件,您需要手动安装此插件后才能使用这个功能。", + "iceworksMaterialHelper.configuration.properties.iceworks.materialSources.description": "Iceworks 物料源,决定使用哪些物料。" } diff --git a/extensions/iceworks-style-helper/CHANGELOG.md b/extensions/iceworks-style-helper/CHANGELOG.md index 18ea1666f..649116f86 100644 --- a/extensions/iceworks-style-helper/CHANGELOG.md +++ b/extensions/iceworks-style-helper/CHANGELOG.md @@ -1,5 +1,9 @@ # Change Log +## 0.3.11 + +- fix: compatible with scenarios without material source + ## 0.3.10 - fix: if there is an active window, then do not show the welcome page diff --git a/extensions/iceworks-style-helper/package.json b/extensions/iceworks-style-helper/package.json index 3321abdd7..b5c370b5f 100644 --- a/extensions/iceworks-style-helper/package.json +++ b/extensions/iceworks-style-helper/package.json @@ -3,7 +3,7 @@ "displayName": "React Style Helper", "description": "Easily write styles(CSS/Less/SASS).", "publisher": "iceworks-team", - "version": "0.3.10", + "version": "0.3.11", "engines": { "vscode": "^1.41.0" }, diff --git a/extensions/iceworks-time-steward/CHANGELOG.md b/extensions/iceworks-time-steward/CHANGELOG.md index fd5ebe6d9..758e76746 100644 --- a/extensions/iceworks-time-steward/CHANGELOG.md +++ b/extensions/iceworks-time-steward/CHANGELOG.md @@ -1,5 +1,9 @@ # Change Log +## 0.1.5 + +- fix: compatible with scenarios without material source + ## 0.1.4 - fix: if there is an active window, then do not show the welcome page diff --git a/extensions/iceworks-time-steward/package.json b/extensions/iceworks-time-steward/package.json index ae5a8267e..e2df53b0a 100644 --- a/extensions/iceworks-time-steward/package.json +++ b/extensions/iceworks-time-steward/package.json @@ -3,7 +3,7 @@ "displayName": "Iceworks Time Steward(Beta)", "description": "Metrics, insights, and time tracking automatically generated from your programming activity.", "publisher": "iceworks-team", - "version": "0.1.4", + "version": "0.1.5", "engines": { "vscode": "^1.41.0" }, diff --git a/packages/common-service/package.json b/packages/common-service/package.json index 4ecaedaf1..8f79fd12c 100644 --- a/packages/common-service/package.json +++ b/packages/common-service/package.json @@ -1,6 +1,6 @@ { "name": "@iceworks/common-service", - "version": "0.1.20", + "version": "0.1.21", "description": "Iceworks common service for VSCode extension.", "files": [ "lib" diff --git a/packages/common-service/src/index.ts b/packages/common-service/src/index.ts index 2d43cb423..e0ab9a57a 100644 --- a/packages/common-service/src/index.ts +++ b/packages/common-service/src/index.ts @@ -145,28 +145,30 @@ function onChangeActiveTextEditor(context: vscode.ExtensionContext) { context.subscriptions ); } + +/** + * Compatible: + * If there is an official material source, remove it. + * The official material source will be added automatically when it is obtained. + */ const didSetMaterialSourceStateKey = 'iceworks.materialSourceIsSet'; async function autoInitMaterialSource(globalState: vscode.Memento) { const materialSourceIsSet = globalState.get(didSetMaterialSourceStateKey); if (!materialSourceIsSet) { - console.log('autoInitMaterialSource: do'); const materialSources = getDataFromSettingJson(CONFIGURATION_KEY_MATERIAL_SOURCES); - // old materialSources and remove it from the previous users const officalMaterialSources = [ 'http://ice.alicdn.com/assets/materials/react-materials.json', ALI_FUSION_MATERIAL_URL, ]; - const newSources = materialSources.filter( + const newSources = Array.isArray(materialSources) ? materialSources.filter( (materialSource) => !officalMaterialSources.includes(materialSource.source) - ); + ) : []; saveDataToSettingJson(CONFIGURATION_KEY_MATERIAL_SOURCES, newSources); } vscode.workspace.onDidChangeConfiguration(function (event: vscode.ConfigurationChangeEvent) { const isTrue = event.affectsConfiguration(CONFIGURATION_KEY_MATERIAL_SOURCES); if (isTrue) { - console.log('autoSetPackageManager: did change'); - globalState.update(didSetMaterialSourceStateKey, true); } });