@simplysm/sd-cli 7.0.80 → 7.0.145
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.
- package/dist/bin/sd-cli.mjs +36 -6
- package/dist/build-tool/SdCliCordova.d.ts +4 -4
- package/dist/build-tool/SdCliCordova.mjs +108 -107
- package/dist/build-tool/SdCliElectron.d.ts +9 -0
- package/dist/build-tool/SdCliElectron.mjs +66 -0
- package/dist/build-tool/SdCliGithubApi.d.ts +14 -0
- package/dist/build-tool/SdCliGithubApi.mjs +96 -0
- package/dist/builder/SdCliClientBuilder.mjs +151 -65
- package/dist/builder/SdCliJsLibBuilder.mjs +4 -4
- package/dist/builder/SdCliServerBuilder.mjs +6 -7
- package/dist/builder/SdCliTsLibBuilder.mjs +4 -4
- package/dist/commons.d.ts +38 -11
- package/dist/entry-points/SdCliLocalUpdate.mjs +3 -3
- package/dist/entry-points/SdCliWorkspace.mjs +48 -6
- package/dist/index.d.ts +2 -0
- package/dist/index.mjs +3 -1
- package/dist/ng-tools/babel/SdCliBbFileMetadata.mjs +2 -2
- package/dist/ng-tools/babel/SdCliBbRootMetadata.d.ts +1 -0
- package/dist/ng-tools/babel/SdCliBbRootMetadata.mjs +29 -3
- package/dist/packages/SdCliPackage.mjs +13 -2
- package/package.json +13 -7
- package/src/bin/sd-cli.ts +46 -7
- package/src/build-tool/SdCliCordova.ts +133 -141
- package/src/build-tool/SdCliElectron.ts +76 -0
- package/src/build-tool/SdCliGithubApi.ts +117 -0
- package/src/builder/SdCliClientBuilder.ts +165 -65
- package/src/builder/SdCliJsLibBuilder.ts +3 -3
- package/src/builder/SdCliServerBuilder.ts +6 -7
- package/src/builder/SdCliTsLibBuilder.ts +3 -3
- package/src/commons.ts +35 -11
- package/src/entry-points/SdCliLocalUpdate.ts +2 -2
- package/src/entry-points/SdCliWorkspace.ts +47 -6
- package/src/index.ts +2 -0
- package/src/ng-tools/babel/SdCliBbFileMetadata.ts +1 -1
- package/src/ng-tools/babel/SdCliBbRootMetadata.ts +30 -2
- package/src/packages/SdCliPackage.ts +18 -1
- package/tsconfig.json +3 -0
|
@@ -12,7 +12,7 @@ export class SdCliBbFileMetadata {
|
|
|
12
12
|
this._findMetaFromInsideCache = new Map();
|
|
13
13
|
this._getNgDecoArgCache = new Map();
|
|
14
14
|
let realFilePath;
|
|
15
|
-
for (const ext of ["", ".mjs", ".cjs", ".js"]) {
|
|
15
|
+
for (const ext of ["", ".mjs", ".cjs", ".js" /*, "/index.mjs", "/index.cjs", "/index.js"*/]) {
|
|
16
16
|
if (FsUtil.exists(filePath + ext) && !FsUtil.stat(filePath + ext).isDirectory()) {
|
|
17
17
|
realFilePath = filePath + ext;
|
|
18
18
|
break;
|
|
@@ -479,4 +479,4 @@ export class SdCliBbFileMetadata {
|
|
|
479
479
|
throw new NeverEntryError();
|
|
480
480
|
}
|
|
481
481
|
}
|
|
482
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SdCliBbFileMetadata.js","sourceRoot":"","sources":["../../../src/ng-tools/babel/SdCliBbFileMetadata.ts"],"names":[],"mappings":"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"}
|
|
482
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SdCliBbFileMetadata.js","sourceRoot":"","sources":["../../../src/ng-tools/babel/SdCliBbFileMetadata.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,6 +17,7 @@ export declare class SdCliBbRootMetadata {
|
|
|
17
17
|
} | undefined;
|
|
18
18
|
private _getAllDepPaths;
|
|
19
19
|
private _getEntryMap;
|
|
20
|
+
private _getRealFilePath;
|
|
20
21
|
private _getGlobExportResult;
|
|
21
22
|
}
|
|
22
23
|
export declare type TSdCliBbMetadata = TSdCliBbTypeMetadata | TSdCliMetaRef | string;
|
|
@@ -119,7 +119,10 @@ export class SdCliBbRootMetadata {
|
|
|
119
119
|
const npmConfig = FsUtil.readJson(path.resolve(ngDepPath, "package.json"));
|
|
120
120
|
const entryFilePath = npmConfig["es2015"] ?? npmConfig["browser"] ?? npmConfig["module"] ?? npmConfig["main"] ?? npmConfig["default"];
|
|
121
121
|
if (typeof entryFilePath === "string") {
|
|
122
|
-
|
|
122
|
+
const realPath = this._getRealFilePath(path.resolve(ngDepPath, entryFilePath));
|
|
123
|
+
if (realPath != null) {
|
|
124
|
+
entryMap.set(npmConfig.name, realPath);
|
|
125
|
+
}
|
|
123
126
|
}
|
|
124
127
|
if (npmConfig.exports) {
|
|
125
128
|
const exportKeys = Object.keys(npmConfig.exports);
|
|
@@ -139,7 +142,10 @@ export class SdCliBbRootMetadata {
|
|
|
139
142
|
const exportPath = path.resolve(ngDepPath, expEntryFilePath);
|
|
140
143
|
const exportResult = this._getGlobExportResult(PathUtil.posix(npmConfig.name, exportKey), exportPath);
|
|
141
144
|
for (const exportResultItem of exportResult) {
|
|
142
|
-
|
|
145
|
+
const realPath = this._getRealFilePath(exportResultItem.target);
|
|
146
|
+
if (realPath != null) {
|
|
147
|
+
entryMap.set(exportResultItem.name, realPath);
|
|
148
|
+
}
|
|
143
149
|
}
|
|
144
150
|
}
|
|
145
151
|
}
|
|
@@ -147,6 +153,26 @@ export class SdCliBbRootMetadata {
|
|
|
147
153
|
}
|
|
148
154
|
return entryMap;
|
|
149
155
|
}
|
|
156
|
+
_getRealFilePath(itemPath) {
|
|
157
|
+
if (!FsUtil.exists(itemPath)) {
|
|
158
|
+
for (const ext of [".mjs", ".cjs", ".js"]) {
|
|
159
|
+
if (FsUtil.exists(itemPath + ext)) {
|
|
160
|
+
return itemPath + ext;
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
else if (FsUtil.stat(itemPath).isFile()) {
|
|
165
|
+
return itemPath;
|
|
166
|
+
}
|
|
167
|
+
else {
|
|
168
|
+
for (const fileName of ["index.mjs", "index.cjs", "index.js"]) {
|
|
169
|
+
if (FsUtil.exists(path.resolve(itemPath, fileName))) {
|
|
170
|
+
return path.resolve(itemPath, fileName);
|
|
171
|
+
}
|
|
172
|
+
}
|
|
173
|
+
}
|
|
174
|
+
return undefined;
|
|
175
|
+
}
|
|
150
176
|
_getGlobExportResult(globName, globTarget) {
|
|
151
177
|
if (globName.includes("*") && globTarget.includes("*")) {
|
|
152
178
|
const result = [];
|
|
@@ -171,4 +197,4 @@ export class SdCliBbRootMetadata {
|
|
|
171
197
|
}
|
|
172
198
|
}
|
|
173
199
|
}
|
|
174
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
200
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SdCliBbRootMetadata.js","sourceRoot":"","sources":["../../../src/ng-tools/babel/SdCliBbRootMetadata.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,7 @@ import { SdCliNpmConfigUtil } from "../utils/SdCliNpmConfigUtil";
|
|
|
9
9
|
import { SdCliClientBuilder } from "../builder/SdCliClientBuilder";
|
|
10
10
|
import { SdStorage } from "@simplysm/sd-storage";
|
|
11
11
|
import ts from "typescript";
|
|
12
|
+
import { SdCliGithubApi } from "../build-tool/SdCliGithubApi";
|
|
12
13
|
export class SdCliPackage extends EventEmitter {
|
|
13
14
|
constructor(_workspaceRootPath, rootPath, config) {
|
|
14
15
|
super();
|
|
@@ -79,7 +80,17 @@ export class SdCliPackage extends EventEmitter {
|
|
|
79
80
|
}
|
|
80
81
|
}
|
|
81
82
|
else {
|
|
82
|
-
if (this.config.publish.type === "
|
|
83
|
+
if (this.config.publish.type === "github") {
|
|
84
|
+
const repoUrl = typeof this._npmConfig.repository === "string" ? this._npmConfig.repository : this._npmConfig.repository.url;
|
|
85
|
+
const repoOwner = repoUrl.split("/").slice(-2)[0];
|
|
86
|
+
const repoName = repoUrl.split("/").slice(-2)[1].replace(/\..*/g, "");
|
|
87
|
+
const github = new SdCliGithubApi(this.config.publish.apiKey, repoOwner, repoName);
|
|
88
|
+
await github.uploadAsync(this._npmConfig.version, this.config.publish.files.map((item) => ({
|
|
89
|
+
buffer: FsUtil.readFileBuffer(path.resolve(this.rootPath, "dist", item.from)),
|
|
90
|
+
name: item.to
|
|
91
|
+
})));
|
|
92
|
+
}
|
|
93
|
+
else if (this.config.publish.type === "ftp" || this.config.publish.type === "ftps" || this.config.publish.type === "sftp") {
|
|
83
94
|
const tsconfigPath = path.resolve(this.rootPath, "tsconfig-build.json");
|
|
84
95
|
const tsconfig = FsUtil.readJson(tsconfigPath);
|
|
85
96
|
const parsedTsconfig = ts.parseJsonConfigFileContent(tsconfig, ts.sys, this.rootPath, tsconfig.angularCompilerOptions);
|
|
@@ -144,4 +155,4 @@ export class SdCliPackage extends EventEmitter {
|
|
|
144
155
|
await FsUtil.writeJsonAsync(buildTsconfigFilePath, buildTsconfig, { space: 2 });
|
|
145
156
|
}
|
|
146
157
|
}
|
|
147
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
158
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SdCliPackage.js","sourceRoot":"","sources":["../../src/packages/SdCliPackage.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@simplysm/sd-cli",
|
|
3
|
-
"version": "7.0.
|
|
3
|
+
"version": "7.0.145",
|
|
4
4
|
"description": "심플리즘 패키지 - CLI",
|
|
5
5
|
"author": "김석래",
|
|
6
6
|
"repository": {
|
|
@@ -52,11 +52,15 @@
|
|
|
52
52
|
"jsdom": "^19.0.0",
|
|
53
53
|
"cordova": "^11.0.0",
|
|
54
54
|
"jszip": "^3.7.1",
|
|
55
|
-
"@simplysm/sd-core-common": "7.0.
|
|
56
|
-
"@simplysm/sd-core-node": "7.0.
|
|
57
|
-
"@simplysm/sd-service-common": "7.0.
|
|
58
|
-
"@simplysm/sd-service-server": "7.0.
|
|
59
|
-
"@simplysm/sd-storage": "7.0.
|
|
55
|
+
"@simplysm/sd-core-common": "7.0.145",
|
|
56
|
+
"@simplysm/sd-core-node": "7.0.145",
|
|
57
|
+
"@simplysm/sd-service-common": "7.0.145",
|
|
58
|
+
"@simplysm/sd-service-server": "7.0.145",
|
|
59
|
+
"@simplysm/sd-storage": "7.0.145",
|
|
60
|
+
"electron": "^17.1.2",
|
|
61
|
+
"electron-builder": "^22.14.13",
|
|
62
|
+
"xml2js": "^0.4.23",
|
|
63
|
+
"mime": "^3.0.0"
|
|
60
64
|
},
|
|
61
65
|
"devDependencies": {
|
|
62
66
|
"@types/semver": "^7.3.9",
|
|
@@ -64,6 +68,8 @@
|
|
|
64
68
|
"@types/webpack-hot-middleware": "^2.25.5",
|
|
65
69
|
"@types/connect": "^3.4.35",
|
|
66
70
|
"@types/source-map-support": "^0.5.4",
|
|
67
|
-
"@types/jsdom": "^16.2.14"
|
|
71
|
+
"@types/jsdom": "^16.2.14",
|
|
72
|
+
"@types/xml2js": "^0.4.9",
|
|
73
|
+
"@types/mime": "^2.0.3"
|
|
68
74
|
}
|
|
69
75
|
}
|
package/src/bin/sd-cli.ts
CHANGED
|
@@ -9,6 +9,7 @@ import { SdCliNpm } from "../entry-points/SdCliNpm";
|
|
|
9
9
|
import { SdCliPrepare } from "../entry-points/SdCliPrepare";
|
|
10
10
|
import { SdCliFileCrypto } from "../entry-points/SdCliFileCrypto";
|
|
11
11
|
import { SdCliCordova } from "../build-tool/SdCliCordova";
|
|
12
|
+
import { SdCliElectron } from "../build-tool/SdCliElectron";
|
|
12
13
|
|
|
13
14
|
Error.stackTraceLimit = Infinity;
|
|
14
15
|
|
|
@@ -66,19 +67,45 @@ const argv = yargs(hideBin(process.argv))
|
|
|
66
67
|
})
|
|
67
68
|
)
|
|
68
69
|
.command(
|
|
69
|
-
"run-
|
|
70
|
-
"변경감지중인 플랫폼을
|
|
70
|
+
"run-electron <package> <url>",
|
|
71
|
+
"변경감지중인 플랫폼을 ELECTRON 앱 형태로 띄웁니다.",
|
|
71
72
|
(cmd) => cmd
|
|
72
|
-
.positional("
|
|
73
|
+
.positional("package", {
|
|
73
74
|
type: "string",
|
|
74
|
-
describe: "
|
|
75
|
+
describe: "패키지명",
|
|
75
76
|
demandOption: true
|
|
76
77
|
})
|
|
78
|
+
.positional("url", {
|
|
79
|
+
type: "string",
|
|
80
|
+
describe: "Webview로 오픈할 URL",
|
|
81
|
+
demandOption: true
|
|
82
|
+
})
|
|
83
|
+
.options({
|
|
84
|
+
config: {
|
|
85
|
+
type: "string",
|
|
86
|
+
describe: "simplysm.json 파일 경로"
|
|
87
|
+
},
|
|
88
|
+
options: {
|
|
89
|
+
type: "string",
|
|
90
|
+
array: true,
|
|
91
|
+
describe: "옵션 설정 (설정파일에서 @로 시작하는 부분)"
|
|
92
|
+
}
|
|
93
|
+
})
|
|
94
|
+
)
|
|
95
|
+
.command(
|
|
96
|
+
"run-cordova <platform> <package> <url>",
|
|
97
|
+
"변경감지중인 플랫폼을 코도바 디바이스에 앱 형태로 띄웁니다.",
|
|
98
|
+
(cmd) => cmd
|
|
77
99
|
.positional("platform", {
|
|
78
100
|
type: "string",
|
|
79
101
|
describe: "빌드 플랫폼(android,...)",
|
|
80
102
|
demandOption: true
|
|
81
103
|
})
|
|
104
|
+
.positional("package", {
|
|
105
|
+
type: "string",
|
|
106
|
+
describe: "패키지명",
|
|
107
|
+
demandOption: true
|
|
108
|
+
})
|
|
82
109
|
.positional("url", {
|
|
83
110
|
type: "string",
|
|
84
111
|
describe: "Webview로 오픈할 URL",
|
|
@@ -192,10 +219,22 @@ const logger = Logger.get(["simplysm", "sd-cli", "bin", "sd-cli"]);
|
|
|
192
219
|
pkgs: argv.packages ?? []
|
|
193
220
|
});
|
|
194
221
|
}
|
|
195
|
-
else if (argv._[0] === "run-
|
|
222
|
+
else if (argv._[0] === "run-electron") {
|
|
223
|
+
await new SdCliElectron(process.cwd())
|
|
224
|
+
.runWebviewOnDeviceAsync(
|
|
225
|
+
argv.package,
|
|
226
|
+
argv.url,
|
|
227
|
+
{
|
|
228
|
+
confFileRelPath: argv.config ?? "simplysm.json",
|
|
229
|
+
optNames: argv.options ?? []
|
|
230
|
+
}
|
|
231
|
+
);
|
|
232
|
+
}
|
|
233
|
+
else if (argv._[0] === "run-cordova") {
|
|
196
234
|
await SdCliCordova.runWebviewOnDeviceAsync(
|
|
197
|
-
|
|
198
|
-
argv.platform as "browser" | "
|
|
235
|
+
process.cwd(),
|
|
236
|
+
argv.platform as "browser" | "android",
|
|
237
|
+
argv.package,
|
|
199
238
|
argv.url
|
|
200
239
|
);
|
|
201
240
|
}
|