Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
# dependencies
node_modules/

# lock
package-lock.json
yarn.lock

# production
dist/
release/
Expand Down
206 changes: 166 additions & 40 deletions main/data/data.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"bases": [
{
"title": "Git",
"name": "git",
"id": "git",
"description": "分布式版本控制软件",
"link": "https://git-scm.com/",
"icon": "https://img.alicdn.com/imgextra/i2/O1CN012cOEYH1QgKmtKX8Ju_!!6000000002005-2-tps-200-200.png",
Expand All @@ -15,7 +15,7 @@
},
{
"title": "Node.js (NVM)",
"name": "node",
"id": "node",
"link": "https://nodejs.org/",
"description": "基于 Chrome V8 引擎的 JavaScript 运行环境",
"icon": "https://img.alicdn.com/imgextra/i1/O1CN01VNaknC1eqK2iyxCdG_!!6000000003922-2-tps-288-288.png",
Expand All @@ -31,7 +31,7 @@
},
{
"title": "Google Chrome",
"name": "Google Chrome",
"id": "Google Chrome",
"description": "强大、快速的网页浏览器",
"link": "https://www.google.com/chrome/",
"icon": "https://img.alicdn.com/imgextra/i2/O1CN01jRdeW91kg8w2eH4YR_!!6000000004712-0-tps-225-225.jpg",
Expand All @@ -44,7 +44,7 @@
},
{
"title": "Visual Studio Code",
"name": "Visual Studio Code",
"id": "Visual Studio Code",
"description": "跨平台、轻量的代码编辑器",
"link": "https://code.visualstudio.com/",
"icon": "https://img.alicdn.com/imgextra/i4/O1CN01Jujm911lApTQ1ghkF_!!6000000004779-0-tps-225-225.jpg",
Expand All @@ -57,7 +57,7 @@
},
{
"title": "AppWorks Pack",
"name": "iceworks-team.iceworks",
"id": "iceworks-team.iceworks",
"description": "基于 VS Code 的多端研发套件",
"link": "https://marketplace.visualstudio.com/items?itemName=iceworks-team.iceworks",
"icon": "https://img.alicdn.com/imgextra/i4/O1CN01fpoIOY26SKXzOtTrR_!!6000000007660-2-tps-500-500.png",
Expand All @@ -73,12 +73,12 @@
],
"apps": [
{
"category": "browser",
"id": "browser",
"title": "浏览器",
"packages": [
{
"title": "Google Chrome",
"name": "Google Chrome",
"id": "Google Chrome",
"description": "由 Google 开发的一款设计简单、高效、强大的 Web 浏览器。",
"link": "https://www.google.com/chrome/",
"icon": "https://img.alicdn.com/imgextra/i2/O1CN01jRdeW91kg8w2eH4YR_!!6000000004712-0-tps-225-225.jpg",
Expand All @@ -92,12 +92,12 @@
]
},
{
"category": "IDE",
"id": "IDE",
"title": "IDE",
"packages": [
{
"title": "Visual Studio Code",
"name": "Visual Studio Code",
"id": "Visual Studio Code",
"description": "由微软开发的跨平台的源代码编辑器,具有丰富的语言和运行时扩展的生态系统。",
"link": "https://code.visualstudio.com/",
"icon": "https://img.alicdn.com/imgextra/i4/O1CN01Jujm911lApTQ1ghkF_!!6000000004779-0-tps-225-225.jpg",
Expand All @@ -111,12 +111,12 @@
]
},
{
"category": "api-debug",
"id": "api-debug",
"title": "接口调试",
"packages": [
{
"title": "Postman",
"name": "Postman",
"id": "Postman",
"description": "一款简单好用的接口测试工具,可以发送几乎所有类型的 HTTP 请求。",
"isInternal": false,
"link": "https://www.postman.com/",
Expand All @@ -130,12 +130,12 @@
]
},
{
"category": "proxy",
"id": "proxy",
"title": "网络代理",
"packages": [
{
"title": "Charles",
"name": "Charles",
"id": "Charles",
"description": "一款强大的网络抓包和网络代理工具,允许开发者查看所有 HTTP 通信信息。",
"isInternal": false,
"link": "www.charlesproxy.com",
Expand All @@ -149,14 +149,14 @@
]
},
{
"category": "hosts",
"id": "hosts",
"title": "Hosts",
"packages": [
{
"title": "SwitchHosts",
"name": "SwitchHosts",
"id": "SwitchHosts",
"description": "一个管理 hosts 文件的应用,支持快速编辑和切换 hosts 配置。",
"isInternal": true,
"isInternal": false,
"link": "https://swh.app/",
"icon": "https://img.alicdn.com/imgextra/i4/O1CN01LSkv2s21zhL9Fo5Nu_!!6000000007056-2-tps-225-225.png",
"downloadUrl": "https://iceworks.oss-cn-hangzhou.aliyuncs.com/toolkit/packages/dmg/SwitchHosts_4.0.2.6057.dmg",
Expand All @@ -168,12 +168,12 @@
]
},
{
"category": "terminal",
"id": "terminal",
"title": "终端",
"packages": [
{
"title": "iTerm",
"name": "iTerm",
"id": "iTerm",
"description": "一个为 MacOS 编写的,功能齐全的终端仿真程序,目标是在为用户提供最佳的命令行体验。",
"isInternal": false,
"link": "https://iterm2.com/",
Expand Down Expand Up @@ -216,28 +216,154 @@
],
"browserExtensions": [
{
"name": "React Developer Tools",
"description": "",
"icon": "",
"downloadUrl": "",
"version": "",
"recommended": true,
"isInternal": false
}
],
"IdeExtensions": [
{
"title": "AppWorks Pack",
"name": "iceworks-team.iceworks",
"description": "基于 VS Code 的多端研发套件",
"icon": "https://img.alicdn.com/imgextra/i4/O1CN01PkaZpW1K3xuisg58t_!!6000000001109-2-tps-512-512.png",
"version": "0.19.0",
"recommended": true,
"isInternal": false,
"type": "IDEExtension",
"options": {
"IDEType": "VSCode"
}
"id": "Google Chrome",
"title" : "Chrome",
"extensions": [
{
"title": "React Developer Tools",
"id": "fmkadmapgofadopljbjfkapdkoienihi",
"description": "React 应用调试工具",
"link": "https://chrome.google.com/webstore/detail/react-developer-tools/fmkadmapgofadopljbjfkapdkoienihi",
"icon": "https://img.alicdn.com/imgextra/i1/O1CN0194acAl1gfuI5v48lm_!!6000000004170-73-tps-16-16.ico",
"downloadUrl": "https://iceworks.oss-cn-hangzhou.aliyuncs.com/toolkit/packages/chrome-extensions/React-Developer-Tools_v4.16.0%20(8_16_2021).crx",
"version": null,
"recommended": true,
"isInternal": false,
"type": "browserExtension",
"options": {
"browserType": "Chrome"
},
"platforms": ["darwin", "win32"]
},
{
"title": "Redux DevTools",
"id": "lmhkpmbekcpmknklioeibfkpmmfibljd",
"description": "Redux 调试工具",
"link": "https://chrome.google.com/webstore/detail/redux-devtools/lmhkpmbekcpmknklioeibfkpmmfibljd",
"icon": "https://img.alicdn.com/imgextra/i2/O1CN01VBHsOg1uOPn28XzVy_!!6000000006027-2-tps-128-128.png",
"downloadUrl": "https://iceworks.oss-cn-hangzhou.aliyuncs.com/toolkit/packages/chrome-extensions/Redux-DevTools_v2.17.2.crx",
"version": null,
"recommended": true,
"isInternal": false,
"type": "browserExtension",
"options": {
"browserType": "Chrome"
},
"platforms": ["darwin", "win32"]
},
{
"title": "山海关插件",
"id": "jfalnandddhgfnmejfgjgfbfnnkhljog",
"description": "前端调试工具,包括:模块代理,资源代理,接口代理等。",
"link": "https://chrome.google.com/webstore/detail/%E5%B1%B1%E6%B5%B7%E5%85%B3%E6%8F%92%E4%BB%B6/jfalnandddhgfnmejfgjgfbfnnkhljog",
"icon": "https://img.alicdn.com/imgextra/i3/O1CN012RsFje1LoyCYE2UjT_!!6000000001347-2-tps-84-84.png",
"downloadUrl": "https://iceworks.oss-cn-hangzhou.aliyuncs.com/toolkit/packages/chrome-extensions/%E5%B1%B1%E6%B5%B7%E5%85%B3%E6%8F%92%E4%BB%B6_v0.0.73.crx",
"version": null,
"recommended": true,
"isInternal": true,
"type": "browserExtension",
"options": {
"browserType": "Chrome"
},
"platforms": ["darwin", "win32"]
},
{
"title": "Ali Test Login",
"id": "gcahogioaihmngflbjedigdlppmanmki",
"description": "显示所有测试账号,快捷完成测试账号的登录操作",
"link": "https://chrome.google.com/webstore/detail/gcahogioaihmngflbjedigdlppmanmki",
"icon": "https://img.alicdn.com/imgextra/i4/O1CN01sprRsv2775ocvcByv_!!6000000007749-2-tps-128-128.png",
"downloadUrl": "https://iceworks.oss-cn-hangzhou.aliyuncs.com/toolkit/packages/chrome-extensions/AliTestLogin_v1.1.8.crx",
"version": null,
"recommended": true,
"isInternal": true,
"type": "browserExtension",
"options": {
"browserType": "Chrome"
},
"platforms": ["darwin", "win32"]
},
{
"title": "极速二维码-多场景解码工具",
"id": "eefoinodjigoedmfjkbikmdhecggljgc",
"description": "二维码生成、截屏解码、图片解码等诸多功能。",
"link": "https://chrome.google.com/webstore/detail/the-quick-qr-code-multi-s/eefoinodjigoedmfjkbikmdhecggljgc",
"icon": "https://img.alicdn.com/imgextra/i2/O1CN01WYv0r91xHUeQokfKl_!!6000000006418-2-tps-128-128.png",
"downloadUrl": "https://iceworks.oss-cn-hangzhou.aliyuncs.com/toolkit/packages/chrome-extensions/The-Quick-QR-Code-Multi-scene-decoding-tool_v3.5.1.crx",
"version": null,
"recommended": false,
"isInternal": false,
"type": "browserExtension",
"options": {
"browserType": "Chrome"
},
"platforms": ["darwin", "win32"]
},
{
"title": "XSwitch",
"id": "idkjhjggpffolpidfkikidcokdkdaogg",
"description": "一个用来做请求链接转发的 Chrome 浏览器插件",
"link": "https://chrome.google.com/webstore/detail/xswitch/idkjhjggpffolpidfkikidcokdkdaogg",
"icon": "https://img.alicdn.com/imgextra/i3/O1CN01S8iNaB1WW9hjjI0cP_!!6000000002795-2-tps-148-148.png",
"downloadUrl": "https://iceworks.oss-cn-hangzhou.aliyuncs.com/toolkit/packages/chrome-extensions/XSwitch_v1.17.1.crx",
"version": null,
"recommended": false,
"isInternal": false,
"type": "browserExtension",
"options": {
"browserType": "Chrome"
},
"platforms": ["darwin", "win32"]
},
{
"title": "Octotree - GitHub code tree",
"id": "bkhaagjahfmjljalopjnoealnfndnagc",
"description": "用来显示 Github 项目的目录结构的 Chrome 插件",
"link": "https://chrome.google.com/webstore/detail/octotree-github-code-tree/bkhaagjahfmjljalopjnoealnfndnagc",
"icon": "https://img.alicdn.com/imgextra/i2/O1CN01z5X6661G0WUsozqTi_!!6000000000560-2-tps-128-128.png",
"downloadUrl": "https://iceworks.oss-cn-hangzhou.aliyuncs.com/toolkit/packages/chrome-extensions/Octotree-GitHub-code-tree_v7.0.7.crx",
"version": null,

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

version null 那还需要这个字段吗

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

先留着,后面可能有用

"recommended": false,
"isInternal": false,
"type": "browserExtension",
"options": {
"browserType": "Chrome"
},
"platforms": ["darwin", "win32"]
},
{
"title": "JSON Viewer",
"id": "aimiinbnnkboelefkjlenlgimcabobli",
"description": "在 Chrome 中查看格式化的 JSON 数据",
"link": "https://chrome.google.com/webstore/detail/json-viewer/aimiinbnnkboelefkjlenlgimcabobli",
"icon": "https://img.alicdn.com/imgextra/i3/O1CN01hCEc1J1YmlIPqAGmU_!!6000000003102-2-tps-128-128.png",
"downloadUrl": "https://iceworks.oss-cn-hangzhou.aliyuncs.com/toolkit/packages/chrome-extensions/JSON-Viewer_v0.8.17.crx",
"version": null,
"recommended": false,
"isInternal": false,
"type": "browserExtension",
"options": {
"browserType": "Chrome"
},
"platforms": ["darwin", "win32"]
},
{
"title": "Vue.js devtools",
"id": "nhdogjmejiglipccpnnnanhbledajbpd",
"description": "Vue 应用调试工具",
"link": "https://chrome.google.com/webstore/detail/vuejs-devtools/nhdogjmejiglipccpnnnanhbledajbpd",
"icon": "https://img.alicdn.com/imgextra/i3/O1CN01HJaut21ZeLdUV6OtU_!!6000000003219-2-tps-128-128.png",
"downloadUrl": "https://iceworks.oss-cn-hangzhou.aliyuncs.com/toolkit/packages/chrome-extensions/Vue.js-devtools_v5.3.4.crx",
"version": null,
"recommended": false,
"isInternal": false,
"type": "browserExtension",
"options": {
"browserType": "Chrome"
},
"platforms": ["darwin", "win32"]
}
]
}
]
}
2 changes: 1 addition & 1 deletion main/git/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as path from 'path';
import ini = require('ini');
import * as fse from 'fs-extra';
import * as globby from 'globby';
import { AddUserConfig, UserGitConfig } from '../types/git';
import { AddUserConfig, UserGitConfig } from '../types';
import { GLOBAL_GITCONFIG_PATH, TOOLKIT_USER_GIT_CONFIG_DIR } from '../constants';
import log from '../utils/log';
import {
Expand Down
2 changes: 1 addition & 1 deletion main/ipc/getNodeInfo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export default () => {
ipcMain.handle('get-node-info', () => {
const data = store.get(packagesDataKey);
const { bases = [] }: { bases: BasePackageInfo[] } = data;
const nodeBasicInfo = bases.find((base: BasePackageInfo) => base.name === 'node');
const nodeBasicInfo = bases.find((base: BasePackageInfo) => base.id === 'node');
const nodeInfo = getPackageInfo(nodeBasicInfo);

return nodeInfo;
Expand Down
8 changes: 4 additions & 4 deletions main/ipc/handleApp.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export default () => {
e: IpcMainInvokeEvent,
{ packageInfo, uninstallChannel, processChannel }: { packageInfo: PackageInfo; uninstallChannel: string; processChannel: string },
) => {
const childProcessName = `${uninstallChannel}-${packageInfo.name}`;
const childProcessName = `${uninstallChannel}-${packageInfo.id}`;
let childProcess = childProcessMap.get(childProcessName);
if (childProcess) {
log.info(`Channel ${childProcessName} has an existed child process.`);
Expand All @@ -67,7 +67,7 @@ export default () => {
module: 'app',
action: 'uninstall',
data: {
name: packageInfo.name,
name: packageInfo.title,
},
});
}
Expand All @@ -84,7 +84,7 @@ export default () => {
e: IpcMainInvokeEvent,
{ packageInfo, installChannel, processChannel }: { packageInfo: PackageInfo; installChannel: string; processChannel: string },
) => {
const childProcessName = `${installChannel}-${packageInfo.name}`;
const childProcessName = `${installChannel}-${packageInfo.id}`;
let childProcess = childProcessMap.get(childProcessName);
if (childProcess) {
log.info(`Channel ${childProcessName} has an existed child process.`);
Expand All @@ -103,7 +103,7 @@ export default () => {
module: 'app',
action: 'install',
data: {
name: packageInfo.name,
name: packageInfo.title,
},
});
}
Expand Down
Loading