Skip to content

Commit

Permalink
fix: bring to spec with new cli passed config data
Browse files Browse the repository at this point in the history
  • Loading branch information
IT-MikeS committed Jan 19, 2021
1 parent 0aa326d commit 4e5c89b
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 153 deletions.
18 changes: 5 additions & 13 deletions cap-scripts/add.ts
Original file line number Diff line number Diff line change
@@ -1,20 +1,13 @@
import { existsSync, renameSync } from "fs";
import { copySync } from "fs-extra";
import { join } from "path";
import {
getCapacitorElectronNodeModuleDir,
getUsersProjectDir,
readJSON,
runExec,
writePrettyJSON,
} from "./common";
import { customLoadConfig } from "./config";
import { readJSON, runExec, writePrettyJSON } from "./common";

export async function doAdd() {
try {
const usersProjectDir = getUsersProjectDir();
const usersProjectDir = process.env.CAPACITOR_ROOT_DIR!;
const capacitorElectronNodeModuleTemplateDir = join(
getCapacitorElectronNodeModuleDir(),
process.env.INIT_CWD!,
"template"
);
const destDir = join(usersProjectDir, "electron");
Expand All @@ -23,10 +16,9 @@ export async function doAdd() {
"capacitor.config.ts"
);

const configData = await customLoadConfig(usersProjectDir);
//console.log(configData);
const configData = JSON.parse(process.env.CAPACITOR_CONFIG!);

const builtWebAppDir = configData.app.webDirAbs;
const builtWebAppDir = process.env.CAPACITOR_WEB_DIR!;

if (!existsSync(destDir)) {
copySync(capacitorElectronNodeModuleTemplateDir, destDir);
Expand Down
10 changes: 0 additions & 10 deletions cap-scripts/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,6 @@ export function errorLog(message: string) {
console.log(chalk.red(`Error: ${message}`));
}

export function getUsersProjectDir(): string {
return process.env.EXEC_CAP_CWD!;
}

export function getCapacitorElectronNodeModuleDir(): string {
const _cwd = process.env.INIT_CWD!;
//console.log('_cwd:', _cwd);
return _cwd;
}

export function getCwd(): string {
const _cwd = process.env.INIT_CWD!;
return _cwd;
Expand Down
130 changes: 0 additions & 130 deletions cap-scripts/config.ts

This file was deleted.

0 comments on commit 4e5c89b

Please sign in to comment.