Merge pull request #129 from ice-lab/release/0.1.5

Release 0.1.5

README.en.md

@@ -11,6 +11,7 @@ English | [简体中文](./README.md)
 <p align="center">Universal Application Development Pack</p>
 
 <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" /></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://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>
@@ -20,35 +21,20 @@ English | [简体中文](./README.md)
 
 ## Quick Start
 
-### Iceworks Pack
-
-Use VC Code pack to develop Universal Application projects quickly.
-
-![Iceworks](https://img.alicdn.com/tfs/TB12Z1jJFP7gK0jSZFjXXc5aXXa-2880-1754.png)
+Use Iceworks to develop Universal Application quickly:
 
 1. Open [Iceworks Pack](https://marketplace.visualstudio.com/items?itemName=iceworks-team.iceworks) in VS Code Marketplace
 2. Click the ["install"](vscode:extension/iceworks-team.iceworks) button on page
-3. After installation is successful, click the "Iceworks icon" on Activity Bar of VS Code interface to start
-
-See the [Iceworks Pack](extensions/iceworks/README.md) for more details.
+3. Allow browser to open VS Code
+4. click "Install" on the Iceworks pack page of VS Code
 
-### Iceworks CLI
+![install demo](https://img.alicdn.com/tfs/TB1XSy3a8Bh1e4jSZFhXXcC9VXa-960-600.gif)
 
-Use CLI to develop custom material collections.
+After installation is successful, click the "Iceworks icon" on Activity Bar of VS Code interface to start:
 
-- Installation:
+![Iceworks](https://img.alicdn.com/tfs/TB14Sp0LRr0gK0jSZFnXXbRRXXa-2880-1754.png)
 
-  ```bash
-  $ npm i -g iceworks
-  ```
-- Initialize material collections
-
-  ```
-  $ mkdir materials-example && cd materials-example
-  $ iceworks init material
-  ```
-
-See [《物料开发》](https://ice.work/docs/materials/about) for more details.
+See the [Iceworks Pack](extensions/iceworks/README.md) for more details.
 
 ## Contributors
 

README.md

@@ -9,9 +9,10 @@
 
 <h1 align="center">Iceworks</h1>
 
-<p align="center">多端研发套件</p>
+<p align="center">基于 VS Code 的多端研发套件</p>
 
 <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" /></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://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>
@@ -21,35 +22,20 @@
 
 ## 快速开始
 
-### Iceworks 套件
-
-使用 VS Code 套件快速开发多端项目。
-
-![Iceworks](https://img.alicdn.com/tfs/TB12Z1jJFP7gK0jSZFjXXc5aXXa-2880-1754.png)
+使用 VS Code 套件快速开发多端应用：
 
 1. 打开 VS Code 套件市场中的 [Iceworks](https://marketplace.visualstudio.com/items?itemName=iceworks-team.iceworks) 页面；
-2. 点击页面上的[「安装」](vscode:extension/iceworks-team.iceworks)按钮；
-3. 安装成功后，点击 VS Code 界面左侧活动栏上的「iceworks 图标」，开始使用。
-
-查看 [Iceworks Pack 文档](extensions/iceworks/README.md)阅读更多详细介绍。
-
-### Iceworks CLI
-
-使用 CLI 开发自定义物料集合。
+2. 点击页面上的[「Install」](vscode:extension/iceworks-team.iceworks)按钮；
+3. 允许浏览器打开 VS Code；
+4. 在 VS Code 的 Iceworks Pack 页面点击「安装」。
 
-- 安装工具：
+![安装指引](https://img.alicdn.com/tfs/TB1XSy3a8Bh1e4jSZFhXXcC9VXa-960-600.gif)
 
-  ```bash
-  $ npm i -g iceworks
-  ```
-- 初始化物料集合：
+安装成功后，点击 VS Code 界面左侧活动栏上的「Iceworks 图标」，开始使用：
 
-  ```
-  $ mkdir materials-example && cd materials-example
-  $ iceworks init material
-  ```
+![Iceworks](https://img.alicdn.com/tfs/TB14Sp0LRr0gK0jSZFnXXbRRXXa-2880-1754.png)
 
-更多详细说明，请参考[《物料开发》](https://ice.work/docs/materials/about)。
+查看 [Iceworks Pack](extensions/iceworks/README.md) 阅读更多详细介绍。
 
 ## 参与贡献
 

extensions/iceworks-app/.vscodeignore

@@ -7,3 +7,4 @@ src/**
 **/*.ts
 node_modules
 webpack.config.js
+web/**

extensions/iceworks-app/CHANGELOG.md

@@ -1,8 +1,12 @@
 # Change Log
 
+## 0.1.32
+
+- feat: add Settings page
+
 ## 0.1.31
 
-- Fix: Not show the welcome when the current workspace is not React or Rax App.
+- fix: Not show the welcome when the current workspace is not React or Rax App.
 
 ## 0.1.22
 

extensions/iceworks-app/README.en.md

@@ -1,8 +1,8 @@
 English | [简体中文](./README.md)
 
-# Iceworks App
+# Iceworks Application Viewer
 
-It helps you preview your Universal Application project, including the information of npm scripts, pages, components and node dependencies. It also supports quick installation or upgrade dependencies, adding new pages and components, and much more. 
+It helps you preview your Universal Application, including the information of npm scripts, pages, components and node dependencies. It also supports quick installation or upgrade dependencies, adding new pages and components, and much more. 
 
 ## Usage
 
@@ -22,7 +22,7 @@ It helps you preview your Universal Application project, including the informati
 
 ### Node Dependencies
 
-- Support viewing the project dependency information
+- Support viewing the application dependency information
 - Support installing new dependencies and upgrading dependencies
 - Support installing and reinstalling dependencies
 - Support setting npm client and npm registry

extensions/iceworks-app/README.md

@@ -1,14 +1,14 @@
 简体中文 | [English](./README.en.md)
 
-# Iceworks App
+# Iceworks 应用大纲树
 
-它可以帮助你预览你的前端项目，包括 npm 脚本，页面，组件和依赖信息。它还支持快速安装或升级依赖，添加新页面和组件等等。
+它可以帮助你预览你的前端应用，包括 npm 脚本，页面，组件和依赖信息。它还支持快速安装或升级依赖，添加新页面和组件等等。
 
 ## 用法
 
 ### npm 脚本信息
 
-- 支持查看项目可执行的 npm 脚本
+- 支持查看应用可执行的 npm 脚本
 - 支持快速执行 npm 脚本
 
 ![script.gif](https://img.alicdn.com/tfs/TB1of.nHFT7gK0jSZFpXXaTkpXa-1272-786.gif)
@@ -20,9 +20,9 @@
 
 ![pages&components.gif](https://img.alicdn.com/tfs/TB1tfArHHY1gK0jSZTEXXXDQVXa-1265-760.gif)
 
-### 项目依赖信息
+### 应用依赖信息
 
-- 支持查看项目的依赖信息
+- 支持查看应用的依赖信息
 - 支持安装新依赖和升级依赖
 - 支持一键安装和重装依赖
 - 支持设置 npm 包管理工具和镜像地址

extensions/iceworks-app/package.json

@@ -1,29 +1,37 @@
 {
   "name": "iceworks-app",
-  "displayName": "Iceworks App",
-  "description": "Universal Application Development Extension.",
+  "displayName": "Iceworks Application Viewer",
+  "description": "Quick view your Universal Application project(React/Rax/Vue, etc).",
   "publisher": "iceworks-team",
-  "version": "0.1.31",
+  "version": "0.1.32",
   "engines": {
     "vscode": "^1.41.0"
   },
   "categories": [
     "Other"
   ],
+  "keywords": [
+    "ICE",
+    "Rax",
+    "React",
+    "Low-code",
+    "lowcode"
+  ],
   "icon": "assets/logo.png",
   "activationEvents": [
     "onView:nodeDependencies",
     "onView:scripts",
     "onView:pages",
-    "onView:components"
+    "onView:components",
+    "onCommand:iceworksApp.configHelper.start"
   ],
   "main": "./build/extension.js",
   "contributes": {
     "viewsContainers": {
       "activitybar": [
         {
           "id": "iceworksApp",
-          "title": "Iceworks App",
+          "title": "Iceworks",
           "icon": "assets/sidebar-logo.png"
         }
       ]
@@ -32,7 +40,7 @@
       "iceworksApp": [
         {
           "id": "welcome",
-          "name": "%iceworksApp.view.welcome.name%",
+          "name": "",
           "when": "workbenchState == empty || iceworks:isNotTargetProject"
         },
         {
@@ -80,6 +88,10 @@
       }
     ],
     "commands": [
+      {
+        "command": "iceworksApp.configHelper.start",
+        "title": "Iceworks: Set Iceworks Configuration"
+      },
       {
         "command": "iceworksApp.npmScripts.refresh",
         "title": "%iceworksApp.npmScripts.refresh.title%",
@@ -132,22 +144,6 @@
           "dark": "assets/dark/refresh.svg"
         }
       },
-      {
-        "command": "iceworksApp.nodeDependencies.setPackageManager",
-        "title": "%iceworksApp.nodeDependencies.setPackageManager.title%",
-        "icon": {
-          "light": "assets/light/setting.svg",
-          "dark": "assets/dark/setting.svg"
-        }
-      },
-      {
-        "command": "iceworksApp.nodeDependencies.setNpmRegistry",
-        "title": "%iceworksApp.nodeDependencies.setNpmRegistry.title%",
-        "icon": {
-          "light": "assets/light/registry.svg",
-          "dark": "assets/dark/registry.svg"
-        }
-      },
       {
         "command": "iceworksApp.nodeDependencies.addDepsAndDevDeps",
         "title": "%iceworksApp.nodeDependencies.addDepsAndDevDeps.title%",
@@ -224,16 +220,6 @@
           "when": "view == components",
           "group": "navigation"
         },
-        {
-          "command": "iceworksApp.nodeDependencies.setPackageManager",
-          "when": "view == nodeDependencies",
-          "group": "navigation@21"
-        },
-        {
-          "command": "iceworksApp.nodeDependencies.setNpmRegistry",
-          "when": "view == nodeDependencies",
-          "group": "navigation@22"
-        },
         {
           "command": "iceworksApp.nodeDependencies.addDepsAndDevDeps",
           "when": "view == nodeDependencies",
@@ -274,7 +260,7 @@
       ]
     },
     "configuration": {
-      "title": "Iceworks App",
+      "title": "Iceworks",
       "properties": {
         "iceworks.packageManager": {
           "type": "string",
@@ -304,7 +290,9 @@
     "url": "https://github.com/ice-lab/iceworks.git"
   },
   "scripts": {
-    "vscode:prepublish": "rm -rf build && webpack --mode production",
+    "vscode:prepublish": "rm -rf build && npm run build:web && webpack --mode production",
+    "build:web": "cd web && npm run build",
+    "watch:web": "cd web && npm run start",
     "webpack": "webpack --mode development",
     "webpack-dev": "webpack --mode development --watch",
     "compile": "tsc -p ./tsconfig.json"
@@ -321,7 +309,9 @@
   },
   "dependencies": {
     "@iceworks/common-service": "^0.1.4",
+    "@iceworks/material-service": "^0.1.5",
     "@iceworks/project-service": "^0.1.6",
+    "@iceworks/vscode-webview": "^0.1.2",
     "fs-extra": "^9.0.0",
     "ice-npm-utils": "^2.0.0",
     "latest-version": "^5.1.0",
@@ -332,5 +322,10 @@
     "iceworks-team.iceworks-project-creator",
     "iceworks-team.iceworks-component-builder",
     "iceworks-team.iceworks-page-builder"
-  ]
+  ],
+  "homepage": "https://github.com/ice-lab/iceworks/blob/master/extensions/iceworks-app/README.md",
+  "bugs": {
+    "url": "https://github.com/ice-lab/iceworks/issues",
+    "email": "iceworksteam@163.com"
+  }
 }

extensions/iceworks-app/package.nls.json

@@ -1,10 +1,9 @@
 {
-  "iceworksApp.view.welcome.name": "Welcome",
   "iceworksApp.view.npmScripts.name": "npm Scripts",
   "iceworksApp.view.pages.name": "Pages",
   "iceworksApp.view.components.name": "Components",
   "iceworksApp.view.nodeDependencies.name": "Node Dependencies",
-  "iceworksApp.viewsWelcome.welcome.contents": "To use Iceworks App, you need to open a folder or create a new project first. \n[Open a Folder](command:vscode.openFolder)\n[Create New Project](command:iceworks-project-creator.start)\nRead the [docs](https://marketplace.visualstudio.com/items?itemName=iceworks-team.iceworks) to learn more about how to use Iceworks App in VS Code.",
+  "iceworksApp.viewsWelcome.welcome.contents": "To use Iceworks App, you need to open a folder or create application first. \n[Open a Folder](command:vscode.openFolder)\n[Create Application](command:iceworks-project-creator.start)\n[Iceworks Configuration](command:iceworksApp.configHelper.start)\nRead the [docs](https://marketplace.visualstudio.com/items?itemName=iceworks-team.iceworks) to learn more about how to use Iceworks App in VS Code.",
   "iceworksApp.viewsWelcome.npmScripts.contents": "npm scripts could not be found in package.json.",
   "iceworksApp.viewsWelcome.pages.contents": "Pages could not be found.",
   "iceworksApp.viewsWelcome.components.contents": "Components could not be found.",
@@ -16,8 +15,6 @@
   "iceworksApp.pages.openFile.title": "Open File",
   "iceworksApp.components.add.title": "Add Components",
   "iceworksApp.components.refresh.title": "Refresh",
-  "iceworksApp.nodeDependencies.setPackageManager.title": "Set npm Package Manager",
-  "iceworksApp.nodeDependencies.setNpmRegistry.title": "Set npm Registry",
   "iceworksApp.nodeDependencies.addDepsAndDevDeps.title": "Add Dependencies",
   "iceworksApp.nodeDependencies.dependencies.add.title": "Add Dependency",
   "iceworksApp.nodeDependencies.devDependencies.add.title": "Add DevDependency",

extensions/iceworks-app/package.nls.zh-cn.json

@@ -1,10 +1,9 @@
 {
-  "iceworksApp.view.welcome.name": "欢迎",
   "iceworksApp.view.npmScripts.name": "npm 脚本",
   "iceworksApp.view.pages.name": "页面列表",
   "iceworksApp.view.components.name": "组件列表",
   "iceworksApp.view.nodeDependencies.name": "依赖列表",
-  "iceworksApp.viewsWelcome.welcome.contents": "要使用 Iceworks App，你需要先打开一个文件夹或创建一个新项目。\n[打开文件夹](command:vscode.openFolder)\n[创建新项目](command:iceworks-project-creator.start)\n查看[文档](https://marketplace.visualstudio.com/items?itemName=iceworks-team.iceworks)以学习如何在 VS Code 中如何使用 Iceworks App。",
+  "iceworksApp.viewsWelcome.welcome.contents": "要使用 Iceworks App，你需要先打开一个文件夹或创建一个应用。\n[打开文件夹](command:vscode.openFolder)\n[创建应用](command:iceworks-project-creator.start)\n[Iceworks 设置](command:iceworksApp.configHelper.start)\n查看[文档](https://marketplace.visualstudio.com/items?itemName=iceworks-team.iceworks)以学习如何在 VS Code 中如何使用 Iceworks App。",
   "iceworksApp.viewsWelcome.npmScripts.contents": "没找到 npm 脚本。",
   "iceworksApp.viewsWelcome.pages.contents": "没找到页面。",
   "iceworksApp.viewsWelcome.components.contents": "没找到组件。",
@@ -16,8 +15,6 @@
   "iceworksApp.pages.openFile.title": "打开文件",
   "iceworksApp.components.add.title": "添加组件",
   "iceworksApp.components.refresh.title": "刷新",
-  "iceworksApp.nodeDependencies.setPackageManager.title": "设置npm包管理工具",
-  "iceworksApp.nodeDependencies.setNpmRegistry.title": "设置npm镜像源",
   "iceworksApp.nodeDependencies.addDepsAndDevDeps.title": "添加依赖",
   "iceworksApp.nodeDependencies.dependencies.add.title": "添加dependency",
   "iceworksApp.nodeDependencies.devDependencies.add.title": "添加devDependency",