From cd94608aee2e0337ebd8673c1efdec81a65f8b9d Mon Sep 17 00:00:00 2001 From: Akos Kitta Date: Thu, 29 Aug 2019 08:05:47 +0200 Subject: [PATCH] Renamed the applications. Signed-off-by: Akos Kitta --- .gitignore | 3 ++- .gitpod.yml | 2 +- .vscode/launch.json | 6 +++--- .vscode/tasks.json | 4 ++-- README.md | 2 +- {arduino-ide-browser => browser-app}/package.json | 2 +- {arduino-ide-electron => electron-app}/package.json | 2 +- electron/packager/index.js | 4 ++-- package.json | 8 ++++---- 9 files changed, 17 insertions(+), 16 deletions(-) rename {arduino-ide-browser => browser-app}/package.json (97%) rename {arduino-ide-electron => electron-app}/package.json (97%) diff --git a/.gitignore b/.gitignore index ddaa0df3..f9597d13 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,8 @@ build/ downloads/ !electron/build/ src-gen/ -arduino-ide-*/webpack.config.js +browser-app/webpack.config.js +electron-app/webpack.config.js .DS_Store /workspace/static # switching from `electron` to `browser` in dev mode. diff --git a/.gitpod.yml b/.gitpod.yml index 5205cf06..a74a845c 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -8,7 +8,7 @@ ports: tasks: - init: > yarn && - yarn --cwd ./arduino-ide-browser start + yarn --cwd ./browser-app start github: prebuilds: diff --git a/.vscode/launch.json b/.vscode/launch.json index da9bf2ac..c2791d75 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -14,7 +14,7 @@ "type": "node", "request": "launch", "name": "Launch Backend", - "program": "${workspaceRoot}/arduino-ide-browser/src-gen/backend/main.js", + "program": "${workspaceRoot}/browser-app/src-gen/backend/main.js", "args": [ "--hostname=0.0.0.0", "--port=3000", @@ -26,8 +26,8 @@ }, "sourceMaps": true, "outFiles": [ - "${workspaceRoot}/arduino-ide-browser/src-gen/backend/*.js", - "${workspaceRoot}/arduino-ide-browser/lib/**/*.js", + "${workspaceRoot}/browser-app/src-gen/backend/*.js", + "${workspaceRoot}/browser-app/lib/**/*.js", "${workspaceRoot}/arduino-ide-extension/*/lib/**/*.js" ], "smartStep": true, diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 9f66b9c2..80a54749 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -6,7 +6,7 @@ { "label": "Arduino Editor - Start Browser Example", "type": "shell", - "command": "yarn --cwd ./arduino-ide-browser start", + "command": "yarn --cwd ./browser-app start", "group": "build", "presentation": { "reveal": "always", @@ -28,7 +28,7 @@ { "label": "Arduino Editor - Watch Browser Example", "type": "shell", - "command": "yarn --cwd ./arduino-ide-browser watch", + "command": "yarn --cwd ./browser-app watch", "group": "build", "presentation": { "reveal": "always", diff --git a/README.md b/README.md index 30c85685..aff79893 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ yarn rebuild:browser ``` Then you can start the browser example again: ``` -yarn --cwd arduino-ide-browser start +yarn --cwd browser-app start ``` ## Arduino-PoC Electron Application diff --git a/arduino-ide-browser/package.json b/browser-app/package.json similarity index 97% rename from arduino-ide-browser/package.json rename to browser-app/package.json index 04d45922..d016f717 100644 --- a/arduino-ide-browser/package.json +++ b/browser-app/package.json @@ -1,6 +1,6 @@ { "private": true, - "name": "arduino-ide-browser", + "name": "browser-app", "version": "0.0.1", "license": "MIT", "dependencies": { diff --git a/arduino-ide-electron/package.json b/electron-app/package.json similarity index 97% rename from arduino-ide-electron/package.json rename to electron-app/package.json index ed1b2639..b7d19c3a 100644 --- a/arduino-ide-electron/package.json +++ b/electron-app/package.json @@ -1,6 +1,6 @@ { "private": true, - "name": "arduino-ide-electron", + "name": "electron-app", "version": "0.0.1", "license": "MIT", "dependencies": { diff --git a/electron/packager/index.js b/electron/packager/index.js index 0307df8c..049f1487 100644 --- a/electron/packager/index.js +++ b/electron/packager/index.js @@ -47,13 +47,13 @@ } //-----------------------------------------------------+ - // No need to build the `arduino-ide-browser` example. | + // No need to build the `browser-app` example. | //-----------------------------------------------------+ //@ts-ignore let pkg = require('../working-copy/package.json'); const workspaces = pkg.workspaces; // We cannot remove the `arduino-ide-electron`. Otherwise, there is not way to collect the unused dependencies. - const dependenciesToRemove = ['arduino-ide-browser']; + const dependenciesToRemove = ['browser-app']; for (const dependencyToRemove of dependenciesToRemove) { const index = workspaces.indexOf(dependencyToRemove); if (index !== -1) { diff --git a/package.json b/package.json index 8c83c919..f011e244 100644 --- a/package.json +++ b/package.json @@ -14,12 +14,12 @@ "prepare": "lerna run prepare", "rebuild:browser": "theia rebuild:browser", "rebuild:electron": "theia rebuild:electron", - "start": "yarn --cwd ./arduino-ide-browser start", + "start": "yarn --cwd ./browser-app start", "watch": "lerna run watch --parallel" }, "workspaces": [ - "arduino-ide-electron", - "arduino-ide-browser", - "arduino-ide-extension" + "arduino-ide-extension", + "electron-app", + "browser-app" ] }