Skip to content

Commit

Permalink
Release 0.17.2
Browse files Browse the repository at this point in the history
  • Loading branch information
alvinhui authored Feb 22, 2021
2 parents 0f0f948 + 6c2d230 commit 67fa1b0
Show file tree
Hide file tree
Showing 44 changed files with 733 additions and 286 deletions.
7 changes: 6 additions & 1 deletion extensions/iceworks-app/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
# Change Log

## 0.8.1

- feat: add actions for NODE DEPENDENCIES view
- fix: install dependency before run debug
- fix: upgrade dependency

## 0.8.0

- refactor: remove pages & components view
- refactor: move scripts&dependencies view to explorer sidebar


## 0.7.6

- fix: terminal names are the same when running npm scripts
Expand Down
2 changes: 1 addition & 1 deletion extensions/iceworks-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"displayName": "Application Manager",
"description": "Quick view your Universal Application(React/Rax/Vue, etc).",
"publisher": "iceworks-team",
"version": "0.8.0",
"version": "0.8.1",
"engines": {
"vscode": "^1.41.0"
},
Expand Down
2 changes: 1 addition & 1 deletion extensions/iceworks-app/package.nls.zh-cn.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@
"iceworksApp.configuration.properties.iceworks.showWelcomePage.description": "是否显示欢迎页",
"iceworksApp.kaitianContributes.toolbar.runDebug.title": "启动调试",
"iceworksApp.kaitianContributes.toolbar.reinstall.title": "重装依赖",
"iceworksApp.kaitianContributes.toolbar.dashboard.title": "DEF 发布"
"iceworksApp.kaitianContributes.toolbar.DefPublish.title": "DEF 发布"
}
14 changes: 1 addition & 13 deletions extensions/iceworks-app/src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@ import * as vscode from 'vscode';
import { window, ViewColumn } from 'vscode';
import { connectService, getHtmlForWebview } from '@iceworks/vscode-webview/lib/vscode';
import {
checkIsPegasusProject,
checkIsTargetProjectType,
autoSetContext as autoSetContextByProject,
projectPath,
} from '@iceworks/project-service';
import { Recorder, recordDAU } from '@iceworks/recorder';
import { Recorder } from '@iceworks/recorder';
import { initExtension, registerCommand, getFolderExistsTime, getDataFromSettingJson } from '@iceworks/common-service';
import { createActionsTreeView } from './views/actionsView';
import { createNodeDependenciesTreeView } from './views/nodeDependenciesView';
Expand All @@ -17,7 +16,6 @@ import { showExtensionsQuickPickCommandId, projectExistsTime } from './constants
import showAllQuickPick from './quickPicks/showAllQuickPick';
import createScriptsCommands from './utils/createScriptsCommands';
import createExtensionsStatusBar from './statusBar/createExtensionsStatusBar';
import autoStart from './utils/autoStart';
import i18n from './i18n';

// eslint-disable-next-line
Expand All @@ -34,8 +32,6 @@ export async function activate(context: vscode.ExtensionContext) {
initExtension(context, name);
autoSetContextByProject();

const isPegasusProject = await checkIsPegasusProject();

// init statusBarItem
const extensionsStatusBar = createExtensionsStatusBar();
subscriptions.push(extensionsStatusBar);
Expand Down Expand Up @@ -152,7 +148,6 @@ export async function activate(context: vscode.ExtensionContext) {
treeViews.push(createQuickEntriesTreeView(context));
treeViews.push(createActionsTreeView(context));
treeViews.push(createNodeDependenciesTreeView(context));
let didSetViewContext;
treeViews.forEach((treeView) => {
const { title } = treeView;
treeView.onDidChangeVisibility(({ visible }) => {
Expand All @@ -170,13 +165,6 @@ export async function activate(context: vscode.ExtensionContext) {
module: 'treeView',
action: 'active',
});
if (visible && !didSetViewContext) {
if (!(['npmScripts', 'nodeDependencies'].includes(title))) {
didSetViewContext = true;
recordDAU();
autoStart(context);
}
}
});
});

Expand Down
2 changes: 2 additions & 0 deletions extensions/iceworks-app/src/locales/en-US.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
"extension.iceworksApp.showEntriesQuickPick.welcomePage.detail": "Show welcome page",
"extension.iceworksApp.showEntriesQuickPick.dashboard.label": "Dashboard",
"extension.iceworksApp.showEntriesQuickPick.dashboard.detail": "Show project dashboard",
"extension.iceworksApp.showEntriesQuickPick.more.label": "More",
"extension.iceworksApp.showEntriesQuickPick.more.detail": "See all commands",
"extension.iceworksApp.showDepsInputBox.materialImport.placeHolder": "for example: lodash react@latest.",
"extension.iceworksApp.showDepsInputBox.materialImport.prompt": "Please enter the name of the dependency to be addded to <%= depType %>. Multiple dependencies should be spilted by Spaces.",
"extension.iceworksApp.showDefPublishEnvQuickPick.DEFEnvOptions.daily.label": "Daily",
Expand Down
2 changes: 2 additions & 0 deletions extensions/iceworks-app/src/locales/zh-CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
"extension.iceworksApp.showEntriesQuickPick.welcomePage.detail": "启动欢迎页",
"extension.iceworksApp.showEntriesQuickPick.dashboard.label": "项目仪表盘",
"extension.iceworksApp.showEntriesQuickPick.dashboard.detail": "查看项目仪表盘",
"extension.iceworksApp.showEntriesQuickPick.more.label": "更多",
"extension.iceworksApp.showEntriesQuickPick.more.detail": "查看所有可用命令",
"extension.iceworksApp.showDepsInputBox.materialImport.placeHolder": "例如: lodash react@latest",
"extension.iceworksApp.showDepsInputBox.materialImport.prompt": "请输入需要添加到 <%= depType %> 的依赖名称, 支持通过空格添加多个依赖",
"extension.iceworksApp.showDefPublishEnvQuickPick.DEFEnvOptions.daily.label": "日常环境",
Expand Down
6 changes: 3 additions & 3 deletions extensions/iceworks-app/src/utils/createScriptsCommands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,15 @@ export default async function createScriptsCommands(context: vscode.ExtensionCon
const isPegasusProject = await checkIsPegasusProject();

// Check dependences
let scripts = createNpmCommand('run', 'start');
if (!(await checkPathExists(projectPath, dependencyDir))) {
shouldInstall = true;
vscode.window.showInformationMessage('"node_modules" directory not found! Install dependencies first.');
runScript('Run Debug', projectPath, createNpmCommand('install'));
scripts = `${createNpmCommand('install')} && ${scripts}`
}

// npm run start.
// Debug in VS Code move to iceworks docs.
runScript('Run Debug', projectPath, createNpmCommand('run', 'start'));
runScript('Run Debug', projectPath, scripts);

if (await getProjectFramework() === 'rax-app') {
const devServerStartInfo: IDevServerStartInfo | undefined = await getDevServerStartInfo(projectPath, shouldInstall ? 4 * 60000 : 2 * 60000);
Expand Down
Loading

0 comments on commit 67fa1b0

Please sign in to comment.