Skip to content

Commit

Permalink
release: 0.8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
alvinhui authored Aug 31, 2020
2 parents e5de0de + 2e3616d commit 46a4a57
Show file tree
Hide file tree
Showing 126 changed files with 2,959 additions and 440 deletions.
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ English | [简体中文](./README.zh-CN.md)
<p align="center">
<a href="https://marketplace.visualstudio.com/items?itemName=iceworks-team.iceworks"><img src="https://vsmarketplacebadge.apphb.com/version/iceworks-team.iceworks.svg?logo=visual-studio-code" /></a>
<a href="https://marketplace.visualstudio.com/items?itemName=iceworks-team.iceworks"><img src="https://vsmarketplacebadge.apphb.com/installs-short/iceworks-team.iceworks.svg" /></a>
<a href="https://marketplace.visualstudio.com/items?itemName=iceworks-team.iceworks&ssr=false#review-details"><img src="https://vsmarketplacebadge.apphb.com/rating-short/iceworks-team.iceworks.svg" /></a>
<a href="https://marketplace.visualstudio.com/items?itemName=iceworks-team.iceworks"><img src="https://vsmarketplacebadge.apphb.com/downloads-short/iceworks-team.iceworks.svg" /></a>
<a href="https://marketplace.visualstudio.com/items?itemName=iceworks-team.iceworks&ssr=false#review-details"><img src="https://vsmarketplacebadge.apphb.com/rating-star/iceworks-team.iceworks.svg" /></a>
<a href="https://github.com/ice-lab/iceworks/actions"><img src="https://github.com/ice-lab/iceworks/workflows/ci/badge.svg" /></a>
<a href="https://codecov.io/gh/ice-lab/iceworks"><img src="https://img.shields.io/codecov/c/github/ice-lab/iceworks/master.svg" alt="Test Coverage" /></a>
<a href="https://github.com/ice-lab/iceworks/pulls"><img src="https://img.shields.io/badge/PRs-welcome-brightgreen.svg" alt="PRs Welcome" /></a>
Expand All @@ -28,11 +29,11 @@ Use Iceworks to develop Universal Application quickly:
- Enter "iceworks" in the input box to search
- Click the Install button on the first iceworks option

