Skip to content

Commit 3156e6a

Browse files
author
Akos Kitta
committed
removed duplicate vs code extensions logic.
Signed-off-by: Akos Kitta <a.kitta@arduino.cc>
1 parent 78d39f0 commit 3156e6a

File tree

2 files changed

+19
-37
lines changed

2 files changed

+19
-37
lines changed

‎electron/build/template-package.json‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -137,24 +137,5 @@
137137
"path": "arduino-ide/nightly"
138138
}
139139
]
140-
},
141-
"theiaPluginsDir": "plugins",
142-
"theiaPlugins": {
143-
"vscode-builtin-cpp": "https://open-vsx.org/api/vscode/cpp/1.52.1/file/vscode.cpp-1.52.1.vsix",
144-
"vscode-arduino-tools": "https://downloads.arduino.cc/vscode-arduino-tools/vscode-arduino-tools-0.0.2-beta.5.vsix",
145-
"vscode-builtin-json": "https://open-vsx.org/api/vscode/json/1.46.1/file/vscode.json-1.46.1.vsix",
146-
"vscode-builtin-json-language-features": "https://open-vsx.org/api/vscode/json-language-features/1.46.1/file/vscode.json-language-features-1.46.1.vsix",
147-
"cortex-debug": "https://open-vsx.org/api/marus25/cortex-debug/0.3.10/file/marus25.cortex-debug-0.3.10.vsix",
148-
"vscode-language-pack-nl": "https://open-vsx.org/api/MS-CEINTL/vscode-language-pack-nl/1.48.3/file/MS-CEINTL.vscode-language-pack-nl-1.48.3.vsix",
149-
"vscode-language-pack-fr": "https://open-vsx.org/api/MS-CEINTL/vscode-language-pack-fr/1.69.0/file/MS-CEINTL.vscode-language-pack-fr-1.69.0.vsix",
150-
"vscode-language-pack-zh-hans": "https://open-vsx.org/api/MS-CEINTL/vscode-language-pack-zh-hans/1.69.0/file/MS-CEINTL.vscode-language-pack-zh-hans-1.69.0.vsix",
151-
"vscode-language-pack-de": "https://open-vsx.org/api/MS-CEINTL/vscode-language-pack-de/1.69.0/file/MS-CEINTL.vscode-language-pack-de-1.69.0.vsix",
152-
"vscode-language-pack-ja": "https://open-vsx.org/api/MS-CEINTL/vscode-language-pack-ja/1.69.0/file/MS-CEINTL.vscode-language-pack-ja-1.69.0.vsix",
153-
"vscode-language-pack-tr": "https://open-vsx.org/api/MS-CEINTL/vscode-language-pack-tr/1.69.0/file/MS-CEINTL.vscode-language-pack-tr-1.69.0.vsix",
154-
"vscode-language-pack-it": "https://open-vsx.org/api/MS-CEINTL/vscode-language-pack-it/1.69.0/file/MS-CEINTL.vscode-language-pack-it-1.69.0.vsix",
155-
"vscode-language-pack-ru":"https://open-vsx.org/api/MS-CEINTL/vscode-language-pack-ru/1.69.0/file/MS-CEINTL.vscode-language-pack-ru-1.69.0.vsix",
156-
"vscode-language-pack-es": "https://open-vsx.org/api/MS-CEINTL/vscode-language-pack-es/1.69.0/file/MS-CEINTL.vscode-language-pack-es-1.69.0.vsix",
157-
"vscode-language-pack-pt-BR": "https://open-vsx.org/api/MS-CEINTL/vscode-language-pack-pt-BR/1.69.0/file/MS-CEINTL.vscode-language-pack-pt-BR-1.69.0.vsix",
158-
"vscode-language-pack-cs": "https://open-vsx.org/api/MS-CEINTL/vscode-language-pack-cs/1.69.0/file/MS-CEINTL.vscode-language-pack-cs-1.69.0.vsix"
159140
}
160141
}

