Skip to content

Commit 6d590cd

Browse files
author
Akos Kitta
committed
Fixed the packager for the new folder structure.
Signed-off-by: Akos Kitta <[email protected]>
1 parent e8e3c3d commit 6d590cd

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ git clone https://github.com/bcmi-labs/arduino-editor
1717
cd arduino-editor
1818
yarn
1919
yarn rebuild:electron
20-
yarn --cwd arduino-ide-electron start
20+
yarn --cwd electron-app start
2121
```
2222

2323
If you want to switch back to the browser-based example, execute the following in the repository root

electron/packager/index.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
const workingCopy = 'working-copy';
1515

1616
/**
17-
* Relative path from the `__dirname` to the root where the `arduino-ide-extension` and the `arduino-ide-electron` folders are.
17+
* Relative path from the `__dirname` to the root where the `arduino-ide-extension` and the `electron-app` folders are.
1818
* This could come handy when moving the location of the `electron/packager`.
1919
*/
2020
const rootPath = join('..', '..');
@@ -42,7 +42,7 @@
4242
// Copy the following items into the `working-copy` folder. Make sure to reuse the `yarn.lock`. |
4343
//----------------------------------------------------------------------------------------------+
4444
mkdir('-p', path('..', workingCopy));
45-
for (const name of ['arduino-ide-extension', 'arduino-ide-electron', 'yarn.lock', 'package.json', 'lerna.json']) {
45+
for (const name of ['arduino-ide-extension', 'electron-app', 'yarn.lock', 'package.json', 'lerna.json']) {
4646
cp('-rf', path(rootPath, name), path('..', workingCopy));
4747
}
4848

@@ -52,7 +52,7 @@
5252
//@ts-ignore
5353
let pkg = require('../working-copy/package.json');
5454
const workspaces = pkg.workspaces;
55-
// We cannot remove the `arduino-ide-electron`. Otherwise, there is not way to collect the unused dependencies.
55+
// We cannot remove the `electron-app`. Otherwise, there is not way to collect the unused dependencies.
5656
const dependenciesToRemove = ['browser-app'];
5757
for (const dependencyToRemove of dependenciesToRemove) {
5858
const index = workspaces.indexOf(dependencyToRemove);
@@ -70,13 +70,13 @@
7070
// Collect all unused dependencies by the backend. We have to remove them from the electron app.
7171
// The `bundle.js` already contains everything we need for the frontend.
7272
// We have to do it before changing the dependencies to `local-path`.
73-
const unusedDependencies = await utils.collectUnusedDependencies('../working-copy/arduino-ide-electron/');
73+
const unusedDependencies = await utils.collectUnusedDependencies('../working-copy/electron-app/');
7474

7575
//------------------------------------------------------------------------------------+
7676
// Merge the `working-copy/package.json` with `electron/build/template-package.json`. |
7777
//------------------------------------------------------------------------------------+
7878
// @ts-ignore
79-
pkg = require('../working-copy/arduino-ide-electron/package.json');
79+
pkg = require('../working-copy/electron-app/package.json');
8080
// @ts-ignore
8181
const template = require('../build/template-package.json');
8282
template.build.files = [ ...template.build.files, ...unusedDependencies.map(name => `!node_modules/${name}`) ];

0 commit comments

Comments
 (0)