@simplysm/sd-cli 10.0.40 → 10.0.45
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/build-tools/SdCliIndexFileGenerator.d.ts +5 -0
- package/dist/build-tools/SdCliIndexFileGenerator.js +51 -0
- package/dist/build-tools/SdCliIndexFileGenerator.js.map +1 -0
- package/dist/{SdLinter.d.ts → build-tools/SdLinter.d.ts} +1 -1
- package/dist/{SdLinter.js → build-tools/SdLinter.js} +2 -1
- package/dist/build-tools/SdLinter.js.map +1 -0
- package/dist/{SdTsIncrementalBuilder.d.ts → build-tools/SdTsIncrementalBuilder.d.ts} +1 -1
- package/dist/{SdTsIncrementalBuilder.js → build-tools/SdTsIncrementalBuilder.js} +1 -1
- package/dist/build-tools/SdTsIncrementalBuilder.js.map +1 -0
- package/dist/builders/SdCliClientBuilder.js +84 -8
- package/dist/builders/SdCliClientBuilder.js.map +1 -1
- package/dist/builders/SdCliJsLibLinter.js +1 -1
- package/dist/builders/SdCliJsLibLinter.js.map +1 -1
- package/dist/builders/SdCliServerBuilder.js +22 -5
- package/dist/builders/SdCliServerBuilder.js.map +1 -1
- package/dist/builders/SdCliTsLibBuilder.js +6 -5
- package/dist/builders/SdCliTsLibBuilder.js.map +1 -1
- package/dist/commons.d.ts +18 -7
- package/dist/entry/SdCliElectron.d.ts +5 -0
- package/dist/entry/SdCliElectron.js +59 -1
- package/dist/entry/SdCliElectron.js.map +1 -1
- package/dist/entry/SdCliProject.js +75 -19
- package/dist/entry/SdCliProject.js.map +1 -1
- package/dist/index.d.ts +19 -1
- package/dist/index.js +19 -1
- package/dist/index.js.map +1 -1
- package/dist/sd-cli.js +26 -21
- package/dist/sd-cli.js.map +1 -1
- package/dist/utils/SdCliBuildResultUtil.js +3 -2
- package/dist/utils/SdCliBuildResultUtil.js.map +1 -1
- package/dist/utils/SdCliViteElectronMainPlugin.js +24 -7
- package/dist/utils/SdCliViteElectronMainPlugin.js.map +1 -1
- package/dist/utils/SdCliViteExternalPlugin.d.ts +1 -0
- package/dist/utils/SdCliViteExternalPlugin.js +9 -6
- package/dist/utils/SdCliViteExternalPlugin.js.map +1 -1
- package/dist/utils/SdCliViteReactSwcPlugin.js +2 -4
- package/dist/utils/SdCliViteReactSwcPlugin.js.map +1 -1
- package/dist/utils/sdCliTsDefineTransformer.js.map +1 -1
- package/package.json +12 -11
- package/src/build-tools/SdCliIndexFileGenerator.ts +62 -0
- package/src/{SdLinter.ts → build-tools/SdLinter.ts} +3 -2
- package/src/{SdTsIncrementalBuilder.ts → build-tools/SdTsIncrementalBuilder.ts} +2 -2
- package/src/builders/SdCliClientBuilder.ts +298 -203
- package/src/builders/SdCliJsLibLinter.ts +1 -1
- package/src/builders/SdCliServerBuilder.ts +325 -307
- package/src/builders/SdCliTsLibBuilder.ts +135 -133
- package/src/commons.ts +73 -61
- package/src/entry/SdCliElectron.ts +124 -48
- package/src/entry/SdCliProject.ts +524 -455
- package/src/index.ts +19 -1
- package/src/sd-cli.ts +190 -179
- package/src/utils/SdCliBuildResultUtil.ts +4 -3
- package/src/utils/SdCliViteElectronMainPlugin.ts +25 -7
- package/src/utils/SdCliViteExternalPlugin.ts +12 -7
- package/src/utils/SdCliViteReactSwcPlugin.ts +6 -8
- package/src/utils/sdCliTsDefineTransformer.ts +23 -23
- package/tsconfig.json +7 -1
- package/dist/SdLinter.js.map +0 -1
- package/dist/SdTsIncrementalBuilder.js.map +0 -1
- package/dist/entry/SdCliLocalUpdate.d.ts +0 -12
- package/dist/entry/SdCliLocalUpdate.js +0 -94
- package/dist/entry/SdCliLocalUpdate.js.map +0 -1
- package/src/entry/SdCliLocalUpdate.ts +0 -125
|
@@ -1,7 +1,10 @@
|
|
|
1
1
|
import { build, defineConfig } from "vite";
|
|
2
2
|
import { SdCliViteExternalPlugin } from "./SdCliViteExternalPlugin";
|
|
3
3
|
import path from "path";
|
|
4
|
+
import { SdCliViteLoggerPlugin } from "./SdCliViteLoggerPlugin";
|
|
5
|
+
import { Logger } from "@simplysm/sd-core-node";
|
|
4
6
|
export const SdCliViteElectronMainPlugin = (opt) => {
|
|
7
|
+
const logger = Logger.get(["simplysm", "sd-cli", "SdCliViteElectronMainPlugin"]);
|
|
5
8
|
let mainConfig;
|
|
6
9
|
return [
|
|
7
10
|
{
|
|
@@ -24,11 +27,16 @@ export const SdCliViteElectronMainPlugin = (opt) => {
|
|
|
24
27
|
entry: opt.entry,
|
|
25
28
|
formats: ["cjs"],
|
|
26
29
|
fileName: () => "[name].js"
|
|
27
|
-
}
|
|
30
|
+
},
|
|
31
|
+
emptyOutDir: false
|
|
28
32
|
},
|
|
29
|
-
customLogger: server.config.customLogger,
|
|
30
33
|
plugins: [
|
|
34
|
+
SdCliViteLoggerPlugin({
|
|
35
|
+
logger,
|
|
36
|
+
name: path.basename(opt.entry)
|
|
37
|
+
}),
|
|
31
38
|
SdCliViteExternalPlugin({
|
|
39
|
+
target: "node",
|
|
32
40
|
cachePath: path.resolve(opt.cachePath, "externals"),
|
|
33
41
|
nodeBuiltinModules: true,
|
|
34
42
|
includes: ["electron"]
|
|
@@ -53,9 +61,6 @@ export const SdCliViteElectronMainPlugin = (opt) => {
|
|
|
53
61
|
mode: config.mode,
|
|
54
62
|
define: config.define,
|
|
55
63
|
root: config.root,
|
|
56
|
-
resolve: {
|
|
57
|
-
alias: config.resolve?.alias
|
|
58
|
-
},
|
|
59
64
|
optimizeDeps: {
|
|
60
65
|
force: config.optimizeDeps?.force
|
|
61
66
|
},
|
|
@@ -67,9 +72,21 @@ export const SdCliViteElectronMainPlugin = (opt) => {
|
|
|
67
72
|
entry: opt.entry,
|
|
68
73
|
formats: ["cjs"],
|
|
69
74
|
fileName: () => "[name].js"
|
|
70
|
-
}
|
|
75
|
+
},
|
|
76
|
+
emptyOutDir: false
|
|
71
77
|
},
|
|
72
|
-
|
|
78
|
+
plugins: [
|
|
79
|
+
SdCliViteLoggerPlugin({
|
|
80
|
+
logger,
|
|
81
|
+
name: path.basename(opt.entry)
|
|
82
|
+
}),
|
|
83
|
+
SdCliViteExternalPlugin({
|
|
84
|
+
target: "node",
|
|
85
|
+
cachePath: path.resolve(opt.cachePath, "externals"),
|
|
86
|
+
nodeBuiltinModules: true,
|
|
87
|
+
includes: ["electron"]
|
|
88
|
+
}),
|
|
89
|
+
]
|
|
73
90
|
});
|
|
74
91
|
},
|
|
75
92
|
closeBundle: async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SdCliViteElectronMainPlugin.js","sourceRoot":"","sources":["../../src/utils/SdCliViteElectronMainPlugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,EAAE,YAAY,EAA2B,MAAM,MAAM,CAAC;AACnE,OAAO,EAAC,uBAAuB,EAAC,MAAM,2BAA2B,CAAC;AAClE,OAAO,IAAI,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"SdCliViteElectronMainPlugin.js","sourceRoot":"","sources":["../../src/utils/SdCliViteElectronMainPlugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,10 +11,9 @@ export const SdCliViteExternalPlugin = (opt) => {
|
|
|
11
11
|
...builtinModules.map((item) => `node:${item}`)
|
|
12
12
|
];
|
|
13
13
|
return [
|
|
14
|
-
{
|
|
14
|
+
opt.target === "node" ? {
|
|
15
15
|
name: "sd-cli:vite:external",
|
|
16
16
|
enforce: "pre",
|
|
17
|
-
apply: "build",
|
|
18
17
|
config: (conf) => {
|
|
19
18
|
if (opt.dependencies) {
|
|
20
19
|
const npmConfigPath = FsUtil.findAllParentChildPaths("package.json", conf.root ?? opt.cachePath).first();
|
|
@@ -27,19 +26,23 @@ export const SdCliViteExternalPlugin = (opt) => {
|
|
|
27
26
|
resolveId: (source, importer) => {
|
|
28
27
|
if (importer === undefined)
|
|
29
28
|
return;
|
|
30
|
-
if (
|
|
29
|
+
if (externals.includes(source)) {
|
|
31
30
|
return {
|
|
32
31
|
id: source,
|
|
33
32
|
external: true
|
|
34
33
|
};
|
|
35
34
|
}
|
|
35
|
+
if (builtins.includes(source)) {
|
|
36
|
+
return {
|
|
37
|
+
id: `node:${source}`,
|
|
38
|
+
external: true
|
|
39
|
+
};
|
|
40
|
+
}
|
|
36
41
|
return;
|
|
37
42
|
}
|
|
38
|
-
}
|
|
39
|
-
{
|
|
43
|
+
} : {
|
|
40
44
|
name: "sd-cli:vite:external",
|
|
41
45
|
enforce: "pre",
|
|
42
|
-
apply: "serve",
|
|
43
46
|
config: (conf) => {
|
|
44
47
|
if (opt.dependencies) {
|
|
45
48
|
const npmConfigPath = FsUtil.findAllParentChildPaths("package.json", conf.root ?? opt.cachePath).first();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SdCliViteExternalPlugin.js","sourceRoot":"","sources":["../../src/utils/SdCliViteExternalPlugin.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,cAAc,EAAE,aAAa,EAAC,MAAM,aAAa,CAAC;AAC1D,OAAO,EAAC,MAAM,EAAE,QAAQ,EAAC,MAAM,wBAAwB,CAAC;AAExD,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAC,aAAa,EAAC,MAAM,KAAK,CAAC;AAClC,OAAO,MAAM,MAAM,SAAS,CAAC;AAC7B,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"SdCliViteExternalPlugin.js","sourceRoot":"","sources":["../../src/utils/SdCliViteExternalPlugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -114,10 +114,8 @@ const transformWithOptions = async (id, code, dev) => {
|
|
|
114
114
|
react: {
|
|
115
115
|
runtime: "automatic",
|
|
116
116
|
importSource: "react",
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
development: true,
|
|
120
|
-
} : {}
|
|
117
|
+
refresh: dev,
|
|
118
|
+
development: dev,
|
|
121
119
|
},
|
|
122
120
|
decoratorMetadata: true
|
|
123
121
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SdCliViteReactSwcPlugin.js","sourceRoot":"","sources":["../../src/utils/SdCliViteReactSwcPlugin.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"SdCliViteReactSwcPlugin.js","sourceRoot":"","sources":["../../src/utils/SdCliViteReactSwcPlugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sdCliTsDefineTransformer.js","sourceRoot":"","sources":["../../src/utils/sdCliTsDefineTransformer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;AAE5B,MAAM,UAAU,wBAAwB,CAAC,CAAa,EAAE,IAAyC;
|
|
1
|
+
{"version":3,"file":"sdCliTsDefineTransformer.js","sourceRoot":"","sources":["../../src/utils/sdCliTsDefineTransformer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;AAE5B,MAAM,UAAU,wBAAwB,CAAC,CAAa,EAAE,IAAyC;IAC/F,OAAO,CAAC,OAAiC,EAAE,EAAE;QAC3C,OAAO,CAAC,UAAyB,EAAiB,EAAE;YAClD,MAAM,OAAO,GAAG,CAAC,IAAa,EAAW,EAAE;gBACzC,IACE,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC;oBACzB,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC;oBACrB,EAAE,CAAC,qBAAqB,CAAC,IAAI,CAAC;oBAC9B,EAAE,CAAC,0BAA0B,CAAC,IAAI,CAAC;oBACnC,EAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC;oBAC3B,EAAE,CAAC,yBAAyB,CAAC,IAAI,CAAC,EAClC;oBACA,MAAM,KAAK,GAAG,mBAAmB,CAAC;oBAClC,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,KAAK,CAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;oBACrG,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;oBAC9C,IAAI,YAAY,KAAK,SAAS,EAAE;wBAC9B,OAAO,EAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;qBAClD;oBAED,OAAO,IAAI,CAAC;iBACb;gBAED,OAAO,EAAE,CAAC,cAAc,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;YACnD,CAAC,CAAC;YAEF,OAAO,EAAE,CAAC,SAAS,CAAC,UAAU,EAAE,OAAO,CAAkB,CAAC;QAC5D,CAAC,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@simplysm/sd-cli",
|
|
3
|
-
"version": "10.0.
|
|
3
|
+
"version": "10.0.45",
|
|
4
4
|
"description": "심플리즘 패키지 - CLI",
|
|
5
5
|
"author": "김석래",
|
|
6
6
|
"repository": {
|
|
@@ -17,18 +17,19 @@
|
|
|
17
17
|
"node": "^18"
|
|
18
18
|
},
|
|
19
19
|
"dependencies": {
|
|
20
|
-
"@electron/rebuild": "^3.
|
|
20
|
+
"@electron/rebuild": "^3.3.0",
|
|
21
21
|
"@rollup/plugin-inject": "^5.0.3",
|
|
22
|
-
"@simplysm/sd-core-common": "10.0.
|
|
23
|
-
"@simplysm/sd-core-node": "10.0.
|
|
24
|
-
"@simplysm/sd-service-server": "10.0.
|
|
25
|
-
"@
|
|
22
|
+
"@simplysm/sd-core-common": "10.0.45",
|
|
23
|
+
"@simplysm/sd-core-node": "10.0.45",
|
|
24
|
+
"@simplysm/sd-service-server": "10.0.45",
|
|
25
|
+
"@simplysm/sd-storage": "10.0.45",
|
|
26
|
+
"@swc/core": "^1.3.83",
|
|
26
27
|
"@vitejs/plugin-react-swc": "^3.3.2",
|
|
27
|
-
"electron": "^
|
|
28
|
-
"electron-builder": "^24.6.
|
|
29
|
-
"esbuild": "^0.19.
|
|
28
|
+
"electron": "^26.2.0",
|
|
29
|
+
"electron-builder": "^24.6.4",
|
|
30
|
+
"esbuild": "^0.19.2",
|
|
30
31
|
"esbuild-plugin-tsc": "^0.4.0",
|
|
31
|
-
"eslint": "^8.
|
|
32
|
+
"eslint": "^8.48.0",
|
|
32
33
|
"less": "^4.2.0",
|
|
33
34
|
"lib-esm": "^0.4.1",
|
|
34
35
|
"node-stdlib-browser": "^1.2.0",
|
|
@@ -41,7 +42,7 @@
|
|
|
41
42
|
},
|
|
42
43
|
"devDependencies": {
|
|
43
44
|
"@types/eslint": "^8.44.2",
|
|
44
|
-
"@types/less": "^3.0.
|
|
45
|
+
"@types/less": "^3.0.4",
|
|
45
46
|
"@types/yargs": "^17.0.24"
|
|
46
47
|
},
|
|
47
48
|
"peerDependencies": {
|
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
import path from "path";
|
|
2
|
+
import {FsUtil, PathUtil, SdFsWatcher} from "@simplysm/sd-core-node";
|
|
3
|
+
|
|
4
|
+
export class SdCliIndexFileGenerator {
|
|
5
|
+
public static async watchAsync(pkgPath: string, polyfills?: string[]): Promise<void> {
|
|
6
|
+
const indexFilePath = path.resolve(pkgPath, "src/index.ts");
|
|
7
|
+
let cache = FsUtil.exists(indexFilePath) ? FsUtil.readFile(indexFilePath) : undefined;
|
|
8
|
+
|
|
9
|
+
SdFsWatcher
|
|
10
|
+
.watch([path.resolve(pkgPath, "src")])
|
|
11
|
+
.onChange({}, async () => {
|
|
12
|
+
cache = await this.runAsync(pkgPath, polyfills, cache);
|
|
13
|
+
});
|
|
14
|
+
|
|
15
|
+
cache = await this.runAsync(pkgPath, polyfills, cache);
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
public static async runAsync(pkgPath: string, polyfills?: string[], cache?: string): Promise<string> {
|
|
19
|
+
const indexFilePath = path.resolve(pkgPath, "src/index.ts");
|
|
20
|
+
|
|
21
|
+
const importTexts: string[] = [];
|
|
22
|
+
|
|
23
|
+
// polyfills 를 모두 import
|
|
24
|
+
if (polyfills) {
|
|
25
|
+
for (const polyfill of polyfills.orderBy()) {
|
|
26
|
+
importTexts.push(`import "${polyfill}";`);
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
// 내부 파일들 import
|
|
31
|
+
const filePaths = await this._getFilePathsAsync(pkgPath);
|
|
32
|
+
for (const filePath of filePaths.orderBy()) {
|
|
33
|
+
const requirePath = PathUtil.posix(path.relative(path.dirname(indexFilePath), filePath))
|
|
34
|
+
.replace(/\.tsx?$/, "")
|
|
35
|
+
.replace(/\/index$/, "");
|
|
36
|
+
|
|
37
|
+
const sourceTsFileContent = await FsUtil.readFileAsync(filePath);
|
|
38
|
+
if (sourceTsFileContent.split("\n").some((line) => line.startsWith("export "))) {
|
|
39
|
+
importTexts.push(`export * from "./${requirePath}";`);
|
|
40
|
+
}
|
|
41
|
+
else {
|
|
42
|
+
importTexts.push(`import "./${requirePath}";`);
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
const content = importTexts.join("\n") + "\n";
|
|
47
|
+
if (content.trim() !== cache?.trim()) {
|
|
48
|
+
await FsUtil.writeFileAsync(indexFilePath, content);
|
|
49
|
+
}
|
|
50
|
+
return content;
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
private static async _getFilePathsAsync(pkgPath: string): Promise<string[]> {
|
|
54
|
+
const indexFilePath = path.resolve(pkgPath, "src/index.ts");
|
|
55
|
+
|
|
56
|
+
const tsconfig = await FsUtil.readJsonAsync(path.resolve(pkgPath, "tsconfig.json"));
|
|
57
|
+
const entryFilePaths: string[] = tsconfig.files?.map((item) => path.resolve(pkgPath, item)) ?? [];
|
|
58
|
+
|
|
59
|
+
return (await FsUtil.globAsync(path.resolve(pkgPath, "src/**/*{.ts,.tsx}"), {nodir: true}))
|
|
60
|
+
.filter((item) => !entryFilePaths.includes(item) && item !== indexFilePath && !item.endsWith(".d.ts"));
|
|
61
|
+
}
|
|
62
|
+
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {ISdCliPackageBuildResult} from "
|
|
1
|
+
import {ISdCliPackageBuildResult} from "../commons";
|
|
2
2
|
import {ESLint} from "eslint";
|
|
3
3
|
import ts from "typescript";
|
|
4
4
|
|
|
@@ -35,7 +35,8 @@ export class SdLinter {
|
|
|
35
35
|
char: msg.column,
|
|
36
36
|
code: msg.ruleId ?? undefined,
|
|
37
37
|
severity: msg.severity === 1 ? "warning" as const : "error" as const,
|
|
38
|
-
message: msg.message
|
|
38
|
+
message: msg.message,
|
|
39
|
+
type: "lint" as const
|
|
39
40
|
})));
|
|
40
41
|
}
|
|
41
42
|
}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import path from "path";
|
|
2
2
|
import ts from "typescript";
|
|
3
|
-
import {SdCliBuildResultUtil} from "
|
|
3
|
+
import {SdCliBuildResultUtil} from "../utils/SdCliBuildResultUtil";
|
|
4
4
|
import {FsUtil, Logger, PathUtil} from "@simplysm/sd-core-node";
|
|
5
|
-
import {ISdCliPackageBuildResult} from "
|
|
5
|
+
import {ISdCliPackageBuildResult} from "../commons";
|
|
6
6
|
|
|
7
7
|
|
|
8
8
|
interface IOptTransform<T> {
|