Skip to content

Commit

Permalink
hotfix: 0.10.0
Browse files Browse the repository at this point in the history
  • Loading branch information
alvinhui authored Sep 18, 2020
2 parents 9b49c56 + ed4f264 commit 44c30d9
Show file tree
Hide file tree
Showing 39 changed files with 138 additions and 65 deletions.
4 changes: 4 additions & 0 deletions extensions/iceworks-app/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Change Log

## 0.5.1

- fix: show welcome page many times

## 0.5.0

- feat: Add Iceworks Doctor
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": "Iceworks Application Viewer",
"description": "Quick view your Universal Application(React/Rax/Vue, etc).",
"publisher": "iceworks-team",
"version": "0.5.0",
"version": "0.5.1",
"engines": {
"vscode": "^1.41.0"
},
Expand Down
3 changes: 2 additions & 1 deletion extensions/iceworks-app/web/src/locales/en-US.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,6 @@
"web.iceworksApp.Welcome.Information.dingtalk.link": "Join",
"web.iceworksApp.Welcome.Information.updates.title": "Updates",
"web.iceworksApp.Welcome.Information.updates.desc": "Iceworks release details",
"web.iceworksApp.Welcome.Information.updates.link": "View"
"web.iceworksApp.Welcome.Information.updates.link": "View",
"web.iceworksApp.Welcome.showPageOption.title": "Show Welcome Page"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
.content {
margin-top: 30px;
width: 1100px;

.title {
font-size: 20px;
Expand All @@ -17,8 +16,7 @@
margin-top: 18px;

video {
width: 800px;
height: 500px;
width: 600px;
}

.divider {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ const Content = () => {
<div className={styles.title}><FormattedMessage id="web.iceworksApp.Welcome.Content.title" /></div>
<div className={styles.desc}><FormattedMessage id="web.iceworksApp.Welcome.Content.desc" /></div>
<div className={styles.videoContainer}>
{/* <iframe allowFullScreen src="https://www.zhihu.com/video/1289678738658627584" frameBorder="0" /> */}
<video src={videosList[selectedKeyIndex].videoUrl} controls />
<Divider direction="ver" className={styles.divider} />
<Tree
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
.header {
width: 1100px;
}

.desc {
color: $color-text1-3;
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
align-items: center;
background-color: $color-fill1-3;
height: 120px;
width: 320px;
width: 300px;
border-radius: 8px;

.img {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
.information {
margin-top: 30px;
width: 1100px;

.title {
font-size: 20px;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.container {
min-width: 800px;
margin: 10px 0 30px 30px;
}
4 changes: 4 additions & 0 deletions extensions/iceworks-config-helper/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Change Log

## 0.3.4

- fix: show welcome page many times

## 0.3.3

- feat: Add welcome page
Expand Down
2 changes: 1 addition & 1 deletion extensions/iceworks-config-helper/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"displayName": "Iceworks Config Helper",
"description": "Easily write Config files in icejs(& rax-app)",
"publisher": "iceworks-team",
"version": "0.3.3",
"version": "0.3.4",
"engines": {
"vscode": "^1.41.0"
},
Expand Down
10 changes: 10 additions & 0 deletions extensions/iceworks-doctor/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Change Log

## 0.1.1

- docs: add logo
- feat: Add welcome page

## 0.1.0

- Initial release
5 changes: 5 additions & 0 deletions extensions/iceworks-doctor/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@ English | [简体中文](https://github.com/ice-lab/iceworks/blob/master/extensi

# Iceworks Doctor

[![Version for VS Code Extension](https://vsmarketplacebadge.apphb.com/version-short/iceworks-team.iceworks-doctor.svg?logo=visual-studio-code)](https://marketplace.visualstudio.com/items?itemName=iceworks-team.iceworks-doctor)
[![Installs](https://vsmarketplacebadge.apphb.com/installs-short/iceworks-team.iceworks-doctor.svg)](https://marketplace.visualstudio.com/items?itemName=iceworks-team.iceworks-doctor)
[![Rating](https://vsmarketplacebadge.apphb.com/rating-short/iceworks-team.iceworks-doctor.svg)](https://marketplace.visualstudio.com/items?itemName=iceworks-team.iceworks-doctor)
[![The MIT License](https://img.shields.io/badge/license-MIT-blue.svg)](http://opensource.org/licenses/MIT)

Iceworks Doctor is a free security and quality audit tool for modern DevOps teams. With an integrated multi-scanner based design, Iceworks Doctor can detect various kinds of security flaws in your application and infrastructure code in a single fast [@iceworks/doctor](https://www.npmjs.com/package/@iceworks/doctor) scanner without the need for any remote server!
Navigate to the source code and remediate the results by interacting with the scan results.

Expand Down
5 changes: 5 additions & 0 deletions extensions/iceworks-doctor/README.zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

# Iceworks Doctor

[![Version for VS Code Extension](https://vsmarketplacebadge.apphb.com/version-short/iceworks-team.iceworks-doctor.svg?logo=visual-studio-code)](https://marketplace.visualstudio.com/items?itemName=iceworks-team.iceworks-doctor)
[![Installs](https://vsmarketplacebadge.apphb.com/installs-short/iceworks-team.iceworks-doctor.svg)](https://marketplace.visualstudio.com/items?itemName=iceworks-team.iceworks-doctor)
[![Rating](https://vsmarketplacebadge.apphb.com/rating-short/iceworks-team.iceworks-doctor.svg)](https://marketplace.visualstudio.com/items?itemName=iceworks-team.iceworks-doctor)
[![The MIT License](https://img.shields.io/badge/license-MIT-blue.svg)](http://opensource.org/licenses/MIT)

Iceworks Doctor 是一个免费的安全和质量审核工具。借助基于集成多扫描仪 [@iceworks/doctor](https://www.npmjs.com/package/@iceworks/doctor) 的设计,Iceworks Doctor 可以在一次扫描中快速检测到应用程序和基础库代码中的各种安全漏洞和质量问题,而无需访问任何远程服务!你可以一键修复所有报告的问题,或者导航到源代码逐条来修复。

![demo](https://img.alicdn.com/tfs/TB1XB6_UpY7gK0jSZKzXXaikpXa-1200-724.gif)
Expand Down
2 changes: 1 addition & 1 deletion extensions/iceworks-doctor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.0",
"version": "0.1.1",
"engines": {
"vscode": "^1.41.0"
},
Expand Down
8 changes: 7 additions & 1 deletion extensions/iceworks-doctor/src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,24 @@ import * as vscode from 'vscode';
import * as fse from 'fs-extra';
import * as path from 'path';
import { connectService, getHtmlForWebview } from '@iceworks/vscode-webview/lib/vscode';
import { registerCommand } from '@iceworks/common-service';
import { registerCommand, initExtension } from '@iceworks/common-service';
import getRecorder from './getRecorder';
import getScanReport from './getScanReport';
import setDiagnostics from './setDiagnostics';
import * as zhCNTextMap from './locales/zh-CN.json';
import * as enUSTextMap from './locales/en-US.json';
import { services } from './services';

// eslint-disable-next-line
const { name } = require('../package.json');

function activate(context: vscode.ExtensionContext) {
const { window, workspace } = vscode;
const { extensionPath } = context;
const useEn = vscode.env.language !== 'zh-cn';

// auto set configuration
initExtension(context, name);

let reportWebviewPanel: vscode.WebviewPanel | undefined;

Expand Down
5 changes: 5 additions & 0 deletions extensions/iceworks-material-helper/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Change Log

## 0.3.7

- fix: show welcome page many times
- fix: refresh material did not clean cache

## 0.3.6

- feat: Add welcome page
Expand Down
2 changes: 1 addition & 1 deletion extensions/iceworks-material-helper/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"displayName": "React Component Helper",
"description": "Easily use Component in React/Rax.",
"publisher": "iceworks-team",
"version": "0.3.6",
"version": "0.3.7",
"main": "./build/extension.js",
"engines": {
"vscode": "^1.41.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,14 @@ const MaterialsPane: React.FC<any> = () => {
content: intl.formatMessage({ id: 'web.iceworksMaterialHelper.extension.getMaterialError' }),
});
}
console.log('getSources', sources);
return sources;
}

async function refreshSources() {
await callService('material', 'cleanCache');
return await getSources();
}

async function getData(source: string): Promise<IMaterialData> {
let data = {};
try {
Expand Down Expand Up @@ -72,6 +76,7 @@ const MaterialsPane: React.FC<any> = () => {
disableLazyLoad
onSettingsClick={onSettingsClick}
getSources={getSources}
refreshSources={refreshSources}
getData={getData}
onBlockClick={onBlockClick}
onBaseClick={onBaseClick}
Expand Down
5 changes: 5 additions & 0 deletions extensions/iceworks-project-creator/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Change Log

## 0.3.12

- fix: show welcome page many times
- fix: refresh material did not clean cache

## 0.3.11

- feat: Add welcome page
Expand Down
2 changes: 1 addition & 1 deletion extensions/iceworks-project-creator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"displayName": "Iceworks Application Creator",
"description": "Quick create a Universal Application(React/Rax/Vue, etc).",
"publisher": "iceworks-team",
"version": "0.3.11",
"version": "0.3.12",
"engines": {
"vscode": "^1.41.0"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,7 @@ const CreateProject: React.FC = () => {
return sources;
}
async function refreshMaterialSources() {
await callService('material', 'cleanCache');
const sources = await getMaterialSources();
setMaterialSources(sources);
}
Expand Down
4 changes: 4 additions & 0 deletions extensions/iceworks-style-helper/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Change Log

## 0.3.9

- feat: Add welcome page

## 0.3.7

- Fix error: property `title` is mandatory and must be of type `string` or `object`.
Expand Down
2 changes: 1 addition & 1 deletion extensions/iceworks-style-helper/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"displayName": "React Style Helper",
"description": "Easily write styles(CSS/Less/SASS).",
"publisher": "iceworks-team",
"version": "0.3.8",
"version": "0.3.9",
"engines": {
"vscode": "^1.41.0"
},
Expand Down
5 changes: 4 additions & 1 deletion extensions/iceworks-style-helper/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as vscode from 'vscode';
import { Recorder, recordCompletionItemSelect } from '@iceworks/recorder';
import { registerCommand } from '@iceworks/common-service';
import { registerCommand, initExtension } from '@iceworks/common-service';
import cssClassAutoCompete from './cssClassAutoCompete';
import inlineStyleAutoComplete from './inlineStyleAutoComplete';
import styleInfoViewer from './styleInfoViewer';
Expand All @@ -11,6 +11,9 @@ const { name, version } = require('../package.json');
const recorder = new Recorder(name, version);

function activate(context: vscode.ExtensionContext) {
// auto set configuration
initExtension(context, name);

cssClassAutoCompete(context);
inlineStyleAutoComplete(context);
styleInfoViewer(context);
Expand Down
4 changes: 4 additions & 0 deletions extensions/iceworks-time-steward/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Change Log

## 0.1.3

- feat: Add welcome page

## 0.1.2

- refactor: just record PV
Expand Down
2 changes: 1 addition & 1 deletion extensions/iceworks-time-steward/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.2",
"version": "0.1.3",
"engines": {
"vscode": "^1.41.0"
},
Expand Down
11 changes: 8 additions & 3 deletions extensions/iceworks-time-steward/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
import * as vscode from 'vscode';
import { getUserInfo, checkIsAliInternal } from '@iceworks/common-service';
import { getUserInfo, checkIsAliInternal, initExtension } from '@iceworks/common-service';
import { Timer } from './timer';

// eslint-disable-next-line
const { name } = require('../package.json');

let timer: Timer;

export async function activate() {
console.info('start timer');
export async function activate(context: vscode.ExtensionContext) {
// auto set configuration
initExtension(context, name);

let user = { empId: vscode.env.machineId, account: 'anonymous' };

const isAliInternal = await checkIsAliInternal();
Expand Down
5 changes: 5 additions & 0 deletions extensions/iceworks-ui-builder/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Change Log

## 0.1.16

- fix: show welcome page many times
- fix: refresh material did not clean cache

## 0.1.15

- feat: support generating menu to `menuConfig.js`
Expand Down
2 changes: 1 addition & 1 deletion extensions/iceworks-ui-builder/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"displayName": "Iceworks UI Builder",
"description": "Build UI by low-code way",
"publisher": "iceworks-team",
"version": "0.1.15",
"version": "0.1.16",
"engines": {
"vscode": "^1.41.0"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,14 @@ const Home = () => {
content: intl.formatMessage({ id: 'web.iceworksUIBuilder.getMaterialError' }),
});
}

console.log('getSources', sources);
return sources;
}

async function refreshSources() {
await callService('material', 'cleanCache');
return await getSources();
}

async function getData(source: string) {
let data = {};
try {
Expand Down Expand Up @@ -139,6 +142,7 @@ const Home = () => {
<Material
disableLazyLoad
getSources={getSources}
refreshSources={refreshSources}
onSettingsClick={onSettingsClick}
getData={getData}
onBlockClick={onSelect}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ const Home = () => {
<Material
disableLazyLoad
getSources={getSources}
refreshSources={refreshSources}
onSettingsClick={onSettingsClick}
getData={getData}
onPageClick={onSelect}
Expand Down Expand Up @@ -73,11 +74,14 @@ const Home = () => {
content: intl.formatMessage({ id: 'web.iceworksUIBuilder.getMaterialError' }),
});
}

console.log('getSources', sources);
return sources;
}

async function refreshSources() {
await callService('material', 'cleanCache');
return await getSources();
}

async function getData(source: string) {
let data = {};
try {
Expand All @@ -87,7 +91,6 @@ const Home = () => {
content: intl.formatMessage({ id: 'web.iceworksUIBuilder.getDataError' }),
});
}
console.log('getData', data);
return data;
}

Expand Down
Loading

0 comments on commit 44c30d9

Please sign in to comment.