diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 998a87e85..c7ac4b004 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -21,7 +21,7 @@ Hi! I’m really excited that you are interested in contributing to AppWorks. Be
Clone repo and initialize the setup environment:
```bash
-$ git clone git@github.com:appworks-lab/appworks.git
+$ git clone git@github.com:apptools-lab/appworks.git
$ cd appworks && npm run setup # This will take about 20 minutes
# add dep to some package
@@ -114,7 +114,7 @@ Get a Personal Access Token:
Set Personal Access Token for Github Actions:
-1. Visit [Actions secrets](https://github.com/appworks-lab/appworks/settings/secrets/actions)
+1. Visit [Actions secrets](https://github.com/apptools-lab/appworks/settings/secrets/actions)
2. Update `VSCE_TOKEN`:

diff --git a/.github/DOCUMENT_SPECIFIC.md b/.github/DOCUMENT_SPECIFIC.md
index 62771f408..01c40f32e 100644
--- a/.github/DOCUMENT_SPECIFIC.md
+++ b/.github/DOCUMENT_SPECIFIC.md
@@ -46,7 +46,7 @@
## License
-[MIT](https://github.com/appworks-lab/appworks/blob/master/LICENSE)
+[MIT](https://github.com/apptools-lab/appworks/blob/master/LICENSE)
```
- When there is only one function, there is no need for a three-level title
diff --git a/.github/O2_SPECIFIC.md b/.github/O2_SPECIFIC.md
index 1ddcca15d..d3b91ef49 100644
--- a/.github/O2_SPECIFIC.md
+++ b/.github/O2_SPECIFIC.md
@@ -9,7 +9,7 @@ AppWorks converts VS Code Pack to O2 Pack, this document describes the develop,
General O2 pack by following commands:
```bash
-$ git clone git@github.com:appworks-lab/appworks.git
+$ git clone git@github.com:apptools-lab/appworks.git
$ cd appworks/
$ npm install
# before run this script, modify `pushExtension2Npm` param which is in `./config.ts` to true when publish to tnpm
diff --git a/README.md b/README.md
index 80a3b4216..53050e981 100644
--- a/README.md
+++ b/README.md
@@ -15,8 +15,8 @@ English | [简体中文](./README.zh-CN.md)
-
-
+
+
@@ -35,7 +35,7 @@ Use AppWorks to develop Universal Application quickly:
## Contributors
-Feel free to report any questions as an [issue](https://github.com/appworks-lab/appworks/issues/new), we'd love to have your helping hand on AppWorks.
+Feel free to report any questions as an [issue](https://github.com/apptools-lab/appworks/issues/new), we'd love to have your helping hand on AppWorks.
If you're interested in AppWorks, see [CONTRIBUTING.md](./.github/CONTRIBUTING.md) for more information to learn how to get started.
diff --git a/README.zh-CN.md b/README.zh-CN.md
index b1d485dca..49256e5cf 100644
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -15,9 +15,9 @@
{window.USE_EN ? 'Scan Failed, open ' : '扫描失败,请至 '}
-
- https://github.com/appworks-lab/appworks/issues
+
+ https://github.com/apptools-lab/appworks/issues
{window.USE_EN ? ' report your problem' : ' 反馈'}
diff --git a/extensions/material-helper/CHANGELOG.md b/extensions/material-helper/CHANGELOG.md
index a54bb6f80..88c6d2893 100644
--- a/extensions/material-helper/CHANGELOG.md
+++ b/extensions/material-helper/CHANGELOG.md
@@ -1,5 +1,9 @@
# Change Log
+## 1.1.2
+
+- feat: update appworks-lab to apptools-lab
+
## 1.1.1
- feat: support select different component type
@@ -195,7 +199,7 @@
## 0.1.4
-Fix React component completion items, See: https://github.com/appworks-lab/appworks/issues/233
+Fix React component completion items, See: https://github.com/apptools-lab/appworks/issues/233
## 0.1.3
diff --git a/extensions/material-helper/README.md b/extensions/material-helper/README.md
index dec0b48d0..2f5207337 100644
--- a/extensions/material-helper/README.md
+++ b/extensions/material-helper/README.md
@@ -1,4 +1,4 @@
-English | [简体中文](https://github.com/appworks-lab/appworks/blob/master/extensions/material-helper/README.zh-CN.md)
+English | [简体中文](https://github.com/apptools-lab/appworks/blob/master/extensions/material-helper/README.zh-CN.md)
# Component Helper
diff --git a/extensions/material-helper/README.zh-CN.md b/extensions/material-helper/README.zh-CN.md
index 8f12e83c2..36f3e6cb3 100644
--- a/extensions/material-helper/README.zh-CN.md
+++ b/extensions/material-helper/README.zh-CN.md
@@ -1,4 +1,4 @@
-简体中文 | [English](https://github.com/appworks-lab/appworks/blob/master/extensions/material-helper/README.md)
+简体中文 | [English](https://github.com/apptools-lab/appworks/blob/master/extensions/material-helper/README.md)
# 前端组件开发辅助插件
diff --git a/extensions/material-helper/package.json b/extensions/material-helper/package.json
index 012aa7a3a..5277c3011 100644
--- a/extensions/material-helper/package.json
+++ b/extensions/material-helper/package.json
@@ -3,7 +3,7 @@
"displayName": "Component Helper",
"description": "Easily use Component in React/Vue/Rax.",
"publisher": "iceworks-team",
- "version": "1.1.1",
+ "version": "1.1.2",
"main": "./build/extension.js",
"engines": {
"vscode": "^1.41.0"
@@ -379,11 +379,11 @@
},
"repository": {
"type": "git",
- "url": "https://github.com/appworks-lab/appworks.git"
+ "url": "https://github.com/apptools-lab/appworks.git"
},
- "homepage": "https://github.com/appworks-lab/appworks/blob/master/extensions/material-helper/README.md",
+ "homepage": "https://github.com/apptools-lab/appworks/blob/master/extensions/material-helper/README.md",
"bugs": {
- "url": "https://github.com/appworks-lab/appworks/issues",
+ "url": "https://github.com/apptools-lab/appworks/issues",
"email": "iceworksteam@163.com"
},
"extensionDependencies": [
diff --git a/extensions/material-helper/web/package.json b/extensions/material-helper/web/package.json
index 23808eef8..73e6be9b5 100644
--- a/extensions/material-helper/web/package.json
+++ b/extensions/material-helper/web/package.json
@@ -38,6 +38,6 @@
},
"repository": {
"type": "git",
- "url": "https://github.com/appworks-lab/appworks.git"
+ "url": "https://github.com/apptools-lab/appworks.git"
}
}
diff --git a/extensions/project-creator/CHANGELOG.md b/extensions/project-creator/CHANGELOG.md
index 5a8b29821..f329969cc 100644
--- a/extensions/project-creator/CHANGELOG.md
+++ b/extensions/project-creator/CHANGELOG.md
@@ -1,5 +1,9 @@
# Changelog
+## 1.0.7
+
+- feat: update appworks-lab to apptools-lab
+
## 1.0.6
- fix: remove loop extensionDependencies
@@ -16,12 +20,12 @@
## 1.0.3
-- feat: support double click to select scaffold. [#872](https://github.com/appworks-lab/appworks/issues/872)
+- feat: support double click to select scaffold. [#872](https://github.com/apptools-lab/appworks/issues/872)
- fix: service api(setUserInfo) not found
## 1.0.2
-- fix: rax-spa project targets null problem. [#861](https://github.com/appworks-lab/appworks/issues/861)
+- fix: rax-spa project targets null problem. [#861](https://github.com/apptools-lab/appworks/issues/861)
- fix .vscodeignore configuration [#576](https://github.com/microsoft/vscode-vsce/issues/576)
## 1.0.1
diff --git a/extensions/project-creator/README.md b/extensions/project-creator/README.md
index e29977c00..e6060baa9 100644
--- a/extensions/project-creator/README.md
+++ b/extensions/project-creator/README.md
@@ -1,4 +1,4 @@
-English | [简体中文](https://github.com/appworks-lab/appworks/blob/master/extensions/project-creator/README.zh-CN.md)
+English | [简体中文](https://github.com/apptools-lab/appworks/blob/master/extensions/project-creator/README.zh-CN.md)
# Application Creator
diff --git a/extensions/project-creator/README.zh-CN.md b/extensions/project-creator/README.zh-CN.md
index 063d9dc1f..bc3765fa6 100644
--- a/extensions/project-creator/README.zh-CN.md
+++ b/extensions/project-creator/README.zh-CN.md
@@ -1,4 +1,4 @@
-简体中文 | [English](https://github.com/appworks-lab/appworks/blob/master/extensions/project-creator/README.md)
+简体中文 | [English](https://github.com/apptools-lab/appworks/blob/master/extensions/project-creator/README.md)
# 应用创建器
diff --git a/extensions/project-creator/package.json b/extensions/project-creator/package.json
index cb4e40873..a02543ed7 100644
--- a/extensions/project-creator/package.json
+++ b/extensions/project-creator/package.json
@@ -3,7 +3,7 @@
"displayName": "Application Creator",
"description": "Quick create a Universal Application(React/Rax/Vue, etc).",
"publisher": "iceworks-team",
- "version": "1.0.6",
+ "version": "1.0.7",
"engines": {
"vscode": "^1.41.0"
},
@@ -53,7 +53,7 @@
},
"repository": {
"type": "git",
- "url": "https://github.com/appworks-lab/appworks.git"
+ "url": "https://github.com/apptools-lab/appworks.git"
},
"scripts": {
"vscode:prepublish": "rm -rf build && npm run build:web && npm run build:extension",
@@ -83,9 +83,9 @@
"@appworks/connector": "^0.1.0",
"js-base64": "^3.6.0"
},
- "homepage": "https://github.com/appworks-lab/appworks/blob/master/extensions/project-creator/README.md",
+ "homepage": "https://github.com/apptools-lab/appworks/blob/master/extensions/project-creator/README.md",
"bugs": {
- "url": "https://github.com/appworks-lab/appworks/issues",
+ "url": "https://github.com/apptools-lab/appworks/issues",
"email": "iceworksteam@163.com"
}
}
diff --git a/extensions/project-creator/web/package.json b/extensions/project-creator/web/package.json
index f56125d18..1f808d805 100644
--- a/extensions/project-creator/web/package.json
+++ b/extensions/project-creator/web/package.json
@@ -39,6 +39,6 @@
},
"repository": {
"type": "git",
- "url": "https://github.com/appworks-lab/appworks.git"
+ "url": "https://github.com/apptools-lab/appworks.git"
}
}
diff --git a/extensions/react-generator/CHANGELOG.md b/extensions/react-generator/CHANGELOG.md
index 6fd16c2fb..25cffab47 100644
--- a/extensions/react-generator/CHANGELOG.md
+++ b/extensions/react-generator/CHANGELOG.md
@@ -1,5 +1,9 @@
# Change Log
+## 1.0.1
+
+- feat: update appworks-lab to apptools-lab
+
## 1.0.0
Release 1.0.0
\ No newline at end of file
diff --git a/extensions/react-generator/README.md b/extensions/react-generator/README.md
index 4ff15fd44..4c3b20b23 100644
--- a/extensions/react-generator/README.md
+++ b/extensions/react-generator/README.md
@@ -1,6 +1,6 @@
# React Generator
-English | [简体中文](https://github.com/appworks-lab/appworks/blob/master/extensions/react-generator/README.zh-CN.md)
+English | [简体中文](https://github.com/apptools-lab/appworks/blob/master/extensions/react-generator/README.zh-CN.md)
[](https://marketplace.visualstudio.com/items?itemName=iceworks-team.iceworks-generator)
[](https://marketplace.visualstudio.com/items?itemName=iceworks-team.iceworks-generator)
diff --git a/extensions/react-generator/README.zh-CN.md b/extensions/react-generator/README.zh-CN.md
index 40d8426b5..4770d3f1e 100644
--- a/extensions/react-generator/README.zh-CN.md
+++ b/extensions/react-generator/README.zh-CN.md
@@ -1,6 +1,6 @@
# React 代码生成器
-English | [简体中文](https://github.com/appworks-lab/appworks/blob/master/extensions/react-generator/README.zh-CN.md)
+English | [简体中文](https://github.com/apptools-lab/appworks/blob/master/extensions/react-generator/README.zh-CN.md)
[](https://marketplace.visualstudio.com/items?itemName=iceworks-team.iceworks-generator)
[](https://marketplace.visualstudio.com/items?itemName=iceworks-team.iceworks-generator)
diff --git a/extensions/react-generator/package.json b/extensions/react-generator/package.json
index 38dc12595..70764f9fd 100644
--- a/extensions/react-generator/package.json
+++ b/extensions/react-generator/package.json
@@ -4,7 +4,7 @@
"description": "Easily create React/Rax boilerplate code.",
"publisher": "iceworks-team",
"icon": "assets/logo.png",
- "version": "1.0.0",
+ "version": "1.0.1",
"engines": {
"vscode": "^1.41.0"
},
@@ -27,10 +27,10 @@
"main": "./build/extension.js",
"repository": {
"type": "git",
- "url": "https://github.com/appworks-lab/appworks.git"
+ "url": "https://github.com/apptools-lab/appworks.git"
},
"bugs": {
- "url": "https://github.com/appworks-lab/appworks/issues",
+ "url": "https://github.com/apptools-lab/appworks/issues",
"email": "iceworksteam@163.com"
},
"scripts": {
diff --git a/extensions/react-refactor/CHANGELOG.md b/extensions/react-refactor/CHANGELOG.md
index 14ac43671..2af520f19 100644
--- a/extensions/react-refactor/CHANGELOG.md
+++ b/extensions/react-refactor/CHANGELOG.md
@@ -1,5 +1,9 @@
# Change Log
+## 1.0.3
+
+- feat: update appworks-lab to apptools-lab
+
## 1.0.2
- fix: remove referenced identifiers in ArrayPattern and ObjectPattern
diff --git a/extensions/react-refactor/README.md b/extensions/react-refactor/README.md
index 2c4ef0acb..bf6c51f0a 100644
--- a/extensions/react-refactor/README.md
+++ b/extensions/react-refactor/README.md
@@ -1,6 +1,6 @@
# React Refactor
-English | [简体中文](https://github.com/appworks-lab/appworks/blob/master/extensions/react-refactor/README.zh-CN.md)
+English | [简体中文](https://github.com/apptools-lab/appworks/blob/master/extensions/react-refactor/README.zh-CN.md)
[](https://marketplace.visualstudio.com/items?itemName=iceworks-team.iceworks-refactor)
[](https://marketplace.visualstudio.com/items?itemName=iceworks-team.iceworks-refactor)
diff --git a/extensions/react-refactor/README.zh-CN.md b/extensions/react-refactor/README.zh-CN.md
index 3d58d701b..cfd9311d1 100644
--- a/extensions/react-refactor/README.zh-CN.md
+++ b/extensions/react-refactor/README.zh-CN.md
@@ -1,6 +1,6 @@
# React 代码重构
-English | [简体中文](https://github.com/appworks-lab/appworks/blob/master/extensions/react-refactor/README.zh-CN.md)
+English | [简体中文](https://github.com/apptools-lab/appworks/blob/master/extensions/react-refactor/README.zh-CN.md)
[](https://marketplace.visualstudio.com/items?itemName=iceworks-team.iceworks-refactor)
[](https://marketplace.visualstudio.com/items?itemName=iceworks-team.iceworks-refactor)
diff --git a/extensions/react-refactor/package.json b/extensions/react-refactor/package.json
index 20d387b18..f5a28d559 100644
--- a/extensions/react-refactor/package.json
+++ b/extensions/react-refactor/package.json
@@ -4,7 +4,7 @@
"description": "Easily refactor Component in React/Rax.",
"publisher": "iceworks-team",
"icon": "assets/logo.png",
- "version": "1.0.2",
+ "version": "1.0.3",
"engines": {
"vscode": "^1.41.0"
},
@@ -57,10 +57,10 @@
"main": "./build/extension.js",
"repository": {
"type": "git",
- "url": "https://github.com/appworks-lab/appworks.git"
+ "url": "https://github.com/apptools-lab/appworks.git"
},
"bugs": {
- "url": "https://github.com/appworks-lab/appworks/issues",
+ "url": "https://github.com/apptools-lab/appworks/issues",
"email": "iceworksteam@163.com"
},
"scripts": {
diff --git a/extensions/style-helper/CHANGELOG.md b/extensions/style-helper/CHANGELOG.md
index 3155accb1..b7a31d2ba 100644
--- a/extensions/style-helper/CHANGELOG.md
+++ b/extensions/style-helper/CHANGELOG.md
@@ -1,5 +1,9 @@
# Change Log
+## 1.1.0
+- feat: add `className={}` completion item
+- feat: add `styles` completion item and auto import module style file
+
## 1.0.1
- feat: support *.less style.
- feat: upgrade [css](https://www.npmjs.com/package/css) fix `@media` parse failed.
diff --git a/extensions/style-helper/README.md b/extensions/style-helper/README.md
index 09992e674..5e979824a 100644
--- a/extensions/style-helper/README.md
+++ b/extensions/style-helper/README.md
@@ -1,4 +1,4 @@
-English | [简体中文](https://github.com/appworks-lab/appworks/blob/master/extensions/style-helper/README.zh-CN.md)
+English | [简体中文](https://github.com/apptools-lab/appworks/blob/master/extensions/style-helper/README.zh-CN.md)
# React Style Helper
@@ -15,6 +15,7 @@ Which supports:
* Go to definition
* Create JSX/TSX inline CSS styles
* Preview style and variable values
+* Auto import CSS Modules file
## Demo
@@ -26,6 +27,10 @@ Automatic completion for inline style. You can also preview SASS variable value

+Automatic import for CSS Modules file.
+
+
+
## Usage
Hover over the 'className' value, and the hover board displays the style declaration corresponding to the value.
diff --git a/extensions/style-helper/README.zh-CN.md b/extensions/style-helper/README.zh-CN.md
index b8d9f43a5..bf516438c 100644
--- a/extensions/style-helper/README.zh-CN.md
+++ b/extensions/style-helper/README.zh-CN.md
@@ -1,4 +1,4 @@
-简体中文 | [English](https://github.com/appworks-lab/appworks/blob/master/extensions/style-helper/README.md)
+简体中文 | [English](https://github.com/apptools-lab/appworks/blob/master/extensions/style-helper/README.md)
# React 样式开发辅助插件
@@ -15,6 +15,7 @@
* 跳转至样式和变量定义位置
* 创建 JSX/TSX 的行内样式
* 预览样式及变量内容
+* 自动 import CSS Modules 文件
## 示例
@@ -26,6 +27,10 @@

+自动 import CSS Modules 文件。
+
+
+
## 使用
预览:鼠标停留在 `className` 或 SASS 变量上,出现悬浮部件显示该值对应的样式声明
diff --git a/extensions/style-helper/package.json b/extensions/style-helper/package.json
index c82e15c4e..bc3418b9f 100644
--- a/extensions/style-helper/package.json
+++ b/extensions/style-helper/package.json
@@ -3,7 +3,7 @@
"displayName": "React Style Helper",
"description": "Easily write styles(CSS/LESS/SASS).",
"publisher": "iceworks-team",
- "version": "1.0.1",
+ "version": "1.1.0",
"engines": {
"vscode": "^1.41.0"
},
@@ -22,6 +22,7 @@
"Less",
"CSS",
"ClassName",
+ "CSS Modules",
"appworks"
],
"icon": "assets/logo.png",
@@ -37,7 +38,7 @@
],
"repository": {
"type": "git",
- "url": "https://github.com/appworks-lab/appworks.git"
+ "url": "https://github.com/apptools-lab/appworks.git"
},
"main": "./build/extension.js",
"scripts": {
@@ -71,10 +72,10 @@
"webpack-cli": "^3.3.12"
},
"dependencies": {
+ "@appworks/common-service": "^0.1.0",
+ "@appworks/recorder": "^1.0.1",
"@babel/parser": "^7.10.3",
"@babel/traverse": "^7.10.3",
- "@appworks/common-service": "^0.1.0",
- "@appworks/recorder": "^0.1.0",
"css": "^3.0.0",
"css-flatten": "^1.0.1",
"datauri": "^2.0.0",
@@ -82,9 +83,9 @@
"tinycolor2": "^1.4.1",
"vscode-web-custom-data": "^0.1.4"
},
- "homepage": "https://github.com/appworks-lab/appworks/blob/master/extensions/style-helper/README.md",
+ "homepage": "https://github.com/apptools-lab/appworks/blob/master/extensions/style-helper/README.md",
"bugs": {
- "url": "https://github.com/appworks-lab/appworks/issues",
+ "url": "https://github.com/apptools-lab/appworks/issues",
"email": "iceworksteam@163.com"
}
}
diff --git a/extensions/style-helper/src/extension.ts b/extensions/style-helper/src/extension.ts
index c198adf3b..900ce9373 100644
--- a/extensions/style-helper/src/extension.ts
+++ b/extensions/style-helper/src/extension.ts
@@ -3,6 +3,7 @@ import { Recorder, recordCompletionItemSelect } from '@appworks/recorder';
import { registerCommand, initExtension } from '@appworks/common-service';
import cssClassAutoCompete from './cssClassAutoCompete';
import inlineStyleAutoComplete from './inlineStyleAutoComplete';
+import jsxVarStylesComplete from './jsxVarStylesComplete';
import styleInfoViewer from './styleInfoViewer';
import sassVariablesViewer from './sassVariablesViewer';
@@ -19,6 +20,7 @@ export function activate(context: vscode.ExtensionContext) {
cssClassAutoCompete(context);
inlineStyleAutoComplete(context);
+ jsxVarStylesComplete(context);
styleInfoViewer(context);
sassVariablesViewer(context);
diff --git a/extensions/style-helper/src/getCompletionItem.ts b/extensions/style-helper/src/getCompletionItem.ts
new file mode 100644
index 000000000..e40389e8f
--- /dev/null
+++ b/extensions/style-helper/src/getCompletionItem.ts
@@ -0,0 +1,23 @@
+import { CompletionItem, CompletionItemKind, MarkdownString, SnippetString, TextEdit } from 'vscode';
+
+export default function getCompletionItem(
+ showText: string,
+ itemKind: string,
+ insertText?: string | SnippetString,
+ documentation?: string | MarkdownString,
+ additionalTextEdits?: TextEdit[],
+): CompletionItem {
+ const completionItem = new CompletionItem(showText, CompletionItemKind[itemKind]);
+ if (insertText) {
+ completionItem.insertText = insertText;
+ }
+ if (documentation) {
+ completionItem.documentation = documentation;
+ }
+ if (additionalTextEdits) {
+ completionItem.additionalTextEdits = additionalTextEdits;
+ }
+ completionItem.detail = 'AppWorks';
+ completionItem.command = { command: 'style-helper.recordCompletionItemSelect', title: '' };
+ return completionItem;
+}
diff --git a/extensions/style-helper/src/inlineStyleAutoComplete/getCompletionItem.ts b/extensions/style-helper/src/inlineStyleAutoComplete/getCompletionItem.ts
deleted file mode 100644
index 5f4da05c3..000000000
--- a/extensions/style-helper/src/inlineStyleAutoComplete/getCompletionItem.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import * as vscode from 'vscode';
-
-export default function getCompletionItem(
- text: string,
- description: string,
- documentation = '',
- insertText = '',
- itemKind = 'Property',
-): vscode.CompletionItem {
- const completionItem = new vscode.CompletionItem(text, vscode.CompletionItemKind[itemKind]);
- completionItem.detail = 'AppWorks';
- completionItem.insertText = insertText;
- completionItem.command = { command: 'style-helper.recordCompletionItemSelect', title: '' };
- if (documentation) {
- completionItem.documentation = new vscode.MarkdownString(`**${description}** \n ${documentation}`);
- }
- return completionItem;
-}
diff --git a/extensions/style-helper/src/inlineStyleAutoComplete/index.ts b/extensions/style-helper/src/inlineStyleAutoComplete/index.ts
index eafaec5bf..fc199d0e4 100644
--- a/extensions/style-helper/src/inlineStyleAutoComplete/index.ts
+++ b/extensions/style-helper/src/inlineStyleAutoComplete/index.ts
@@ -2,7 +2,7 @@ import * as vscode from 'vscode';
import { recordCompletionItemProvider } from '@appworks/recorder';
import CSSData, { IProperty, IPropertyValue } from 'vscode-web-custom-data/data/browsers.css-data.json';
import { getFocusCodeInfo } from '../getFocusCodeInfo';
-import getCompletionItem from './getCompletionItem';
+import getCompletionItem from '../getCompletionItem';
import isEditStyleKey from './isEditStyleKey';
const CSS_PROPERTIES = {};
@@ -74,9 +74,9 @@ function provideCompletionItems(document: vscode.TextDocument, position: vscode.
completions.push(
getCompletionItem(
propertyName,
- property.description,
- `${CSS_DOCS_URL}/${property.name}`, // Docs
+ 'Property',
`${propertyName}: `, // EXP position:
+ new vscode.MarkdownString(`**${property.description}** \n ${CSS_DOCS_URL}/${property.name}`), // Docs
),
);
}
@@ -94,10 +94,9 @@ function provideCompletionItems(document: vscode.TextDocument, position: vscode.
completions.push(
getCompletionItem(
value.name,
- value.description || '',
- `${CSS_DOCS_URL}/${property.name}#Values`, // Docs
- `'${value.name}'${!isEndsWithComma(currentText) ? ',' : ''}`, // EXP 'relative',
'Value',
+ `'${value.name}'${!isEndsWithComma(currentText) ? ',' : ''}`, // EXP 'relative',
+ new vscode.MarkdownString(`**${value.description || ''}** \n ${CSS_DOCS_URL}/${property.name}#Values`), // Docs
),
);
}
diff --git a/extensions/style-helper/src/jsxVarStylesComplete/getFilenameWithoutExtname.ts b/extensions/style-helper/src/jsxVarStylesComplete/getFilenameWithoutExtname.ts
new file mode 100644
index 000000000..9dc76146b
--- /dev/null
+++ b/extensions/style-helper/src/jsxVarStylesComplete/getFilenameWithoutExtname.ts
@@ -0,0 +1,9 @@
+import * as path from 'path';
+
+export default (fileName: string): string => {
+ if (['.js', '.ts', '.jsx', '.tsx'].includes(path.extname(fileName))) {
+ return path.basename(fileName, path.extname(fileName));
+ } else {
+ return fileName;
+ }
+};
diff --git a/extensions/style-helper/src/jsxVarStylesComplete/index.ts b/extensions/style-helper/src/jsxVarStylesComplete/index.ts
new file mode 100644
index 000000000..8630d2b67
--- /dev/null
+++ b/extensions/style-helper/src/jsxVarStylesComplete/index.ts
@@ -0,0 +1,74 @@
+import * as fs from 'fs';
+import * as vscode from 'vscode';
+import * as babelParser from '@babel/parser';
+import getCompletionItem from '../getCompletionItem';
+import { getFocusCodeInfo } from '../getFocusCodeInfo';
+import getFilenameWithoutExtname from './getFilenameWithoutExtname';
+
+function getImportDeclarations(tree) {
+ const { body } = tree.program;
+ return body.filter((node) => node.type === 'ImportDeclaration');
+}
+
+function provideCompletionItems(document: vscode.TextDocument, position: vscode.Position): vscode.CompletionItem[] {
+ const editorText = document.getText();
+ const { Position, TextEdit } = vscode;
+ const { directory, fileName } = getFocusCodeInfo(document, position);
+
+ const completions: vscode.CompletionItem[] = [];
+
+ // className={}
+ completions.push(getCompletionItem('className={}', 'Text'));
+
+ // if already use style or has import css file, ignore
+ if (
+ editorText.indexOf('style') !== -1 ||
+ /\.(less|css|scss)$/.test(editorText)
+ ) {
+ return completions;
+ }
+
+ // add styles completion item and auto import
+ let newImport = '';
+ fs.readdirSync(directory).forEach((file) => {
+ if (new RegExp(`${getFilenameWithoutExtname(fileName)}.module.(less|css|scss)$`).test(file)) {
+ newImport = `import styles from './${file}';`;
+ }
+ });
+
+ if (newImport) {
+ const ast = babelParser.parse(editorText, {
+ // Support JSX and TS
+ plugins: ['typescript', 'jsx'],
+ sourceType: 'module',
+ });
+
+ let positionForNewImport = new Position(0, 0);
+ const importASTNodes = getImportDeclarations(ast);
+ const lastImportNode = importASTNodes[importASTNodes.length - 1];
+ if (lastImportNode) {
+ positionForNewImport = new Position(lastImportNode.loc.end.line, 0);
+ }
+
+ completions.push(
+ getCompletionItem(
+ 'styles', 'Property', 'styles',
+ new vscode.MarkdownString(`**Auto import** \n ${newImport}`), // Docs
+ [TextEdit.insert(positionForNewImport, `${newImport}\n`)],
+ ),
+ );
+ }
+ return completions;
+}
+
+export default function jsxVarStylesComplete(context: vscode.ExtensionContext): void {
+ context.subscriptions.push(
+ vscode.languages.registerCompletionItemProvider(
+ [
+ { scheme: 'file', language: 'javascriptreact' },
+ { scheme: 'file', language: 'typescriptreact' },
+ ],
+ { provideCompletionItems },
+ ),
+ );
+}
diff --git a/extensions/time-master/CHANGELOG.md b/extensions/time-master/CHANGELOG.md
index 8c6c4df54..c877e2579 100644
--- a/extensions/time-master/CHANGELOG.md
+++ b/extensions/time-master/CHANGELOG.md
@@ -1,5 +1,9 @@
# Change Log
+## 1.0.3
+
+- feat: update appworks-lab to apptools-lab
+
## 1.0.2
- feat: add `enableDataAnalysisServices` configuration
diff --git a/extensions/time-master/README.md b/extensions/time-master/README.md
index 081ccec23..ce117be01 100644
--- a/extensions/time-master/README.md
+++ b/extensions/time-master/README.md
@@ -1,4 +1,4 @@
-English | [简体中文](https://github.com/appworks-lab/appworks/blob/master/extensions/time-master/README.zh-CN.md)
+English | [简体中文](https://github.com/apptools-lab/appworks/blob/master/extensions/time-master/README.zh-CN.md)
# Time Master
diff --git a/extensions/time-master/README.zh-CN.md b/extensions/time-master/README.zh-CN.md
index 22097647c..4b6000a8c 100644
--- a/extensions/time-master/README.zh-CN.md
+++ b/extensions/time-master/README.zh-CN.md
@@ -1,4 +1,4 @@
-简体中文 | [English](https://github.com/appworks-lab/appworks/blob/master/extensions/time-master/README.md)
+简体中文 | [English](https://github.com/apptools-lab/appworks/blob/master/extensions/time-master/README.md)
# 时间管理大师
@@ -29,7 +29,7 @@
- **从不访问您的代码**:我们不处理、发送或存储您的代码。
- **您的数据是私有的**:我们不会与任何人共享您的个人数据。
-最重要的一点,插件代码是[开源](https://github.com/appworks-lab/appworks/tree/master/extensions/iceworks-time-master)的,您可以很容易地看到我们对于数据处理的实现。
+最重要的一点,插件代码是[开源](https://github.com/apptools-lab/appworks/tree/master/extensions/iceworks-time-master)的,您可以很容易地看到我们对于数据处理的实现。
> 备注 1:这是针对社区开发者而言的,如果您是阿里内部用户,我们将默认上传您的数据。
>
diff --git a/extensions/time-master/package.json b/extensions/time-master/package.json
index a0094c303..ac714d9b4 100644
--- a/extensions/time-master/package.json
+++ b/extensions/time-master/package.json
@@ -3,7 +3,7 @@
"displayName": "Time Master",
"description": "Metrics, insights, and time tracking automatically generated from your programming activity.",
"publisher": "iceworks-team",
- "version": "1.0.2",
+ "version": "1.0.3",
"engines": {
"vscode": "^1.41.0"
},
@@ -73,7 +73,7 @@
},
"repository": {
"type": "git",
- "url": "https://github.com/appworks-lab/appworks.git"
+ "url": "https://github.com/apptools-lab/appworks.git"
},
"main": "./build/extension.js",
"scripts": {
@@ -114,9 +114,9 @@
"node-cache": "^5.1.2",
"numeral": "^2.0.6"
},
- "homepage": "https://github.com/appworks-lab/appworks/blob/master/extensions/time-master/README.md",
+ "homepage": "https://github.com/apptools-lab/appworks/blob/master/extensions/time-master/README.md",
"bugs": {
- "url": "https://github.com/appworks-lab/appworks/issues",
+ "url": "https://github.com/apptools-lab/appworks/issues",
"email": "iceworksteam@163.com"
}
}
diff --git a/package.json b/package.json
index b3f8b10a3..cbfa89a86 100644
--- a/package.json
+++ b/package.json
@@ -46,13 +46,13 @@
},
"repository": {
"type": "git",
- "url": "git+https://github.com/appworks-lab/appworks.git"
+ "url": "git+https://github.com/apptools-lab/appworks.git"
},
"license": "ISC",
"bugs": {
- "url": "https://github.com/appworks-lab/appworks/issues"
+ "url": "https://github.com/apptools-lab/appworks/issues"
},
- "homepage": "https://github.com/appworks-lab/appworks#readme",
+ "homepage": "https://github.com/apptools-lab/appworks#readme",
"devDependencies": {
"@commitlint/cli": "^12.1.1",
"@appworks/constant": "^0.1.0",
diff --git a/packages/doctor-ui/src/index.tsx b/packages/doctor-ui/src/index.tsx
index 176507056..ed139e636 100644
--- a/packages/doctor-ui/src/index.tsx
+++ b/packages/doctor-ui/src/index.tsx
@@ -31,8 +31,8 @@ const Dashboard = (props: Props) => {
{locale.projectRating} }>
{locale.haveProblem}
-
- https://github.com/appworks-lab/appworks/issues
+
+ https://github.com/apptools-lab/appworks/issues
{locale.reportProblem}
diff --git a/packages/doctor/README.md b/packages/doctor/README.md
index 271972d48..a8f203c5a 100644
--- a/packages/doctor/README.md
+++ b/packages/doctor/README.md
@@ -51,7 +51,7 @@ $ appworks-doctor -s ./ --ignore types mock
* fix?: boolean, whether fix ESLint fixable problems.
* framework?: string, target project framework, default is `react`.
-* transforms?: string[], you want to run code transform keys, from [@appworks/codemod](https://github.com/appworks-lab/codemod/)
+* transforms?: string[], you want to run code transform keys, from [@appworks/codemod](https://github.com/apptools-lab/codemod/)
* languageType?: 'js'|'ts', target project languageType, default is `js`.
* tempFileDir?: string, set temp reporters file directory, default is `node_modules/@appworks/doctor/tmp/`.
* disableESLint?: boolean, whether disable ESLint part reports.
diff --git a/packages/project-service/CHANGELOG.md b/packages/project-service/CHANGELOG.md
index 095163958..4e9bd1c2e 100644
--- a/packages/project-service/CHANGELOG.md
+++ b/packages/project-service/CHANGELOG.md
@@ -11,7 +11,7 @@
## 0.1.1
-- fix: rax-spa project targets null problem. [#861](https://github.com/appworks-lab/appworks/issues/861)
+- fix: rax-spa project targets null problem. [#861](https://github.com/apptools-lab/appworks/issues/861)
## 0.1.0
diff --git a/packages/project-utils/src/git.ts b/packages/project-utils/src/git.ts
index 81c8dcbcc..1d7fa7bd3 100644
--- a/packages/project-utils/src/git.ts
+++ b/packages/project-utils/src/git.ts
@@ -8,9 +8,9 @@ const gitRemoteOriginUrl = require('git-remote-origin-url');
export interface GitInfo {
branch: string; // master
- repository: string; // git@github.com:appworks-lab/appworks.git
- remoteUrl: string; // https://github.com/appworks-lab/appworks
- group: string; // appworks-lab
+ repository: string; // git@github.com:apptools-lab/appworks.git
+ remoteUrl: string; // https://github.com/apptools-lab/appworks
+ group: string; // apptools-lab
project: string; // pack
tag?: string;
isGit?: boolean;
diff --git a/packages/vscode-generator/src/templates/extension/package.json.ejs b/packages/vscode-generator/src/templates/extension/package.json.ejs
index 1580ef5d7..674359bd4 100644
--- a/packages/vscode-generator/src/templates/extension/package.json.ejs
+++ b/packages/vscode-generator/src/templates/extension/package.json.ejs
@@ -20,10 +20,10 @@
"main": "./build/extension.js",
"repository": {
"type": "git",
- "url": "https://github.com/appworks-lab/appworks.git"
+ "url": "https://github.com/apptools-lab/appworks.git"
},
"bugs": {
- "url": "https://github.com/appworks-lab/appworks/issues"
+ "url": "https://github.com/apptools-lab/appworks/issues"
},
"scripts": {
"vscode:prepublish": "rm -rf build && npm run build:web && webpack --mode production",