![install demo](https://img.alicdn.com/tfs/TB1jDJ7R8r0gK0jSZFnXXbRRXXa-1024-768.png)
![install demo](https://img.alicdn.com/tfs/TB1.Wz9SuH2gK0jSZJnXXaT1FXa-1024-768.png_790x10000.jpg)

After installation is successful, click the "Iceworks icon" on Activity Bar of VS Code to start:

![Iceworks](https://img.alicdn.com/tfs/TB1lyV9inM11u4jSZPxXXahcXXa-1024-768.png_790x10000.jpg)
![demo](https://img.alicdn.com/tfs/TB1Z8T0gzMZ7e4jSZFOXXX7epXa-1024-768.png_790x10000.jpg)

[See the Pack for more details](extensions/iceworks/README.md).

Expand Down
7 changes: 4 additions & 3 deletions README.zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
<p align="center">
<a href="https://marketplace.visualstudio.com/items?itemName=iceworks-team.iceworks"><img src="https://vsmarketplacebadge.apphb.com/version/iceworks-team.iceworks.svg?logo=visual-studio-code" /></a>
<a href="https://marketplace.visualstudio.com/items?itemName=iceworks-team.iceworks"><img src="https://vsmarketplacebadge.apphb.com/installs-short/iceworks-team.iceworks.svg" /></a>
<a href="https://marketplace.visualstudio.com/items?itemName=iceworks-team.iceworks&ssr=false#review-details"><img src="https://vsmarketplacebadge.apphb.com/rating-short/iceworks-team.iceworks.svg" /></a>
<a href="https://marketplace.visualstudio.com/items?itemName=iceworks-team.iceworks"><img src="https://vsmarketplacebadge.apphb.com/downloads-short/iceworks-team.iceworks.svg" /></a>
<a href="https://marketplace.visualstudio.com/items?itemName=iceworks-team.iceworks&ssr=false#review-details"><img src="https://vsmarketplacebadge.apphb.com/rating-star/iceworks-team.iceworks.svg" /></a>
<a href="https://github.com/ice-lab/iceworks/actions"><img src="https://github.com/ice-lab/iceworks/workflows/ci/badge.svg" /></a>
<a href="https://codecov.io/gh/ice-lab/iceworks"><img src="https://img.shields.io/codecov/c/github/ice-lab/iceworks/master.svg" alt="Test Coverage" /></a>
<a href="https://github.com/ice-lab/iceworks/pulls"><img src="https://img.shields.io/badge/PRs-welcome-brightgreen.svg" alt="PRs Welcome" /></a>
Expand All @@ -26,11 +27,11 @@
- 在输入框中输入「iceworks」进行搜索;
- 点击第一个「iceworks」选项上的「安装」按钮。

![install demo](https://img.alicdn.com/tfs/TB1Bm.kaCR26e4jSZFEXXbwuXXa-1024-766.gif)
![安装 Iceworks](https://img.alicdn.com/tfs/TB1vS2kg9R26e4jSZFEXXbwuXXa-1024-768.png_790x10000.jpg)

安装成功后,点击 VS Code 界面左侧活动栏上的「Iceworks 图标」,开始使用:

![使用示例](https://img.alicdn.com/tfs/TB1nk3YRQL0gK0jSZFtXXXQCXXa-1024-768.png_790x10000.jpg)
![使用示例](https://img.alicdn.com/tfs/TB1Qr7oi8Bh1e4jSZFhXXcC9VXa-1024-768.png_790x10000.jpg)

[查看套件了解更多功能](extensions/iceworks/README.md)

Expand Down
8 changes: 8 additions & 0 deletions extensions/iceworks-app/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,22 @@
# Change Log

# 0.4.7
- feat: auto focus field
- chore: quick entries title and detail
- feat: hide some entries and treeview in pegasus project

## 0.4.6

- feat: support pegasus project debugger.
- feat: add quick entries in tree view.
- fix: stop command fail.

## 0.4.5

- feat: add component-generator and component-creator quickPick.

## 0.4.4

- feat: add Iceworks debug.

## 0.4.3
Expand Down
68 changes: 50 additions & 18 deletions extensions/iceworks-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"displayName": "Iceworks Application Viewer",
"description": "Quick view your Universal Application(React/Rax/Vue, etc).",
"publisher": "iceworks-team",
"version": "0.4.6",
"version": "0.4.7",
"engines": {
"vscode": "^1.41.0"
},
Expand Down Expand Up @@ -37,7 +37,7 @@
{
"id": "welcome",
"name": "Welcome",
"when": "iceworks:isNotTargetProject"
"when": "iceworks:projectIsNotTarget"
},
{
"id": "quickEntries",
Expand All @@ -46,22 +46,22 @@
{
"id": "npmScripts",
"name": "%iceworksApp.view.npmScripts.name%",
"when": "!iceworks:isNotTargetProject"
"when": "!iceworks:projectIsNotTarget"
},
{
"id": "pages",
"name": "%iceworksApp.view.pages.name%",
"when": "!iceworks:isNotTargetProject"
"when": "!iceworks:projectIsNotTarget && !iceworks:projectIsPegasus"
},
{
"id": "components",
"name": "%iceworksApp.view.components.name%",
"when": "!iceworks:isNotTargetProject"
"when": "!iceworks:projectIsNotTarget && !iceworks:projectIsPegasus"
},
{
"id": "nodeDependencies",
"name": "%iceworksApp.view.nodeDependencies.name%",
"when": "!iceworks:isNotTargetProject"
"when": "!iceworks:projectIsNotTarget"
}
]
},
Expand Down Expand Up @@ -148,14 +148,6 @@
"dark": "assets/dark/runDev.svg"
}
},
{
"command": "iceworksApp.npmScripts.stopDev",
"title": "%iceworksApp.command.npmScripts.stopDev.title%",
"icon": {
"light": "assets/light/stop.svg",
"dark": "assets/dark/stop.svg"
}
},
{
"command": "iceworksApp.editorMenu.runBuild",
"title": "%iceworksApp.command.npmScripts.runBuild.title%",
Expand Down Expand Up @@ -272,16 +264,56 @@
"menus": {
"commandPalette": [
{
"command": "iceworksApp.nodeDependencies.reinstall"
"command": "iceworksApp.npmScripts.refresh",
"when": "false"
},
{
"command": "iceworksApp.npmScripts.run",
"when": "false"
},
{
"command": "iceworksApp.nodeDependencies.dependencies.add"
"command": "iceworksApp.npmScripts.stop",
"when": "false"
},
{
"command": "iceworksApp.nodeDependencies.devDependencies.add"
"command": "iceworksApp.pages.add",
"when": "false"
},
{
"command": "iceworksApp.nodeDependencies.addDepsAndDevDeps"
"command": "iceworksApp.pages.refresh",
"when": "false"
},
{
"command": "iceworksApp.pages.openFile",
"when": "false"
},
{
"command": "iceworksApp.pages.delete",
"when": "false"
},
{
"command": "iceworksApp.components.add",
"when": "false"
},
{
"command": "iceworksApp.components.refresh",
"when": "false"
},
{
"command": "iceworksApp.components.delete",
"when": "false"
},
{
"command": "iceworksApp.components.openFile",
"when": "false"
},
{
"command": "iceworksApp.nodeDependencies.refresh",
"when": "false"
},
{
"command": "iceworksApp.nodeDependencies.upgrade",
"when": "false"
}
],
"editor/title": [
Expand Down
22 changes: 0 additions & 22 deletions extensions/iceworks-app/src/autoSetViewContext.ts

This file was deleted.

9 changes: 9 additions & 0 deletions extensions/iceworks-app/src/autoStart.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import * as vscode from 'vscode';
import { checkIsNotTarget } from '@iceworks/project-service';

export default async function () {
const isNotTargetProject = await checkIsNotTarget();
if (isNotTargetProject) {
vscode.commands.executeCommand('iceworks-project-creator.start');
}
}
56 changes: 0 additions & 56 deletions extensions/iceworks-app/src/constants.ts
Original file line number Diff line number Diff line change
@@ -1,64 +1,8 @@
import { NodeDepTypes } from './types';
import i18n from './i18n';

export const entryFileSuffix = ['.jsx', '.js', '.tsx', '.rml', '.vue'];

export const nodeDepTypes: NodeDepTypes[] = ['dependencies', 'devDependencies'];

export const showExtensionsQuickPickCommandId = 'iceworksApp.showEntriesQuickPick';

export const editorTitleRunDebugCommandId = 'npmScripts-editor-title-run-dev';
export const editorTitleRunBuildCommandId = 'npmScripts-editor-title-run-build';

export const entryOptions = [
{
label: i18n.format('extension.iceworksApp.showEntriesQuickPick.projectCreater.label'),
detail: i18n.format('extension.iceworksApp.showEntriesQuickPick.projectCreater.detail'),
command: 'iceworks-project-creator.start',
},
{
label: i18n.format('extension.iceworksApp.showEntriesQuickPick.generateComponent.label'),
detail: i18n.format('extension.iceworksApp.showEntriesQuickPick.generateComponent.detail'),
command: 'iceworks-ui-builder.generate-component',
},
{
label: i18n.format('extension.iceworksApp.showEntriesQuickPick.pageBuilder.label'),
detail: i18n.format('extension.iceworksApp.showEntriesQuickPick.pageBuilder.detail'),
command: 'iceworks-ui-builder.generate-page',
},
{
label: i18n.format('extension.iceworksApp.showEntriesQuickPick.materialImport.label'),
detail: i18n.format('extension.iceworksApp.showEntriesQuickPick.materialImport.detail'),
command: 'iceworks-material-helper.start',
},
{
label: i18n.format('extension.iceworksApp.showEntriesQuickPick.showMaterialDocs.label'),
detail: i18n.format('extension.iceworksApp.showEntriesQuickPick.showMaterialDocs.detail'),
command: 'iceworks-material-helper.showMaterialDocs',
},
{
label: i18n.format('extension.iceworksApp.showEntriesQuickPick.runDebug.label'),
detail: i18n.format('extension.iceworksApp.showEntriesQuickPick.runDebug.detail'),
command: 'iceworksApp.editorMenu.runDebug',
},
{
label: i18n.format('extension.iceworksApp.showEntriesQuickPick.runBuild.label'),
detail: i18n.format('extension.iceworksApp.showEntriesQuickPick.runBuild.detail'),
command: 'iceworksApp.editorMenu.runBuild',
},
{
label: i18n.format('extension.iceworksApp.showEntriesQuickPick.reinstall.label'),
detail: i18n.format('extension.iceworksApp.showEntriesQuickPick.reinstall.detail'),
command: 'iceworksApp.nodeDependencies.reinstall',
},
{
label: i18n.format('extension.iceworksApp.showEntriesQuickPick.addDepsAndDevDeps.label'),
detail: i18n.format('extension.iceworksApp.showEntriesQuickPick.addDepsAndDevDeps.detail'),
command: 'iceworksApp.nodeDependencies.addDepsAndDevDeps',
},
{
label: i18n.format('extension.iceworksApp.showEntriesQuickPick.openSettings.label'),
detail: i18n.format('extension.iceworksApp.showEntriesQuickPick.openSettings.detail'),
command: 'iceworksApp.configHelper.start',
},
];
2 changes: 1 addition & 1 deletion extensions/iceworks-app/src/createEditorMenuAction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export default async function createEditorMenuAction() {
}

// Prepare VS Code debug config
setDebugConfig();
await setDebugConfig();

// Run Debug
let workspaceFolder;
Expand Down
6 changes: 3 additions & 3 deletions extensions/iceworks-app/src/debugConfig/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import * as vscode from 'vscode';
import * as fs from 'fs-extra';
import * as path from 'path';
import { parse } from 'comment-json';
import { checkIsPegasusProject } from '@iceworks/project-service';
import { getLaunchConfig, getTasksConfig } from './getDefaultConfigs';

// Iceworks debug config
Expand All @@ -26,7 +27,7 @@ function writeConfigFile(filePath: string, config: IDebugConfig) {
}

// Prepare VS Code debug config
export function setDebugConfig() {
export async function setDebugConfig() {
const { rootPath = __dirname } = vscode.workspace;

// Make .vscode directory
Expand All @@ -36,14 +37,13 @@ export function setDebugConfig() {
}

// Set pegasus service url
let isPegasusProject = false;
const isPegasusProject = await checkIsPegasusProject();
let specialLaunchUrl = '';
try {
const abcConfigFile = path.join(rootPath, 'abc.json');
if (fs.existsSync(abcConfigFile)) {
const abcConfig = fs.readJSONSync(abcConfigFile);
if (abcConfig.type === 'pegasus' && abcConfig.group && abcConfig.name) {
isPegasusProject = true;
specialLaunchUrl = `${BASE_URL}/${abcConfig.group}/${abcConfig.name}`;
}
}
Expand Down
Loading

0 comments on commit 46a4a57

Please sign in to comment.