From 50a17735c08da9253c79c884f79b50aa0ed8a3e8 Mon Sep 17 00:00:00 2001 From: Mike-Summ Date: Fri, 10 Apr 2020 00:28:56 -0400 Subject: [PATCH 1/6] Update Electron Add CLI Update to address issue #2604 around the copying of the appName from capacitor.config.json to package.json in Electron projects. --- cli/src/electron/add.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/cli/src/electron/add.ts b/cli/src/electron/add.ts index 5a5e67a2b3..aeba395c33 100644 --- a/cli/src/electron/add.ts +++ b/cli/src/electron/add.ts @@ -1,11 +1,18 @@ import { exec } from 'child_process'; import { Config } from '../config'; import { copyTemplate, hasYarn, installDeps, runTask } from '../common'; +import { readFileSync, writeFileSync } from '../util/fs'; +import * as path from 'path'; export async function addElectron(config: Config) { await runTask(`Adding Electron project in: ${config.electron.platformDir}`, async () => { - return copyTemplate(config.electron.assets.templateDir, config.electron.platformDir); + const copyReturn = await copyTemplate(config.electron.assets.templateDir, config.electron.platformDir); + const capConfigName = JSON.parse(readFileSync(path.join(config.electron.platformDir, '../capacitor.config.json')) + '')['appName']; + const packageJSONParse = JSON.parse(readFileSync(path.join(config.electron.platformDir, './package.json')) + ''); + packageJSONParse.name = capConfigName; + writeFileSync(path.join(config.electron.platformDir, './package.json'), JSON.stringify(packageJSONParse)); + return copyReturn; }); await runTask(`Installing NPM Dependencies`, async () => { From c09241f08a49b8b11804e565ef4e11a59f85db6e Mon Sep 17 00:00:00 2001 From: Mike S <13892112+Mike-Summ@users.noreply.github.com> Date: Fri, 10 Apr 2020 12:25:04 -0400 Subject: [PATCH 2/6] Update cli/src/electron/add.ts Co-Authored-By: jcesarmobile --- cli/src/electron/add.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/src/electron/add.ts b/cli/src/electron/add.ts index aeba395c33..12b409387a 100644 --- a/cli/src/electron/add.ts +++ b/cli/src/electron/add.ts @@ -2,7 +2,7 @@ import { exec } from 'child_process'; import { Config } from '../config'; import { copyTemplate, hasYarn, installDeps, runTask } from '../common'; import { readFileSync, writeFileSync } from '../util/fs'; -import * as path from 'path'; +import { join } from 'path'; export async function addElectron(config: Config) { From 948baabcdb271fb6f469236673536d0780d88190 Mon Sep 17 00:00:00 2001 From: Mike S <13892112+Mike-Summ@users.noreply.github.com> Date: Fri, 10 Apr 2020 12:25:36 -0400 Subject: [PATCH 3/6] Update cli/src/electron/add.ts Co-Authored-By: jcesarmobile --- cli/src/electron/add.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/src/electron/add.ts b/cli/src/electron/add.ts index 12b409387a..a72804893c 100644 --- a/cli/src/electron/add.ts +++ b/cli/src/electron/add.ts @@ -8,7 +8,7 @@ export async function addElectron(config: Config) { await runTask(`Adding Electron project in: ${config.electron.platformDir}`, async () => { const copyReturn = await copyTemplate(config.electron.assets.templateDir, config.electron.platformDir); - const capConfigName = JSON.parse(readFileSync(path.join(config.electron.platformDir, '../capacitor.config.json')) + '')['appName']; + const capConfigName = require(join(config.app.rootDir, 'capacitor.config.json')).appName; const packageJSONParse = JSON.parse(readFileSync(path.join(config.electron.platformDir, './package.json')) + ''); packageJSONParse.name = capConfigName; writeFileSync(path.join(config.electron.platformDir, './package.json'), JSON.stringify(packageJSONParse)); From 221344aa1d8627f9e79886990fe036e2b24140d2 Mon Sep 17 00:00:00 2001 From: Mike S <13892112+Mike-Summ@users.noreply.github.com> Date: Fri, 10 Apr 2020 12:25:49 -0400 Subject: [PATCH 4/6] Update cli/src/electron/add.ts Co-Authored-By: jcesarmobile --- cli/src/electron/add.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/src/electron/add.ts b/cli/src/electron/add.ts index a72804893c..6840dab368 100644 --- a/cli/src/electron/add.ts +++ b/cli/src/electron/add.ts @@ -9,7 +9,7 @@ export async function addElectron(config: Config) { await runTask(`Adding Electron project in: ${config.electron.platformDir}`, async () => { const copyReturn = await copyTemplate(config.electron.assets.templateDir, config.electron.platformDir); const capConfigName = require(join(config.app.rootDir, 'capacitor.config.json')).appName; - const packageJSONParse = JSON.parse(readFileSync(path.join(config.electron.platformDir, './package.json')) + ''); + const packageJSONParse = require(join(config.electron.platformDir, 'package.json')); packageJSONParse.name = capConfigName; writeFileSync(path.join(config.electron.platformDir, './package.json'), JSON.stringify(packageJSONParse)); return copyReturn; From 11c6fcc2510d58810f417efce287e0c440bba9af Mon Sep 17 00:00:00 2001 From: Mike S <13892112+Mike-Summ@users.noreply.github.com> Date: Fri, 10 Apr 2020 12:26:06 -0400 Subject: [PATCH 5/6] Update cli/src/electron/add.ts Co-Authored-By: jcesarmobile --- cli/src/electron/add.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/src/electron/add.ts b/cli/src/electron/add.ts index 6840dab368..620c3371e1 100644 --- a/cli/src/electron/add.ts +++ b/cli/src/electron/add.ts @@ -11,7 +11,7 @@ export async function addElectron(config: Config) { const capConfigName = require(join(config.app.rootDir, 'capacitor.config.json')).appName; const packageJSONParse = require(join(config.electron.platformDir, 'package.json')); packageJSONParse.name = capConfigName; - writeFileSync(path.join(config.electron.platformDir, './package.json'), JSON.stringify(packageJSONParse)); + writeFileSync(join(config.electron.platformDir, 'package.json'), JSON.stringify(packageJSONParse)); return copyReturn; }); From 866acb426c950c8b7285635eaccbad65e326745f Mon Sep 17 00:00:00 2001 From: Mike S <13892112+Mike-Summ@users.noreply.github.com> Date: Fri, 10 Apr 2020 12:27:19 -0400 Subject: [PATCH 6/6] Update cli/src/electron/add.ts Co-Authored-By: jcesarmobile --- cli/src/electron/add.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/src/electron/add.ts b/cli/src/electron/add.ts index 620c3371e1..2c0a68832c 100644 --- a/cli/src/electron/add.ts +++ b/cli/src/electron/add.ts @@ -1,7 +1,7 @@ import { exec } from 'child_process'; import { Config } from '../config'; import { copyTemplate, hasYarn, installDeps, runTask } from '../common'; -import { readFileSync, writeFileSync } from '../util/fs'; +import { writeFileSync } from '../util/fs'; import { join } from 'path'; export async function addElectron(config: Config) {