@simplysm/sd-cli 7.1.42 → 7.1.44
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { FsUtil, Logger, SdProcess } from "@simplysm/sd-core-node";
|
|
2
2
|
import path from "path";
|
|
3
3
|
import { SdCliConfigUtil } from "../utils/SdCliConfigUtil";
|
|
4
|
-
import ts from "typescript";
|
|
5
4
|
export class SdCliElectron {
|
|
6
5
|
constructor(_rootPath) {
|
|
7
6
|
this._rootPath = _rootPath;
|
|
@@ -17,8 +16,8 @@ export class SdCliElectron {
|
|
|
17
16
|
if (!electronConfig)
|
|
18
17
|
throw new Error("ELECTRON 설정을 찾을 수 없습니다.");
|
|
19
18
|
const pkgRootPath = path.resolve(this._rootPath, `packages/${pkgName}`);
|
|
20
|
-
const electronSrcPath = path.resolve(pkgRootPath,
|
|
21
|
-
await FsUtil.removeAsync(electronSrcPath);
|
|
19
|
+
const electronSrcPath = path.resolve(pkgRootPath, `dist/electron`);
|
|
20
|
+
// await FsUtil.removeAsync(electronSrcPath);
|
|
22
21
|
const npmConfig = (await FsUtil.readJsonAsync(path.resolve(pkgRootPath, `package.json`)));
|
|
23
22
|
const electronVersion = npmConfig.dependencies?.["electron"];
|
|
24
23
|
if (electronVersion === undefined) {
|
|
@@ -47,12 +46,12 @@ export class SdCliElectron {
|
|
|
47
46
|
}*/
|
|
48
47
|
});
|
|
49
48
|
// await FsUtil.copyAsync(path.resolve(pkgRootPath, "dist", "electron"), path.resolve(electronSrcPath));
|
|
50
|
-
if (FsUtil.exists(path.resolve(pkgRootPath, "src/favicon.ico"))) {
|
|
51
|
-
|
|
52
|
-
}
|
|
53
|
-
if (FsUtil.exists(path.resolve(pkgRootPath, "src/assets"))) {
|
|
54
|
-
|
|
55
|
-
}
|
|
49
|
+
// if (FsUtil.exists(path.resolve(pkgRootPath, "src/favicon.ico"))) {
|
|
50
|
+
// await FsUtil.copyAsync(path.resolve(pkgRootPath, "src/favicon.ico"), path.resolve(electronSrcPath, "favicon.ico"));
|
|
51
|
+
// }
|
|
52
|
+
// if (FsUtil.exists(path.resolve(pkgRootPath, "src/assets"))) {
|
|
53
|
+
// await FsUtil.copyAsync(path.resolve(pkgRootPath, "src/assets"), path.resolve(electronSrcPath, "assets"));
|
|
54
|
+
// }
|
|
56
55
|
await FsUtil.writeFileAsync(path.resolve(electronSrcPath, `.env`), [
|
|
57
56
|
"NODE_ENV=development",
|
|
58
57
|
`SD_TITLE=${npmConfig.description}`,
|
|
@@ -62,11 +61,11 @@ export class SdCliElectron {
|
|
|
62
61
|
...(pkgConfig.env !== undefined) ? Object.keys(pkgConfig.env).map((key) => `${key}=${pkgConfig.env[key]}`) : [],
|
|
63
62
|
...(electronConfig.env !== undefined) ? Object.keys(electronConfig.env).map((key) => `${key}=${electronConfig.env[key]}`) : [],
|
|
64
63
|
].filterExists().join("\n"));
|
|
65
|
-
const electronTsFileContent = await FsUtil.readFileAsync(path.resolve(pkgRootPath, `src/electron.ts`));
|
|
66
|
-
const result = ts.transpileModule(electronTsFileContent, { compilerOptions: { module: ts.ModuleKind.CommonJS } });
|
|
67
|
-
await FsUtil.writeFileAsync(path.resolve(electronSrcPath, "electron.js"), result.outputText);
|
|
64
|
+
// const electronTsFileContent = await FsUtil.readFileAsync(path.resolve(pkgRootPath, `src/electron.ts`));
|
|
65
|
+
// const result = ts.transpileModule(electronTsFileContent, { compilerOptions: { module: ts.ModuleKind.CommonJS } });
|
|
66
|
+
// await FsUtil.writeFileAsync(path.resolve(electronSrcPath, "electron.js"), result.outputText);
|
|
68
67
|
await SdProcess.spawnAsync("electron-rebuild", { cwd: pkgRootPath }, true);
|
|
69
|
-
await SdProcess.spawnAsync(`electron
|
|
68
|
+
await SdProcess.spawnAsync(`electron .`, { cwd: electronSrcPath }, true);
|
|
70
69
|
}
|
|
71
70
|
}
|
|
72
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
71
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2RDbGlFbGVjdHJvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9idWlsZC10b29sL1NkQ2xpRWxlY3Ryb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsU0FBUyxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFFbkUsT0FBTyxJQUFJLE1BQU0sTUFBTSxDQUFDO0FBQ3hCLE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUUzRCxNQUFNLE9BQU8sYUFBYTtJQUd4QixZQUFvQyxTQUFpQjtRQUFqQixjQUFTLEdBQVQsU0FBUyxDQUFRO1FBRnBDLFlBQU8sR0FBRyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsVUFBVSxFQUFFLFFBQVEsRUFBRSxJQUFJLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUM7SUFHckYsQ0FBQztJQUVNLEtBQUssQ0FBQyx1QkFBdUIsQ0FBQyxPQUFlLEVBQUUsR0FBVyxFQUFFLEdBQW9EO1FBQ3JILElBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLGlCQUFpQixDQUFDLENBQUM7UUFDdEMsTUFBTSxNQUFNLEdBQUcsTUFBTSxlQUFlLENBQUMsZUFBZSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBRSxHQUFHLENBQUMsZUFBZSxDQUFDLEVBQUUsSUFBSSxFQUFFLEdBQUcsQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUM1SCxNQUFNLFNBQVMsR0FBRyxNQUFNLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBMEMsQ0FBQztRQUNwRixJQUFJLENBQUMsU0FBUztZQUFFLE1BQU0sSUFBSSxLQUFLLENBQUMsb0JBQW9CLENBQUMsQ0FBQztRQUV0RCxNQUFNLGNBQWMsR0FBRyxTQUFTLENBQUMsT0FBTyxFQUFFLFFBQVEsQ0FBQztRQUNuRCxJQUFJLENBQUMsY0FBYztZQUFFLE1BQU0sSUFB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
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@simplysm/sd-cli",
|
|
3
|
-
"version": "7.1.
|
|
3
|
+
"version": "7.1.44",
|
|
4
4
|
"description": "심플리즘 패키지 - CLI",
|
|
5
5
|
"author": "김석래",
|
|
6
6
|
"repository": {
|
|
@@ -29,11 +29,11 @@
|
|
|
29
29
|
"@babel/types": "^7.21.3",
|
|
30
30
|
"@compodoc/compodoc": "^1.1.19",
|
|
31
31
|
"@ngtools/webpack": "^14.2.11",
|
|
32
|
-
"@simplysm/sd-core-common": "7.1.
|
|
33
|
-
"@simplysm/sd-core-node": "7.1.
|
|
34
|
-
"@simplysm/sd-service-common": "7.1.
|
|
35
|
-
"@simplysm/sd-service-server": "7.1.
|
|
36
|
-
"@simplysm/sd-storage": "7.1.
|
|
32
|
+
"@simplysm/sd-core-common": "7.1.44",
|
|
33
|
+
"@simplysm/sd-core-node": "7.1.44",
|
|
34
|
+
"@simplysm/sd-service-common": "7.1.44",
|
|
35
|
+
"@simplysm/sd-service-server": "7.1.44",
|
|
36
|
+
"@simplysm/sd-storage": "7.1.44",
|
|
37
37
|
"browserslist": "^4.21.5",
|
|
38
38
|
"chokidar": "^3.5.3",
|
|
39
39
|
"connect": "^3.7.0",
|
|
@@ -54,7 +54,7 @@
|
|
|
54
54
|
"resolve-url-loader": "^5.0.0",
|
|
55
55
|
"rxjs": "^7.8.0",
|
|
56
56
|
"sass": "^1.60.0",
|
|
57
|
-
"sass-loader": "^13.2.
|
|
57
|
+
"sass-loader": "^13.2.2",
|
|
58
58
|
"semver": "^7.3.8",
|
|
59
59
|
"source-map-loader": "^4.0.1",
|
|
60
60
|
"source-map-support": "^0.5.21",
|
|
@@ -74,6 +74,6 @@
|
|
|
74
74
|
"@types/semver": "^7.3.13",
|
|
75
75
|
"@types/source-map-support": "^0.5.6",
|
|
76
76
|
"@types/xml2js": "^0.4.11",
|
|
77
|
-
"@types/yargs": "^17.0.
|
|
77
|
+
"@types/yargs": "^17.0.24"
|
|
78
78
|
}
|
|
79
79
|
}
|
|
@@ -2,7 +2,6 @@ import { FsUtil, Logger, SdProcess } from "@simplysm/sd-core-node";
|
|
|
2
2
|
import { INpmConfig, ISdCliClientPackageConfig } from "../commons";
|
|
3
3
|
import path from "path";
|
|
4
4
|
import { SdCliConfigUtil } from "../utils/SdCliConfigUtil";
|
|
5
|
-
import ts from "typescript";
|
|
6
5
|
|
|
7
6
|
export class SdCliElectron {
|
|
8
7
|
private readonly _logger = Logger.get(["simplysm", "sd-cli", this.constructor.name]);
|
|
@@ -20,9 +19,9 @@ export class SdCliElectron {
|
|
|
20
19
|
if (!electronConfig) throw new Error("ELECTRON 설정을 찾을 수 없습니다.");
|
|
21
20
|
|
|
22
21
|
const pkgRootPath = path.resolve(this._rootPath, `packages/${pkgName}`);
|
|
23
|
-
const electronSrcPath = path.resolve(pkgRootPath,
|
|
22
|
+
const electronSrcPath = path.resolve(pkgRootPath, `dist/electron`);
|
|
24
23
|
|
|
25
|
-
await FsUtil.removeAsync(electronSrcPath);
|
|
24
|
+
// await FsUtil.removeAsync(electronSrcPath);
|
|
26
25
|
|
|
27
26
|
const npmConfig = (await FsUtil.readJsonAsync(path.resolve(pkgRootPath, `package.json`))) as INpmConfig;
|
|
28
27
|
const electronVersion = npmConfig.dependencies?.["electron"];
|
|
@@ -57,12 +56,12 @@ export class SdCliElectron {
|
|
|
57
56
|
|
|
58
57
|
// await FsUtil.copyAsync(path.resolve(pkgRootPath, "dist", "electron"), path.resolve(electronSrcPath));
|
|
59
58
|
|
|
60
|
-
if (FsUtil.exists(path.resolve(pkgRootPath, "src/favicon.ico"))) {
|
|
61
|
-
|
|
62
|
-
}
|
|
63
|
-
if (FsUtil.exists(path.resolve(pkgRootPath, "src/assets"))) {
|
|
64
|
-
|
|
65
|
-
}
|
|
59
|
+
// if (FsUtil.exists(path.resolve(pkgRootPath, "src/favicon.ico"))) {
|
|
60
|
+
// await FsUtil.copyAsync(path.resolve(pkgRootPath, "src/favicon.ico"), path.resolve(electronSrcPath, "favicon.ico"));
|
|
61
|
+
// }
|
|
62
|
+
// if (FsUtil.exists(path.resolve(pkgRootPath, "src/assets"))) {
|
|
63
|
+
// await FsUtil.copyAsync(path.resolve(pkgRootPath, "src/assets"), path.resolve(electronSrcPath, "assets"));
|
|
64
|
+
// }
|
|
66
65
|
|
|
67
66
|
await FsUtil.writeFileAsync(path.resolve(electronSrcPath, `.env`), [
|
|
68
67
|
"NODE_ENV=development",
|
|
@@ -74,12 +73,12 @@ export class SdCliElectron {
|
|
|
74
73
|
...(electronConfig.env !== undefined) ? Object.keys(electronConfig.env).map((key) => `${key}=${electronConfig.env![key]}`) : [],
|
|
75
74
|
].filterExists().join("\n"));
|
|
76
75
|
|
|
77
|
-
const electronTsFileContent = await FsUtil.readFileAsync(path.resolve(pkgRootPath, `src/electron.ts`));
|
|
78
|
-
const result = ts.transpileModule(electronTsFileContent, { compilerOptions: { module: ts.ModuleKind.CommonJS } });
|
|
79
|
-
await FsUtil.writeFileAsync(path.resolve(electronSrcPath, "electron.js"), result.outputText);
|
|
76
|
+
// const electronTsFileContent = await FsUtil.readFileAsync(path.resolve(pkgRootPath, `src/electron.ts`));
|
|
77
|
+
// const result = ts.transpileModule(electronTsFileContent, { compilerOptions: { module: ts.ModuleKind.CommonJS } });
|
|
78
|
+
// await FsUtil.writeFileAsync(path.resolve(electronSrcPath, "electron.js"), result.outputText);
|
|
80
79
|
|
|
81
80
|
await SdProcess.spawnAsync("electron-rebuild", { cwd: pkgRootPath }, true);
|
|
82
81
|
|
|
83
|
-
await SdProcess.spawnAsync(`electron
|
|
82
|
+
await SdProcess.spawnAsync(`electron .`, { cwd: electronSrcPath }, true);
|
|
84
83
|
}
|
|
85
84
|
}
|