‎electron/packager/index.js‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@
123123
// Save some time: no need to build the projects that are not needed in final app. Currently unused. |
124124
//---------------------------------------------------------------------------------------------------+
125125
//@ts-ignore
126-
let pkg = require('../working-copy/package.json');
127-
const workspaces = pkg.workspaces;
126+
const rootPackageJson = require('../working-copy/package.json');
127+
const workspaces = rootPackageJson.workspaces;
128128
// We cannot remove the `electron-app`. Otherwise, there is not way to collect the unused dependencies.
129129
const dependenciesToRemove = [];
130130
for (const dependencyToRemove of dependenciesToRemove) {
@@ -133,10 +133,10 @@
133133
workspaces.splice(index, 1);
134134
}
135135
}
136-
pkg.workspaces = workspaces;
136+
rootPackageJson.workspaces = workspaces;
137137
fs.writeFileSync(
138138
path('..', workingCopy, 'package.json'),
139-
JSON.stringify(pkg, null, 2)
139+
JSON.stringify(rootPackageJson, null, 2)
140140
);
141141

142142
//-------------------------------------------------------------------------------------------------+
@@ -169,13 +169,13 @@
169169
if (extension !== 'arduino-ide-extension') {
170170
// Do not unlink self.
171171
// @ts-ignore
172-
pkg = require(`../working-copy/${extension}/package.json`);
172+
rootPackageJson = require(`../working-copy/${extension}/package.json`);
173173
// @ts-ignore
174-
pkg.dependencies['arduino-ide-extension'] =
174+
rootPackageJson.dependencies['arduino-ide-extension'] =
175175
'file:../arduino-ide-extension';
176176
fs.writeFileSync(
177177
path('..', workingCopy, extension, 'package.json'),
178-
JSON.stringify(pkg, null, 2)
178+
JSON.stringify(rootPackageJson, null, 2)
179179
);
180180
}
181181
}
@@ -184,7 +184,7 @@
184184
// Merge the `working-copy/package.json` with `electron/build/template-package.json`. |
185185
//------------------------------------------------------------------------------------+
186186
// @ts-ignore
187-
pkg = require('../working-copy/electron-app/package.json');
187+
const appPackageJson = require('../working-copy/electron-app/package.json');
188188
template.build.files = [
189189
...template.build.files,
190190
...unusedDependencies.map((name) => `!node_modules/${name}`),
@@ -195,25 +195,26 @@
195195
dependencies[extension] = `file:../working-copy/${extension}`;
196196
}
197197
// @ts-ignore
198-
pkg.dependencies = { ...pkg.dependencies, ...dependencies };
199-
pkg.devDependencies = { ...pkg.devDependencies, ...template.devDependencies };
200-
// Deep-merging the Theia application configuration. We enable the electron window reload in dev mode but not for the final product. (arduino/arduino-pro-ide#187)
198+
appPackageJson.dependencies = { ...appPackageJson.dependencies, ...dependencies };
199+
appPackageJson.devDependencies = { ...appPackageJson.devDependencies, ...template.devDependencies };
200+
// Deep-merging the Theia application configuration.
201201
// @ts-ignore
202-
const theia = merge(pkg.theia || {}, template.theia || {});
202+
const theia = merge(appPackageJson.theia || {}, template.theia || {});
203203
const content = {
204-
...pkg,
204+
...appPackageJson,
205205
...template,
206206
theia,
207207
// @ts-ignore
208-
dependencies: pkg.dependencies,
209-
devDependencies: pkg.devDependencies,
208+
dependencies: appPackageJson.dependencies,
209+
devDependencies: appPackageJson.devDependencies,
210+
// VS Code extensions and the plugins folder is defined in the top level `package.json`. The template picks them up.
211+
theiaPluginsDir: rootPackageJson.theiaPluginsDir,
212+
theiaPlugins: rootPackageJson.theiaPlugins,
210213
};
211-
const overwriteMerge = (destinationArray, sourceArray, options) =>
212-
sourceArray;
213214
fs.writeFileSync(
214215
path('..', 'build', 'package.json'),
215216
JSON.stringify(
216-
merge(content, template, { arrayMerge: overwriteMerge }),
217+
merge(content, template, { arrayMerge: (_, sourceArray) => sourceArray }),
217218
null,
218219
2
219220
)

0 commit comments

Comments
 (0)