@simplysm/sd-cli 13.0.76 → 13.0.77
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/README.md +341 -16
- package/dist/builders/DtsBuilder.js +2 -2
- package/dist/builders/DtsBuilder.js.map +1 -1
- package/dist/builders/LibraryBuilder.d.ts +3 -3
- package/dist/builders/LibraryBuilder.d.ts.map +1 -1
- package/dist/builders/LibraryBuilder.js +2 -2
- package/dist/builders/LibraryBuilder.js.map +1 -1
- package/dist/builders/types.d.ts +7 -1
- package/dist/builders/types.d.ts.map +1 -1
- package/dist/capacitor/capacitor.d.ts +5 -0
- package/dist/capacitor/capacitor.d.ts.map +1 -1
- package/dist/capacitor/capacitor.js +59 -59
- package/dist/capacitor/capacitor.js.map +1 -1
- package/dist/commands/check.js +4 -4
- package/dist/commands/check.js.map +1 -1
- package/dist/commands/device.js +3 -3
- package/dist/commands/device.js.map +1 -1
- package/dist/commands/lint.js +4 -4
- package/dist/commands/lint.js.map +1 -1
- package/dist/commands/publish.js +20 -20
- package/dist/commands/publish.js.map +1 -1
- package/dist/commands/replace-deps.js +1 -1
- package/dist/commands/replace-deps.js.map +1 -1
- package/dist/commands/typecheck.js +9 -9
- package/dist/commands/typecheck.js.map +1 -1
- package/dist/electron/electron.js +16 -16
- package/dist/electron/electron.js.map +1 -1
- package/dist/orchestrators/BuildOrchestrator.js +6 -6
- package/dist/orchestrators/BuildOrchestrator.js.map +1 -1
- package/dist/orchestrators/DevOrchestrator.d.ts +7 -6
- package/dist/orchestrators/DevOrchestrator.d.ts.map +1 -1
- package/dist/orchestrators/DevOrchestrator.js +157 -203
- package/dist/orchestrators/DevOrchestrator.js.map +1 -1
- package/dist/orchestrators/WatchOrchestrator.d.ts.map +1 -1
- package/dist/orchestrators/WatchOrchestrator.js +3 -4
- package/dist/orchestrators/WatchOrchestrator.js.map +1 -1
- package/dist/sd-cli.js +1 -1
- package/dist/sd-cli.js.map +1 -1
- package/dist/sd-config.types.d.ts +9 -3
- package/dist/sd-config.types.d.ts.map +1 -1
- package/dist/utils/copy-public.d.ts.map +1 -1
- package/dist/utils/copy-public.js +23 -27
- package/dist/utils/copy-public.js.map +1 -1
- package/dist/utils/copy-src.d.ts.map +1 -1
- package/dist/utils/copy-src.js +7 -7
- package/dist/utils/copy-src.js.map +1 -1
- package/dist/utils/esbuild-config.d.ts.map +1 -1
- package/dist/utils/esbuild-config.js +36 -42
- package/dist/utils/esbuild-config.js.map +1 -1
- package/dist/utils/replace-deps.js +7 -7
- package/dist/utils/replace-deps.js.map +1 -1
- package/dist/utils/sd-config.js +2 -2
- package/dist/utils/sd-config.js.map +1 -1
- package/dist/utils/template.js +7 -7
- package/dist/utils/template.js.map +1 -1
- package/dist/utils/tsconfig.d.ts +1 -2
- package/dist/utils/tsconfig.d.ts.map +1 -1
- package/dist/utils/tsconfig.js +5 -8
- package/dist/utils/tsconfig.js.map +1 -1
- package/dist/utils/typecheck-serialization.js +2 -2
- package/dist/utils/typecheck-serialization.js.map +1 -1
- package/dist/utils/vite-config.d.ts +2 -0
- package/dist/utils/vite-config.d.ts.map +1 -1
- package/dist/utils/vite-config.js +36 -3
- package/dist/utils/vite-config.js.map +1 -1
- package/dist/utils/worker-events.d.ts +11 -1
- package/dist/utils/worker-events.d.ts.map +1 -1
- package/dist/utils/worker-events.js +3 -5
- package/dist/utils/worker-events.js.map +1 -1
- package/dist/utils/worker-utils.d.ts +2 -2
- package/dist/utils/worker-utils.d.ts.map +1 -1
- package/dist/utils/worker-utils.js +1 -1
- package/dist/utils/worker-utils.js.map +1 -1
- package/dist/workers/client.worker.d.ts +1 -1
- package/dist/workers/client.worker.js +3 -3
- package/dist/workers/client.worker.js.map +1 -1
- package/dist/workers/dts.worker.d.ts +1 -1
- package/dist/workers/dts.worker.d.ts.map +1 -1
- package/dist/workers/dts.worker.js +13 -28
- package/dist/workers/dts.worker.js.map +1 -1
- package/dist/workers/library.worker.d.ts +1 -1
- package/dist/workers/library.worker.js +4 -4
- package/dist/workers/library.worker.js.map +1 -1
- package/dist/workers/lint.worker.d.ts +1 -1
- package/dist/workers/server-runtime.worker.d.ts +1 -1
- package/dist/workers/server-runtime.worker.js +4 -4
- package/dist/workers/server-runtime.worker.js.map +1 -1
- package/dist/workers/server.worker.d.ts +1 -1
- package/dist/workers/server.worker.js +6 -6
- package/dist/workers/server.worker.js.map +1 -1
- package/package.json +4 -4
- package/src/builders/DtsBuilder.ts +2 -2
- package/src/builders/LibraryBuilder.ts +7 -10
- package/src/builders/types.ts +6 -1
- package/src/capacitor/capacitor.ts +61 -60
- package/src/commands/check.ts +4 -4
- package/src/commands/device.ts +3 -3
- package/src/commands/lint.ts +4 -4
- package/src/commands/publish.ts +20 -20
- package/src/commands/replace-deps.ts +1 -1
- package/src/commands/typecheck.ts +9 -9
- package/src/electron/electron.ts +16 -16
- package/src/orchestrators/BuildOrchestrator.ts +6 -6
- package/src/orchestrators/DevOrchestrator.ts +210 -256
- package/src/orchestrators/WatchOrchestrator.ts +8 -10
- package/src/sd-cli.ts +1 -1
- package/src/sd-config.types.ts +10 -3
- package/src/utils/copy-public.ts +22 -26
- package/src/utils/copy-src.ts +7 -7
- package/src/utils/esbuild-config.ts +51 -63
- package/src/utils/replace-deps.ts +7 -7
- package/src/utils/sd-config.ts +2 -2
- package/src/utils/template.ts +7 -7
- package/src/utils/tsconfig.ts +6 -10
- package/src/utils/typecheck-serialization.ts +2 -2
- package/src/utils/vite-config.ts +376 -341
- package/src/utils/worker-events.ts +13 -10
- package/src/utils/worker-utils.ts +45 -45
- package/src/workers/client.worker.ts +3 -3
- package/src/workers/dts.worker.ts +451 -467
- package/src/workers/library.worker.ts +4 -4
- package/src/workers/server-runtime.worker.ts +4 -4
- package/src/workers/server.worker.ts +572 -572
- package/templates/init/package.json.hbs +2 -2
- package/templates/init/packages/client-admin/package.json.hbs +5 -5
- package/templates/init/packages/client-admin/src/views/auth/LoginView.tsx +2 -2
- package/templates/init/packages/client-admin/src/views/home/base/employee/EmployeeSheet.tsx.hbs +1 -1
- package/templates/init/packages/client-admin/src/views/home/base/role-permission/RoleSheet.tsx.hbs +1 -1
- package/templates/init/packages/db-main/package.json.hbs +2 -2
- package/templates/init/packages/server/package.json.hbs +4 -4
- package/templates/init/tests/e2e/package.json.hbs +1 -1
- package/tests/get-compiler-options-for-package.spec.ts +13 -27
- package/tests/get-types-from-package-json.spec.ts +15 -11
- package/tests/load-ignore-patterns.spec.ts +15 -11
- package/tests/load-sd-config.spec.ts +16 -14
- package/tests/publish-config-narrowing.spec.ts +20 -0
- package/tests/run-lint.spec.ts +38 -34
- package/tests/run-typecheck.spec.ts +194 -135
- package/tests/sd-public-dev-plugin-mime.spec.ts +19 -0
- package/dist/builders/index.d.ts +0 -5
- package/dist/builders/index.d.ts.map +0 -1
- package/dist/builders/index.js +0 -5
- package/dist/builders/index.js.map +0 -6
- package/dist/infra/index.d.ts +0 -4
- package/dist/infra/index.d.ts.map +0 -1
- package/dist/infra/index.js +0 -4
- package/dist/infra/index.js.map +0 -6
- package/dist/orchestrators/index.d.ts +0 -4
- package/dist/orchestrators/index.d.ts.map +0 -1
- package/dist/orchestrators/index.js +0 -4
- package/dist/orchestrators/index.js.map +0 -6
- package/src/builders/index.ts +0 -4
- package/src/infra/index.ts +0 -3
- package/src/orchestrators/index.ts +0 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sd-config.types.d.ts","sourceRoot":"","sources":["..\\src\\sd-config.types.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,SAAS,GAAG,SAAS,CAAC;AAIzD;;;;;GAKG;AACH,MAAM,MAAM,eAAe,GAAG,
|
|
1
|
+
{"version":3,"file":"sd-config.types.d.ts","sourceRoot":"","sources":["..\\src\\sd-config.types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"copy-public.d.ts","sourceRoot":"","sources":["..\\..\\src\\utils\\copy-public.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"copy-public.d.ts","sourceRoot":"","sources":["..\\..\\src\\utils\\copy-public.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,SAAS,EACV,MAAM,qBAAqB,CAAC;AAE7B;;;;;;GAMG;AACH,wBAAsB,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CA6BxF;AAED;;;;;;;GAOG;AACH,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,OAAO,GAClB,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAqEhC"}
|
|
@@ -1,35 +1,31 @@
|
|
|
1
1
|
import path from "path";
|
|
2
2
|
import {
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
fsGlob,
|
|
7
|
-
FsWatcher,
|
|
8
|
-
fsExists,
|
|
9
|
-
pathIsChildPath
|
|
3
|
+
fsx,
|
|
4
|
+
pathx,
|
|
5
|
+
FsWatcher
|
|
10
6
|
} from "@simplysm/core-node";
|
|
11
7
|
async function copyPublicFiles(pkgDir, includeDev) {
|
|
12
8
|
const distDir = path.join(pkgDir, "dist");
|
|
13
|
-
await
|
|
9
|
+
await fsx.mkdir(distDir);
|
|
14
10
|
const publicDir = path.join(pkgDir, "public");
|
|
15
|
-
if (await
|
|
16
|
-
const files = await
|
|
11
|
+
if (await fsx.exists(publicDir)) {
|
|
12
|
+
const files = await fsx.glob("**/*", { cwd: publicDir, absolute: true });
|
|
17
13
|
for (const file of files) {
|
|
18
14
|
const relativePath = path.relative(publicDir, file);
|
|
19
15
|
const distPath = path.join(distDir, relativePath);
|
|
20
|
-
await
|
|
21
|
-
await
|
|
16
|
+
await fsx.mkdir(path.dirname(distPath));
|
|
17
|
+
await fsx.copy(file, distPath);
|
|
22
18
|
}
|
|
23
19
|
}
|
|
24
20
|
if (includeDev) {
|
|
25
21
|
const publicDevDir = path.join(pkgDir, "public-dev");
|
|
26
|
-
if (await
|
|
27
|
-
const files = await
|
|
22
|
+
if (await fsx.exists(publicDevDir)) {
|
|
23
|
+
const files = await fsx.glob("**/*", { cwd: publicDevDir, absolute: true });
|
|
28
24
|
for (const file of files) {
|
|
29
25
|
const relativePath = path.relative(publicDevDir, file);
|
|
30
26
|
const distPath = path.join(distDir, relativePath);
|
|
31
|
-
await
|
|
32
|
-
await
|
|
27
|
+
await fsx.mkdir(path.dirname(distPath));
|
|
28
|
+
await fsx.copy(file, distPath);
|
|
33
29
|
}
|
|
34
30
|
}
|
|
35
31
|
}
|
|
@@ -40,10 +36,10 @@ async function watchPublicFiles(pkgDir, includeDev) {
|
|
|
40
36
|
const publicDevDir = path.join(pkgDir, "public-dev");
|
|
41
37
|
await copyPublicFiles(pkgDir, includeDev);
|
|
42
38
|
const watchPaths = [];
|
|
43
|
-
if (await
|
|
39
|
+
if (await fsx.exists(publicDir)) {
|
|
44
40
|
watchPaths.push(path.join(publicDir, "**/*"));
|
|
45
41
|
}
|
|
46
|
-
if (includeDev && await
|
|
42
|
+
if (includeDev && await fsx.exists(publicDevDir)) {
|
|
47
43
|
watchPaths.push(path.join(publicDevDir, "**/*"));
|
|
48
44
|
}
|
|
49
45
|
if (watchPaths.length === 0) {
|
|
@@ -53,7 +49,7 @@ async function watchPublicFiles(pkgDir, includeDev) {
|
|
|
53
49
|
watcher.onChange({ delay: 300 }, async (changes) => {
|
|
54
50
|
for (const { event, path: filePath } of changes) {
|
|
55
51
|
let sourceDir;
|
|
56
|
-
if (
|
|
52
|
+
if (pathx.isChildPath(filePath, publicDevDir)) {
|
|
57
53
|
sourceDir = publicDevDir;
|
|
58
54
|
} else {
|
|
59
55
|
sourceDir = publicDir;
|
|
@@ -63,28 +59,28 @@ async function watchPublicFiles(pkgDir, includeDev) {
|
|
|
63
59
|
if (event === "unlink") {
|
|
64
60
|
if (sourceDir === publicDir && includeDev) {
|
|
65
61
|
const devOverride = path.join(publicDevDir, relPath);
|
|
66
|
-
if (await
|
|
62
|
+
if (await fsx.exists(devOverride)) {
|
|
67
63
|
continue;
|
|
68
64
|
}
|
|
69
65
|
}
|
|
70
66
|
if (sourceDir === publicDevDir && includeDev) {
|
|
71
67
|
const publicFallback = path.join(publicDir, relPath);
|
|
72
|
-
if (await
|
|
73
|
-
await
|
|
74
|
-
await
|
|
68
|
+
if (await fsx.exists(publicFallback)) {
|
|
69
|
+
await fsx.mkdir(path.dirname(distPath));
|
|
70
|
+
await fsx.copy(publicFallback, distPath);
|
|
75
71
|
continue;
|
|
76
72
|
}
|
|
77
73
|
}
|
|
78
|
-
await
|
|
74
|
+
await fsx.rm(distPath);
|
|
79
75
|
} else if (event === "add" || event === "change") {
|
|
80
76
|
if (sourceDir === publicDir && includeDev) {
|
|
81
77
|
const devOverride = path.join(publicDevDir, relPath);
|
|
82
|
-
if (await
|
|
78
|
+
if (await fsx.exists(devOverride)) {
|
|
83
79
|
continue;
|
|
84
80
|
}
|
|
85
81
|
}
|
|
86
|
-
await
|
|
87
|
-
await
|
|
82
|
+
await fsx.mkdir(path.dirname(distPath));
|
|
83
|
+
await fsx.copy(filePath, distPath);
|
|
88
84
|
}
|
|
89
85
|
}
|
|
90
86
|
});
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/utils/copy-public.ts"],
|
|
4
|
-
"mappings": "AAAA,OAAO,UAAU;AACjB;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"copy-src.d.ts","sourceRoot":"","sources":["..\\..\\src\\utils\\copy-src.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"copy-src.d.ts","sourceRoot":"","sources":["..\\..\\src\\utils\\copy-src.ts"],"names":[],"mappings":"AACA,OAAO,EAAO,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAErD;;;;;;GAMG;AACH,wBAAsB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAapF;AAED;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,CA0B9F"}
|
package/dist/utils/copy-src.js
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
import path from "path";
|
|
2
|
-
import {
|
|
2
|
+
import { fsx, FsWatcher } from "@simplysm/core-node";
|
|
3
3
|
async function copySrcFiles(pkgDir, patterns) {
|
|
4
4
|
const srcDir = path.join(pkgDir, "src");
|
|
5
5
|
const distDir = path.join(pkgDir, "dist");
|
|
6
6
|
for (const pattern of patterns) {
|
|
7
|
-
const files = await
|
|
7
|
+
const files = await fsx.glob(pattern, { cwd: srcDir, absolute: true });
|
|
8
8
|
for (const file of files) {
|
|
9
9
|
const relativePath = path.relative(srcDir, file);
|
|
10
10
|
const distPath = path.join(distDir, relativePath);
|
|
11
|
-
await
|
|
12
|
-
await
|
|
11
|
+
await fsx.mkdir(path.dirname(distPath));
|
|
12
|
+
await fsx.copy(file, distPath);
|
|
13
13
|
}
|
|
14
14
|
}
|
|
15
15
|
}
|
|
@@ -24,10 +24,10 @@ async function watchCopySrcFiles(pkgDir, patterns) {
|
|
|
24
24
|
const relPath = path.relative(srcDir, filePath);
|
|
25
25
|
const distPath = path.join(distDir, relPath);
|
|
26
26
|
if (event === "unlink") {
|
|
27
|
-
await
|
|
27
|
+
await fsx.rm(distPath);
|
|
28
28
|
} else if (event === "add" || event === "change") {
|
|
29
|
-
await
|
|
30
|
-
await
|
|
29
|
+
await fsx.mkdir(path.dirname(distPath));
|
|
30
|
+
await fsx.copy(filePath, distPath);
|
|
31
31
|
}
|
|
32
32
|
}
|
|
33
33
|
});
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/utils/copy-src.ts"],
|
|
4
|
-
"mappings": "AAAA,OAAO,UAAU;AACjB,SAAS,
|
|
4
|
+
"mappings": "AAAA,OAAO,UAAU;AACjB,SAAS,KAAK,iBAAiB;AAS/B,eAAsB,aAAa,QAAgB,UAAmC;AACpF,QAAM,SAAS,KAAK,KAAK,QAAQ,KAAK;AACtC,QAAM,UAAU,KAAK,KAAK,QAAQ,MAAM;AAExC,aAAW,WAAW,UAAU;AAC9B,UAAM,QAAQ,MAAM,IAAI,KAAK,SAAS,EAAE,KAAK,QAAQ,UAAU,KAAK,CAAC;AACrE,eAAW,QAAQ,OAAO;AACxB,YAAM,eAAe,KAAK,SAAS,QAAQ,IAAI;AAC/C,YAAM,WAAW,KAAK,KAAK,SAAS,YAAY;AAChD,YAAM,IAAI,MAAM,KAAK,QAAQ,QAAQ,CAAC;AACtC,YAAM,IAAI,KAAK,MAAM,QAAQ;AAAA,IAC/B;AAAA,EACF;AACF;AAUA,eAAsB,kBAAkB,QAAgB,UAAwC;AAC9F,QAAM,SAAS,KAAK,KAAK,QAAQ,KAAK;AACtC,QAAM,UAAU,KAAK,KAAK,QAAQ,MAAM;AAGxC,QAAM,aAAa,QAAQ,QAAQ;AAGnC,QAAM,aAAa,SAAS,IAAI,CAAC,MAAM,KAAK,KAAK,QAAQ,CAAC,CAAC;AAC3D,QAAM,UAAU,MAAM,UAAU,MAAM,UAAU;AAEhD,UAAQ,SAAS,EAAE,OAAO,IAAI,GAAG,OAAO,YAAY;AAClD,eAAW,EAAE,OAAO,MAAM,SAAS,KAAK,SAAS;AAC/C,YAAM,UAAU,KAAK,SAAS,QAAQ,QAAQ;AAC9C,YAAM,WAAW,KAAK,KAAK,SAAS,OAAO;AAE3C,UAAI,UAAU,UAAU;AACtB,cAAM,IAAI,GAAG,QAAQ;AAAA,MACvB,WAAW,UAAU,SAAS,UAAU,UAAU;AAChD,cAAM,IAAI,MAAM,KAAK,QAAQ,QAAQ,CAAC;AACtC,cAAM,IAAI,KAAK,UAAU,QAAQ;AAAA,MACnC;AAAA,IACF;AAAA,EACF,CAAC;AAED,SAAO;AACT;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"esbuild-config.d.ts","sourceRoot":"","sources":["..\\..\\src\\utils\\esbuild-config.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAEnC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C;;;;;;GAMG;AACH,wBAAsB,uBAAuB,CAAC,WAAW,EAAE,OAAO,CAAC,UAAU,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CA2BjG;AAED;;;;GAIG;AACH,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,CAAC;IACvC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC1C;AAED;;;GAGG;AACH,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACzC,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,8CAA8C;IAC9C,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB;AAWD;;;;;;;GAOG;AACH,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,YAAY,CAuBhG;AAED;;;;;;;;GAQG;AACH,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,YAAY,CA0B9F;AAED;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,GAAG,YAAY,CAE9F;
|
|
1
|
+
{"version":3,"file":"esbuild-config.d.ts","sourceRoot":"","sources":["..\\..\\src\\utils\\esbuild-config.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAEnC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C;;;;;;GAMG;AACH,wBAAsB,uBAAuB,CAAC,WAAW,EAAE,OAAO,CAAC,UAAU,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CA2BjG;AAED;;;;GAIG;AACH,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,CAAC;IACvC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC1C;AAED;;;GAGG;AACH,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACzC,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,8CAA8C;IAC9C,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB;AAWD;;;;;;;GAOG;AACH,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,YAAY,CAuBhG;AAED;;;;;;;;GAQG;AACH,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,YAAY,CA0B9F;AAED;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,GAAG,YAAY,CAE9F;AA+CD;;;;;GAKG;AACH,wBAAgB,kCAAkC,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CA0B3E;AAMD;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAiBrE"}
|
|
@@ -82,16 +82,7 @@ function createServerEsbuildOptions(options) {
|
|
|
82
82
|
function getTypecheckEnvFromTarget(target) {
|
|
83
83
|
return target === "node" ? "node" : "browser";
|
|
84
84
|
}
|
|
85
|
-
function
|
|
86
|
-
const external = /* @__PURE__ */ new Set();
|
|
87
|
-
const visited = /* @__PURE__ */ new Set();
|
|
88
|
-
const pkgJson = JSON.parse(readFileSync(path.join(pkgDir, "package.json"), "utf-8"));
|
|
89
|
-
for (const dep of Object.keys(pkgJson.dependencies ?? {})) {
|
|
90
|
-
scanOptionalPeerDeps(dep, pkgDir, external, visited);
|
|
91
|
-
}
|
|
92
|
-
return [...external];
|
|
93
|
-
}
|
|
94
|
-
function scanOptionalPeerDeps(pkgName, resolveDir, external, visited) {
|
|
85
|
+
function scanDependencyTree(pkgName, resolveDir, external, visited, collector) {
|
|
95
86
|
if (visited.has(pkgName)) return;
|
|
96
87
|
visited.add(pkgName);
|
|
97
88
|
const req = createRequire(path.join(resolveDir, "noop.js"));
|
|
@@ -103,50 +94,53 @@ function scanOptionalPeerDeps(pkgName, resolveDir, external, visited) {
|
|
|
103
94
|
}
|
|
104
95
|
const depDir = path.dirname(pkgJsonPath);
|
|
105
96
|
const pkgJson = JSON.parse(readFileSync(pkgJsonPath, "utf-8"));
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
for (const [name, meta] of Object.entries(pkgJson.peerDependenciesMeta)) {
|
|
110
|
-
if (meta.optional === true && name in peerDeps) {
|
|
111
|
-
try {
|
|
112
|
-
depReq.resolve(name);
|
|
113
|
-
} catch {
|
|
114
|
-
external.add(name);
|
|
115
|
-
}
|
|
116
|
-
}
|
|
117
|
-
}
|
|
97
|
+
const toExternal = collector(pkgName, depDir, pkgJson);
|
|
98
|
+
for (const name of toExternal) {
|
|
99
|
+
external.add(name);
|
|
118
100
|
}
|
|
119
101
|
for (const dep of Object.keys(pkgJson.dependencies ?? {})) {
|
|
120
|
-
|
|
102
|
+
scanDependencyTree(dep, depDir, external, visited, collector);
|
|
121
103
|
}
|
|
122
104
|
}
|
|
123
|
-
function
|
|
105
|
+
function collectUninstalledOptionalPeerDeps(pkgDir) {
|
|
124
106
|
const external = /* @__PURE__ */ new Set();
|
|
125
107
|
const visited = /* @__PURE__ */ new Set();
|
|
126
108
|
const pkgJson = JSON.parse(readFileSync(path.join(pkgDir, "package.json"), "utf-8"));
|
|
127
109
|
for (const dep of Object.keys(pkgJson.dependencies ?? {})) {
|
|
128
|
-
|
|
110
|
+
scanDependencyTree(dep, pkgDir, external, visited, (_pkgName, depDir, depPkgJson) => {
|
|
111
|
+
const found = [];
|
|
112
|
+
if (depPkgJson.peerDependenciesMeta != null) {
|
|
113
|
+
const peerDeps = depPkgJson.peerDependencies ?? {};
|
|
114
|
+
const depReq = createRequire(path.join(depDir, "noop.js"));
|
|
115
|
+
for (const [name, meta] of Object.entries(depPkgJson.peerDependenciesMeta)) {
|
|
116
|
+
if (meta.optional === true && name in peerDeps) {
|
|
117
|
+
try {
|
|
118
|
+
depReq.resolve(name);
|
|
119
|
+
} catch {
|
|
120
|
+
found.push(name);
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
return found;
|
|
126
|
+
});
|
|
129
127
|
}
|
|
130
128
|
return [...external];
|
|
131
129
|
}
|
|
132
|
-
function
|
|
133
|
-
|
|
134
|
-
visited
|
|
135
|
-
const
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
external.add(pkgName);
|
|
145
|
-
}
|
|
146
|
-
const depPkgJson = JSON.parse(readFileSync(pkgJsonPath, "utf-8"));
|
|
147
|
-
for (const dep of Object.keys(depPkgJson.dependencies ?? {})) {
|
|
148
|
-
scanNativeModules(dep, depDir, external, visited);
|
|
130
|
+
function collectNativeModuleExternals(pkgDir) {
|
|
131
|
+
const external = /* @__PURE__ */ new Set();
|
|
132
|
+
const visited = /* @__PURE__ */ new Set();
|
|
133
|
+
const pkgJson = JSON.parse(readFileSync(path.join(pkgDir, "package.json"), "utf-8"));
|
|
134
|
+
for (const dep of Object.keys(pkgJson.dependencies ?? {})) {
|
|
135
|
+
scanDependencyTree(dep, pkgDir, external, visited, (pkgName, depDir, _pkgJson) => {
|
|
136
|
+
const found = [];
|
|
137
|
+
if (existsSync(path.join(depDir, "binding.gyp"))) {
|
|
138
|
+
found.push(pkgName);
|
|
139
|
+
}
|
|
140
|
+
return found;
|
|
141
|
+
});
|
|
149
142
|
}
|
|
143
|
+
return [...external];
|
|
150
144
|
}
|
|
151
145
|
export {
|
|
152
146
|
collectNativeModuleExternals,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/utils/esbuild-config.ts"],
|
|
4
|
-
"mappings": "AAAA,OAAO,UAAU;AACjB,SAAS,cAAc,kBAAkB;AACzC,OAAO,QAAQ;AACf,SAAS,qBAAqB;AAE9B,SAAS,mBAAmB;AAU5B,eAAsB,wBAAwB,aAAqD;AACjG,MAAI,aAAa;AACjB,QAAM,QAAQ;AAAA,IACZ,YAAY,IAAI,OAAO,SAAS;AAC9B,YAAM,YAAY,KAAK,KAAK,SAAS,KAAK,IACtC,KAAK,KAAK;AAAA,QACR;AAAA,QACA,CAAC,QAAQ,QAAgB,YAAoB,WAAmB;AAC9D,cAAI,sCAAsC,KAAK,UAAU,EAAG,QAAO;AACnE,iBAAO,GAAG,MAAM,GAAG,UAAU,MAAM,MAAM;AAAA,QAC3C;AAAA,MACF,IACA,KAAK;AAET,UAAI;AACF,cAAM,WAAW,MAAM,GAAG,SAAS,KAAK,MAAM,OAAO;AACrD,YAAI,aAAa,UAAW;AAAA,MAC9B,QAAQ;AAAA,MAER;AAEA,mBAAa;AACb,YAAM,GAAG,MAAM,KAAK,QAAQ,KAAK,IAAI,GAAG,EAAE,WAAW,KAAK,CAAC;AAC3D,YAAM,GAAG,UAAU,KAAK,MAAM,SAAS;AAAA,IACzC,CAAC;AAAA,EACH;AACA,SAAO;AACT;AA8BA,SAAS,mBAAmB,QAAyB;AACnD,QAAM,UAAU,KAAK,MAAM,aAAa,KAAK,KAAK,QAAQ,cAAc,GAAG,OAAO,CAAC;AACnF,QAAM,UAAU,EAAE,GAAG,QAAQ,cAAc,GAAG,QAAQ,iBAAiB;AACvE,SAAO,cAAc;AACvB;AAUO,SAAS,4BAA4B,SAAsD;AAChG,QAAM,UAA4B,CAAC;AAEnC,MAAI,mBAAmB,QAAQ,MAAM,GAAG;AACtC,YAAQ,QAAQ,YAAY,CAAC;AAAA,EAC/B;AAEA,SAAO;AAAA,IACL,aAAa,QAAQ;AAAA,IACrB,QAAQ,KAAK,KAAK,QAAQ,QAAQ,MAAM;AAAA,IACxC,QAAQ;AAAA,IACR,WAAW;AAAA,IACX,gBAAgB;AAAA,IAChB,UAAU,QAAQ,WAAW,SAAS,SAAS;AAAA,IAC/C,QAAQ,QAAQ,WAAW,SAAS,WAAW;AAAA,IAC/C,QAAQ;AAAA,IACR,OAAO;AAAA,IACP,aAAa;AAAA,MACX,iBAAiB,QAAQ;AAAA,IAC3B;AAAA,IACA,UAAU;AAAA,IACV;AAAA,EACF;AACF;AAWO,SAAS,2BAA2B,SAAqD;AAC9F,QAAM,SAAiC,CAAC;AACxC,MAAI,QAAQ,OAAO,MAAM;AACvB,eAAW,CAAC,KAAK,KAAK,KAAK,OAAO,QAAQ,QAAQ,GAAG,GAAG;AACtD,aAAO,eAAe,GAAG,EAAE,IAAI,KAAK,UAAU,KAAK;AAAA,IACrD;AAAA,EACF;AAEA,SAAO;AAAA,IACL,aAAa,QAAQ;AAAA,IACrB,QAAQ,KAAK,KAAK,QAAQ,QAAQ,MAAM;AAAA,IACxC,QAAQ;AAAA,IACR,QAAQ;AAAA,IACR,UAAU;AAAA,IACV,QAAQ;AAAA,IACR,QAAQ;AAAA,IACR,QAAQ;AAAA,MACN,IAAI;AAAA,IACN;AAAA,IACA,UAAU,QAAQ;AAAA,IAClB;AAAA,IACA,aAAa;AAAA,MACX,iBAAiB,QAAQ;AAAA,IAC3B;AAAA,IACA,UAAU;AAAA,EACZ;AACF;AAQO,SAAS,0BAA0B,QAAsD;AAC9F,SAAO,WAAW,SAAS,SAAS;AACtC;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -2,7 +2,7 @@ import fs from "fs";
|
|
|
2
2
|
import path from "path";
|
|
3
3
|
import { glob } from "glob";
|
|
4
4
|
import { consola } from "consola";
|
|
5
|
-
import {
|
|
5
|
+
import { fsx, pathx, FsWatcher } from "@simplysm/core-node";
|
|
6
6
|
function resolveReplaceDepEntries(replaceDeps, targetNames) {
|
|
7
7
|
const results = [];
|
|
8
8
|
for (const [pattern, sourceTemplate] of Object.entries(replaceDeps)) {
|
|
@@ -116,7 +116,7 @@ async function setupReplaceDeps(projectRoot, replaceDeps) {
|
|
|
116
116
|
const entries = await resolveAllReplaceDepEntries(projectRoot, replaceDeps, logger);
|
|
117
117
|
for (const { targetName, resolvedSourcePath, actualTargetPath } of entries) {
|
|
118
118
|
try {
|
|
119
|
-
await
|
|
119
|
+
await fsx.copy(resolvedSourcePath, actualTargetPath, replaceDepsCopyFilter);
|
|
120
120
|
setupCount += 1;
|
|
121
121
|
} catch (err) {
|
|
122
122
|
logger.error(`Copy replace failed (${targetName}): ${err instanceof Error ? err.message : err}`);
|
|
@@ -139,7 +139,7 @@ async function watchReplaceDeps(projectRoot, replaceDeps) {
|
|
|
139
139
|
const watcher = await FsWatcher.watch([entry.resolvedSourcePath], { followSymlinks: false });
|
|
140
140
|
watcher.onChange({ delay: 300 }, async (changeInfos) => {
|
|
141
141
|
for (const { path: changedPath } of changeInfos) {
|
|
142
|
-
if (EXCLUDED_NAMES.has(path.basename(changedPath)) || excludedPaths.some((ep) =>
|
|
142
|
+
if (EXCLUDED_NAMES.has(path.basename(changedPath)) || excludedPaths.some((ep) => pathx.isChildPath(changedPath, ep))) {
|
|
143
143
|
continue;
|
|
144
144
|
}
|
|
145
145
|
for (const e of entries) {
|
|
@@ -156,13 +156,13 @@ async function watchReplaceDeps(projectRoot, replaceDeps) {
|
|
|
156
156
|
if (sourceExists) {
|
|
157
157
|
const stat = await fs.promises.stat(changedPath);
|
|
158
158
|
if (stat.isDirectory()) {
|
|
159
|
-
await
|
|
159
|
+
await fsx.mkdir(destPath);
|
|
160
160
|
} else {
|
|
161
|
-
await
|
|
162
|
-
await
|
|
161
|
+
await fsx.mkdir(path.dirname(destPath));
|
|
162
|
+
await fsx.copy(changedPath, destPath, replaceDepsCopyFilter);
|
|
163
163
|
}
|
|
164
164
|
} else {
|
|
165
|
-
await
|
|
165
|
+
await fsx.rm(destPath);
|
|
166
166
|
}
|
|
167
167
|
} catch (err) {
|
|
168
168
|
logger.error(
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/utils/replace-deps.ts"],
|
|
4
|
-
"mappings": "AAAA,OAAO,QAAQ;AACf,OAAO,UAAU;AACjB,SAAS,YAAY;AACrB,SAAS,eAAe;AACxB,SAAS,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/dist/utils/sd-config.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import path from "path";
|
|
2
2
|
import { createJiti } from "jiti";
|
|
3
3
|
import { SdError } from "@simplysm/core-common";
|
|
4
|
-
import {
|
|
4
|
+
import { fsx } from "@simplysm/core-node";
|
|
5
5
|
async function loadSdConfig(params) {
|
|
6
6
|
const sdConfigPath = path.resolve(params.cwd, "sd.config.ts");
|
|
7
|
-
if (!await
|
|
7
|
+
if (!await fsx.exists(sdConfigPath)) {
|
|
8
8
|
throw new SdError(`sd.config.ts file not found: ${sdConfigPath}`);
|
|
9
9
|
}
|
|
10
10
|
const jiti = createJiti(import.meta.url);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/utils/sd-config.ts"],
|
|
4
|
-
"mappings": "AAAA,OAAO,UAAU;AACjB,SAAS,kBAAkB;AAC3B,SAAS,eAAe;AACxB,SAAS,
|
|
4
|
+
"mappings": "AAAA,OAAO,UAAU;AACjB,SAAS,kBAAkB;AAC3B,SAAS,eAAe;AACxB,SAAS,WAAW;AAQpB,eAAsB,aAAa,QAA2C;AAC5E,QAAM,eAAe,KAAK,QAAQ,OAAO,KAAK,cAAc;AAE5D,MAAI,CAAE,MAAM,IAAI,OAAO,YAAY,GAAI;AACrC,UAAM,IAAI,QAAQ,gCAAgC,YAAY,EAAE;AAAA,EAClE;AAEA,QAAM,OAAO,WAAW,YAAY,GAAG;AACvC,QAAM,iBAAiB,MAAM,KAAK,OAAO,YAAY;AAErD,MACE,kBAAkB,QAClB,OAAO,mBAAmB,YAC1B,EAAE,aAAa,mBACf,OAAO,eAAe,YAAY,YAClC;AACA,UAAM,IAAI,QAAQ,mDAAmD,YAAY,EAAE;AAAA,EACrF;AAEA,QAAM,SAAS,MAAM,eAAe,QAAQ,MAAM;AAElD,MACE,UAAU,QACV,OAAO,WAAW,YAClB,EAAE,cAAc,WAChB,OAAO,YAAY,QACnB,OAAO,OAAO,aAAa,YAC3B,MAAM,QAAQ,OAAO,QAAQ,GAC7B;AACA,UAAM,IAAI,QAAQ,2DAA2D,YAAY,EAAE;AAAA,EAC7F;AACA,SAAO;AACT;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/dist/utils/template.js
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import path from "path";
|
|
2
2
|
import Handlebars from "handlebars";
|
|
3
|
-
import {
|
|
3
|
+
import { fsx } from "@simplysm/core-node";
|
|
4
4
|
async function renderTemplateDir(srcDir, destDir, context, dirReplacements) {
|
|
5
|
-
await
|
|
6
|
-
const entries = await
|
|
5
|
+
await fsx.mkdir(destDir);
|
|
6
|
+
const entries = await fsx.readdir(srcDir);
|
|
7
7
|
for (const entry of entries) {
|
|
8
8
|
const srcPath = path.join(srcDir, entry);
|
|
9
|
-
const stat = await
|
|
9
|
+
const stat = await fsx.stat(srcPath);
|
|
10
10
|
if (stat.isDirectory()) {
|
|
11
11
|
const destName = dirReplacements?.[entry] ?? entry;
|
|
12
12
|
await renderTemplateDir(
|
|
@@ -16,14 +16,14 @@ async function renderTemplateDir(srcDir, destDir, context, dirReplacements) {
|
|
|
16
16
|
dirReplacements
|
|
17
17
|
);
|
|
18
18
|
} else if (entry.endsWith(".hbs")) {
|
|
19
|
-
const source = await
|
|
19
|
+
const source = await fsx.read(srcPath);
|
|
20
20
|
const template = Handlebars.compile(source, { noEscape: true });
|
|
21
21
|
const result = template(context);
|
|
22
22
|
if (result.trim().length === 0) continue;
|
|
23
23
|
const destFileName = entry.slice(0, -4);
|
|
24
|
-
await
|
|
24
|
+
await fsx.write(path.join(destDir, destFileName), result);
|
|
25
25
|
} else {
|
|
26
|
-
await
|
|
26
|
+
await fsx.copy(srcPath, path.join(destDir, entry));
|
|
27
27
|
}
|
|
28
28
|
}
|
|
29
29
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/utils/template.ts"],
|
|
4
|
-
"mappings": "AAAA,OAAO,UAAU;AACjB,OAAO,gBAAgB;AACvB,SAAS,
|
|
4
|
+
"mappings": "AAAA,OAAO,UAAU;AACjB,OAAO,gBAAgB;AACvB,SAAS,WAAW;AAcpB,eAAsB,kBACpB,QACA,SACA,SACA,iBACe;AACf,QAAM,IAAI,MAAM,OAAO;AAEvB,QAAM,UAAU,MAAM,IAAI,QAAQ,MAAM;AAExC,aAAW,SAAS,SAAS;AAC3B,UAAM,UAAU,KAAK,KAAK,QAAQ,KAAK;AACvC,UAAM,OAAO,MAAM,IAAI,KAAK,OAAO;AAEnC,QAAI,KAAK,YAAY,GAAG;AAEtB,YAAM,WAAW,kBAAkB,KAAK,KAAK;AAC7C,YAAM;AAAA,QACJ,KAAK,KAAK,QAAQ,KAAK;AAAA,QACvB,KAAK,KAAK,SAAS,QAAQ;AAAA,QAC3B;AAAA,QACA;AAAA,MACF;AAAA,IACF,WAAW,MAAM,SAAS,MAAM,GAAG;AAEjC,YAAM,SAAS,MAAM,IAAI,KAAK,OAAO;AACrC,YAAM,WAAW,WAAW,QAAQ,QAAQ,EAAE,UAAU,KAAK,CAAC;AAC9D,YAAM,SAAS,SAAS,OAAO;AAG/B,UAAI,OAAO,KAAK,EAAE,WAAW,EAAG;AAEhC,YAAM,eAAe,MAAM,MAAM,GAAG,EAAE;AACtC,YAAM,IAAI,MAAM,KAAK,KAAK,SAAS,YAAY,GAAG,MAAM;AAAA,IAC1D,OAAO;AAEL,YAAM,IAAI,KAAK,SAAS,KAAK,KAAK,SAAS,KAAK,CAAC;AAAA,IACnD;AAAA,EACF;AACF;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/dist/utils/tsconfig.d.ts
CHANGED
|
@@ -7,9 +7,8 @@ export declare function getTypesFromPackageJson(packageDir: string): Promise<str
|
|
|
7
7
|
* Type check environment
|
|
8
8
|
* - node: remove DOM lib + add node types
|
|
9
9
|
* - browser: remove node types
|
|
10
|
-
* - neutral: keep DOM lib + add node types (for Node/browser shared packages)
|
|
11
10
|
*/
|
|
12
|
-
export type TypecheckEnv = "node" | "browser"
|
|
11
|
+
export type TypecheckEnv = "node" | "browser";
|
|
13
12
|
/**
|
|
14
13
|
* Create compiler options for package
|
|
15
14
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tsconfig.d.ts","sourceRoot":"","sources":["..\\..\\src\\utils\\tsconfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;AAW5B;;GAEG;AACH,wBAAsB,uBAAuB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAcnF;AAED
|
|
1
|
+
{"version":3,"file":"tsconfig.d.ts","sourceRoot":"","sources":["..\\..\\src\\utils\\tsconfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;AAW5B;;GAEG;AACH,wBAAsB,uBAAuB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAcnF;AAED;;;;GAIG;AACH,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,SAAS,CAAC;AAE9C;;;;;;;;;;;GAWG;AACH,wBAAsB,4BAA4B,CAChD,WAAW,EAAE,EAAE,CAAC,eAAe,EAC/B,GAAG,EAAE,YAAY,EACjB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,EAAE,CAAC,eAAe,CAAC,CAuB7B;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,EAAE,CAAC,iBAAiB,CAiBnE;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,EAAE,CAAC,iBAAiB,GACjC,MAAM,EAAE,CAGV;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,CAAC,iBAAiB,GAAG,MAAM,EAAE,CAO5F"}
|
package/dist/utils/tsconfig.js
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import ts from "typescript";
|
|
2
2
|
import path from "path";
|
|
3
|
-
import {
|
|
3
|
+
import { fsx, pathx } from "@simplysm/core-node";
|
|
4
4
|
import { SdError } from "@simplysm/core-common";
|
|
5
5
|
const DOM_LIB_PATTERNS = ["dom", "webworker"];
|
|
6
6
|
async function getTypesFromPackageJson(packageDir) {
|
|
7
7
|
const packageJsonPath = path.join(packageDir, "package.json");
|
|
8
|
-
if (!await
|
|
8
|
+
if (!await fsx.exists(packageJsonPath)) {
|
|
9
9
|
return [];
|
|
10
10
|
}
|
|
11
|
-
const packageJson = await
|
|
11
|
+
const packageJson = await fsx.readJson(
|
|
12
12
|
packageJsonPath
|
|
13
13
|
);
|
|
14
14
|
const devDeps = packageJson.devDependencies ?? {};
|
|
@@ -31,9 +31,6 @@ async function getCompilerOptionsForPackage(baseOptions, env, packageDir) {
|
|
|
31
31
|
case "browser":
|
|
32
32
|
options.types = packageTypes.filter((t) => t !== "node");
|
|
33
33
|
break;
|
|
34
|
-
case "neutral":
|
|
35
|
-
options.types = [.../* @__PURE__ */ new Set([...packageTypes, "node"])];
|
|
36
|
-
break;
|
|
37
34
|
}
|
|
38
35
|
return options;
|
|
39
36
|
}
|
|
@@ -53,11 +50,11 @@ function parseRootTsconfig(cwd) {
|
|
|
53
50
|
}
|
|
54
51
|
function getPackageSourceFiles(pkgDir, parsedConfig) {
|
|
55
52
|
const pkgSrcDir = path.join(pkgDir, "src");
|
|
56
|
-
return parsedConfig.fileNames.filter((f) =>
|
|
53
|
+
return parsedConfig.fileNames.filter((f) => pathx.isChildPath(f, pkgSrcDir));
|
|
57
54
|
}
|
|
58
55
|
function getPackageFiles(pkgDir, parsedConfig) {
|
|
59
56
|
return parsedConfig.fileNames.filter((f) => {
|
|
60
|
-
if (!
|
|
57
|
+
if (!pathx.isChildPath(f, pkgDir)) return false;
|
|
61
58
|
const relative = path.relative(pkgDir, f);
|
|
62
59
|
return path.dirname(relative) !== ".";
|
|
63
60
|
});
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/utils/tsconfig.ts"],
|
|
4
|
-
"mappings": "AAAA,OAAO,QAAQ;AACf,OAAO,UAAU;AACjB,SAAS,
|
|
4
|
+
"mappings": "AAAA,OAAO,QAAQ;AACf,OAAO,UAAU;AACjB,SAAS,KAAK,aAAa;AAC3B,SAAS,eAAe;AAMxB,MAAM,mBAAmB,CAAC,OAAO,WAAW;AAK5C,eAAsB,wBAAwB,YAAuC;AACnF,QAAM,kBAAkB,KAAK,KAAK,YAAY,cAAc;AAC5D,MAAI,CAAE,MAAM,IAAI,OAAO,eAAe,GAAI;AACxC,WAAO,CAAC;AAAA,EACV;AAEA,QAAM,cAAc,MAAM,IAAI;AAAA,IAC5B;AAAA,EACF;AACA,QAAM,UAAU,YAAY,mBAAmB,CAAC;AAEhD,SAAO,OAAO,KAAK,OAAO,EACvB,OAAO,CAAC,QAAQ,IAAI,WAAW,SAAS,CAAC,EACzC,IAAI,CAAC,QAAQ,IAAI,QAAQ,WAAW,EAAE,CAAC;AAC5C;AAqBA,eAAsB,6BACpB,aACA,KACA,YAC6B;AAC7B,QAAM,UAAU,EAAE,GAAG,YAAY;AACjC,QAAM,eAAe,MAAM,wBAAwB,UAAU;AAG7D,UAAQ,YAAY;AAAA,IAClB,KAAK,KAAK,YAAY,gBAAgB,QAAQ;AAAA,IAC9C,KAAK,KAAK,QAAQ,IAAI,GAAG,gBAAgB,QAAQ;AAAA,EACnD;AAEA,UAAQ,KAAK;AAAA,IACX,KAAK;AACH,cAAQ,MAAM,QAAQ,KAAK;AAAA,QACzB,CAAC,QAAQ,CAAC,iBAAiB,KAAK,CAAC,YAAY,IAAI,YAAY,EAAE,SAAS,OAAO,CAAC;AAAA,MAClF;AACA,cAAQ,QAAQ,CAAC,GAAG,oBAAI,IAAI,CAAC,GAAG,cAAc,MAAM,CAAC,CAAC;AACtD;AAAA,IACF,KAAK;AACH,cAAQ,QAAQ,aAAa,OAAO,CAAC,MAAM,MAAM,MAAM;AACvD;AAAA,EACJ;AAEA,SAAO;AACT;AAMO,SAAS,kBAAkB,KAAmC;AACnE,QAAM,eAAe,KAAK,KAAK,KAAK,eAAe;AACnD,QAAM,aAAa,GAAG,eAAe,cAAc,GAAG,IAAI,QAAQ;AAElE,MAAI,WAAW,OAAO;AACpB,UAAM,UAAU,GAAG,6BAA6B,WAAW,MAAM,aAAa,IAAI;AAClF,UAAM,IAAI,QAAQ,iCAAiC,OAAO,EAAE;AAAA,EAC9D;AAEA,QAAM,SAAS,GAAG,2BAA2B,WAAW,QAAQ,GAAG,KAAK,GAAG;AAE3E,MAAI,OAAO,OAAO,SAAS,GAAG;AAC5B,UAAM,WAAW,OAAO,OAAO,IAAI,CAAC,MAAM,GAAG,6BAA6B,EAAE,aAAa,IAAI,CAAC;AAC9F,UAAM,IAAI,QAAQ,kCAAkC,SAAS,KAAK,IAAI,CAAC,EAAE;AAAA,EAC3E;AAEA,SAAO;AACT;AAKO,SAAS,sBACd,QACA,cACU;AACV,QAAM,YAAY,KAAK,KAAK,QAAQ,KAAK;AACzC,SAAO,aAAa,UAAU,OAAO,CAAC,MAAM,MAAM,YAAY,GAAG,SAAS,CAAC;AAC7E;AAKO,SAAS,gBAAgB,QAAgB,cAA8C;AAC5F,SAAO,aAAa,UAAU,OAAO,CAAC,MAAM;AAC1C,QAAI,CAAC,MAAM,YAAY,GAAG,MAAM,EAAG,QAAO;AAE1C,UAAM,WAAW,KAAK,SAAS,QAAQ,CAAC;AACxC,WAAO,KAAK,QAAQ,QAAQ,MAAM;AAAA,EACpC,CAAC;AACH;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import ts from "typescript";
|
|
2
|
-
import {
|
|
2
|
+
import { fsx } from "@simplysm/core-node";
|
|
3
3
|
function serializeDiagnostic(diagnostic) {
|
|
4
4
|
const messageText = ts.flattenDiagnosticMessageText(diagnostic.messageText, "\n");
|
|
5
5
|
return {
|
|
@@ -25,7 +25,7 @@ function deserializeDiagnostic(serialized, fileCache) {
|
|
|
25
25
|
if (serialized.file != null) {
|
|
26
26
|
const fileName = serialized.file.fileName;
|
|
27
27
|
if (!fileCache.has(fileName)) {
|
|
28
|
-
fileCache.set(fileName,
|
|
28
|
+
fileCache.set(fileName, fsx.existsSync(fileName) ? fsx.readSync(fileName) : "");
|
|
29
29
|
}
|
|
30
30
|
const content = fileCache.get(fileName);
|
|
31
31
|
const scriptKind = getScriptKind(fileName);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/utils/typecheck-serialization.ts"],
|
|
4
|
-
"mappings": "AAAA,OAAO,QAAQ;AACf,SAAS,
|
|
4
|
+
"mappings": "AAAA,OAAO,QAAQ;AACf,SAAS,WAAW;AAoBb,SAAS,oBAAoB,YAAiD;AAEnF,QAAM,cAAc,GAAG,6BAA6B,WAAW,aAAa,IAAI;AAEhF,SAAO;AAAA,IACL,UAAU,WAAW;AAAA,IACrB,MAAM,WAAW;AAAA,IACjB;AAAA,IACA,MAAM,WAAW,OACb;AAAA,MACE,UAAU,WAAW,KAAK;AAAA,IAC5B,IACA;AAAA,IACJ,OAAO,WAAW;AAAA,IAClB,QAAQ,WAAW;AAAA,EACrB;AACF;AAKA,SAAS,cAAc,UAAiC;AACtD,MAAI,SAAS,SAAS,MAAM,EAAG,QAAO,GAAG,WAAW;AACpD,MAAI,SAAS,SAAS,MAAM,EAAG,QAAO,GAAG,WAAW;AACpD,MAAI,SAAS,SAAS,KAAK,KAAK,SAAS,SAAS,MAAM,KAAK,SAAS,SAAS,MAAM;AACnF,WAAO,GAAG,WAAW;AACvB,SAAO,GAAG,WAAW;AACvB;AASO,SAAS,sBACd,YACA,WACe;AACf,MAAI;AACJ,MAAI,WAAW,QAAQ,MAAM;AAC3B,UAAM,WAAW,WAAW,KAAK;AAKjC,QAAI,CAAC,UAAU,IAAI,QAAQ,GAAG;AAC5B,gBAAU,IAAI,UAAU,IAAI,WAAW,QAAQ,IAAI,IAAI,SAAS,QAAQ,IAAI,EAAE;AAAA,IAChF;AACA,UAAM,UAAU,UAAU,IAAI,QAAQ;AAEtC,UAAM,aAAa,cAAc,QAAQ;AACzC,WAAO,GAAG,iBAAiB,UAAU,SAAS,GAAG,aAAa,QAAQ,OAAO,UAAU;AAAA,EACzF;AAEA,SAAO;AAAA,IACL,UAAU,WAAW;AAAA,IACrB,MAAM,WAAW;AAAA,IACjB,aAAa,WAAW;AAAA,IACxB;AAAA,IACA,OAAO,WAAW;AAAA,IAClB,QAAQ,WAAW;AAAA,EACrB;AACF;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vite-config.d.ts","sourceRoot":"","sources":["..\\..\\src\\utils\\vite-config.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAU,UAAU,IAAI,cAAc,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"vite-config.d.ts","sourceRoot":"","sources":["..\\..\\src\\utils\\vite-config.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAU,UAAU,IAAI,cAAc,EAAE,MAAM,MAAM,CAAC;AAuGjE,qCAAqC;AACrC,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE/C;AA0KD;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACzC,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,IAAI,EAAE,OAAO,GAAG,KAAK,CAAC;IACtB,kDAAkD;IAClD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,0DAA0D;IAC1D,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,qDAAqD;IACrD,cAAc,CAAC,EAAE,MAAM,IAAI,CAAC;CAC7B;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,iBAAiB,GAAG,cAAc,CAuE3E"}
|