@simplysm/sd-cli 13.0.38 → 13.0.40
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/builders/BaseBuilder.d.ts.map +1 -1
- package/dist/builders/DtsBuilder.d.ts.map +1 -1
- package/dist/builders/LibraryBuilder.d.ts.map +1 -1
- package/dist/builders/index.d.ts.map +1 -1
- package/dist/builders/types.d.ts.map +1 -1
- package/dist/capacitor/capacitor.d.ts.map +1 -1
- package/dist/commands/add-client.d.ts.map +1 -1
- package/dist/commands/add-server.d.ts.map +1 -1
- package/dist/commands/build.d.ts.map +1 -1
- package/dist/commands/dev.d.ts.map +1 -1
- package/dist/commands/device.d.ts.map +1 -1
- package/dist/commands/init.d.ts.map +1 -1
- package/dist/commands/lint.d.ts.map +1 -1
- package/dist/commands/lint.js +26 -8
- package/dist/commands/lint.js.map +1 -1
- package/dist/commands/publish.d.ts.map +1 -1
- package/dist/commands/replace-deps.d.ts.map +1 -1
- package/dist/commands/typecheck.d.ts.map +1 -1
- package/dist/commands/watch.d.ts.map +1 -1
- package/dist/electron/electron.d.ts.map +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/infra/ResultCollector.d.ts.map +1 -1
- package/dist/infra/SignalHandler.d.ts.map +1 -1
- package/dist/infra/WorkerManager.d.ts.map +1 -1
- package/dist/infra/index.d.ts.map +1 -1
- package/dist/orchestrators/BuildOrchestrator.d.ts.map +1 -1
- package/dist/orchestrators/DevOrchestrator.d.ts.map +1 -1
- package/dist/orchestrators/WatchOrchestrator.d.ts.map +1 -1
- package/dist/orchestrators/index.d.ts.map +1 -1
- package/dist/sd-cli-entry.d.ts.map +1 -1
- package/dist/sd-cli.d.ts.map +1 -1
- package/dist/sd-config.types.d.ts.map +1 -1
- package/dist/utils/build-env.d.ts.map +1 -1
- package/dist/utils/config-editor.d.ts.map +1 -1
- package/dist/utils/copy-public.d.ts.map +1 -1
- package/dist/utils/copy-public.js +10 -2
- package/dist/utils/copy-public.js.map +1 -1
- package/dist/utils/copy-src.d.ts.map +1 -1
- package/dist/utils/esbuild-config.d.ts.map +1 -1
- package/dist/utils/output-utils.d.ts.map +1 -1
- package/dist/utils/package-utils.d.ts.map +1 -1
- package/dist/utils/rebuild-manager.d.ts.map +1 -1
- package/dist/utils/replace-deps.d.ts.map +1 -1
- package/dist/utils/replace-deps.js +7 -3
- package/dist/utils/replace-deps.js.map +1 -1
- package/dist/utils/sd-config.d.ts.map +1 -1
- package/dist/utils/spawn.d.ts.map +1 -1
- package/dist/utils/tailwind-config-deps.d.ts.map +1 -1
- package/dist/utils/template.d.ts.map +1 -1
- package/dist/utils/tsconfig.d.ts.map +1 -1
- package/dist/utils/tsconfig.js +4 -5
- package/dist/utils/tsconfig.js.map +1 -1
- package/dist/utils/typecheck-serialization.d.ts.map +1 -1
- package/dist/utils/vite-config.d.ts.map +1 -1
- package/dist/utils/vite-config.js +6 -2
- package/dist/utils/vite-config.js.map +1 -1
- package/dist/utils/worker-events.d.ts.map +1 -1
- package/dist/utils/worker-utils.d.ts.map +1 -1
- package/dist/workers/client.worker.d.ts.map +1 -1
- package/dist/workers/dts.worker.d.ts.map +1 -1
- package/dist/workers/dts.worker.js +13 -12
- package/dist/workers/dts.worker.js.map +1 -1
- package/dist/workers/library.worker.d.ts.map +1 -1
- package/dist/workers/server-runtime.worker.d.ts.map +1 -1
- package/dist/workers/server-runtime.worker.js +2 -1
- package/dist/workers/server-runtime.worker.js.map +1 -1
- package/dist/workers/server.worker.d.ts.map +1 -1
- package/package.json +8 -8
- package/src/commands/lint.ts +28 -8
- package/src/utils/copy-public.ts +10 -2
- package/src/utils/replace-deps.ts +12 -4
- package/src/utils/tsconfig.ts +4 -6
- package/src/utils/vite-config.ts +6 -2
- package/src/workers/dts.worker.ts +14 -12
- package/src/workers/server-runtime.worker.ts +2 -1
- package/templates/add-client/__CLIENT__/package.json.hbs +1 -1
- package/templates/add-server/__SERVER__/package.json.hbs +2 -2
- package/templates/init/package.json.hbs +3 -3
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/utils/vite-config.ts"],
|
|
4
|
-
"mappings": "AAAA,OAAO,QAAQ;AACf,SAAS,qBAAqB;AAC9B,OAAO,UAAU;AAEjB,OAAO,mBAAmB;AAC1B,OAAO,iBAAiB;AACxB,SAAS,eAAe;AACxB,OAAO,iBAAiB;AAExB,SAAS,6BAA6B;AACtC,SAAS,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-events.d.ts","sourceRoot":"","sources":["
|
|
1
|
+
{"version":3,"file":"worker-events.d.ts","sourceRoot":"","sources":["..\\..\\src\\utils\\worker-events.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAIxD,2BAA2B;AAC3B,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB;AAED,wBAAwB;AACxB,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,2BAA2B;AAC3B,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;CACd;AAED,8BAA8B;AAC9B,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB;AAED;;GAEG;AACH,MAAM,WAAW,cAAc,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC;IAC3F,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,eAAe,CAAC;IACxB,MAAM,EAAE;QACN,EAAE,CAAC,CAAC,SAAS,MAAM,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,IAAI,CAAC;QACpF,IAAI,CAAC,CAAC,SAAS,MAAM,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;KACpE,CAAC;IACF,cAAc,EAAE,OAAO,CAAC;IACxB,aAAa,EAAE,CAAC,MAAM,IAAI,CAAC,GAAG,SAAS,CAAC;CACzC;AAED;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACxC,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,OAAO,GAAG,KAAK,CAAC;CAC7B;AAED;;;;;;;;GAQG;AACH,wBAAgB,2BAA2B,CACzC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,EACrC,CAAC,SAAS,cAAc,CAAC,OAAO,CAAC,EAEjC,UAAU,EAAE,CAAC,EACb,IAAI,EAAE,yBAAyB,EAC/B,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,EACnC,cAAc,EAAE,cAAc,GAC7B,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,CAsDjC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-utils.d.ts","sourceRoot":"","sources":["
|
|
1
|
+
{"version":3,"file":"worker-utils.d.ts","sourceRoot":"","sources":["..\\..\\src\\utils\\worker-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAE/C;;;;;;;;;GASG;AACH,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,EAC5B,MAAM,EAAE,eAAe,GACtB,IAAI,CAaN"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.worker.d.ts","sourceRoot":"","sources":["
|
|
1
|
+
{"version":3,"file":"client.worker.d.ts","sourceRoot":"","sources":["..\\..\\src\\workers\\client.worker.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAOhE;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,qBAAqB,CAAC;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,qBAAqB,CAAC;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,wBAAwB;IACxB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,kBAAmB,SAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IACjE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAClC,KAAK,EAAE,gBAAgB,CAAC;IACxB,WAAW,EAAE,sBAAsB,CAAC;IACpC,KAAK,EAAE,gBAAgB,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;CACrC;AAkCD;;GAEG;AACH,iBAAe,KAAK,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAoCtE;AAKD;;;;GAIG;AACH,iBAAe,UAAU,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAuD9D;AAED;;;GAGG;AACH,iBAAe,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,CAExC;AAED,QAAA,MAAM,MAAM;;;eACD,OAAO,KAAK;oBAAc,OAAO,UAAU;mBAAa,OAAO,SAAS;;;CAMjF,CAAC;AAEH,eAAe,MAAM,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dts.worker.d.ts","sourceRoot":"","sources":["
|
|
1
|
+
{"version":3,"file":"dts.worker.d.ts","sourceRoot":"","sources":["..\\..\\src\\workers\\dts.worker.ts"],"names":[],"mappings":"AAIA,OAAO,EAKL,KAAK,YAAY,EAClB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAuB,KAAK,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAIlG;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,YAAY,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,4DAA4D;IAC5D,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,6BAA6B;IAC7B,GAAG,CAAC,EAAE,YAAY,CAAC;IACnB,sDAAsD;IACtD,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,WAAW,EAAE,oBAAoB,EAAE,CAAC;IACpC,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,eAAgB,SAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAC9D,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAClC,KAAK,EAAE,aAAa,CAAC;IACrB,KAAK,EAAE,aAAa,CAAC;CACtB;AAiHD;;GAEG;AACH,iBAAe,QAAQ,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,cAAc,CAAC,CA6InE;AASD;;;;GAIG;AACH,iBAAe,aAAa,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CA2G9D;AAED,QAAA,MAAM,MAAM;;;uBACO,OAAO,aAAa;kBAAY,OAAO,QAAQ;;;CAKhE,CAAC;AAEH,eAAe,MAAM,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import path from "path";
|
|
2
2
|
import ts from "typescript";
|
|
3
|
-
import { createWorker } from "@simplysm/core-node";
|
|
3
|
+
import { createWorker, pathIsChildPath, pathNorm } from "@simplysm/core-node";
|
|
4
4
|
import { consola } from "consola";
|
|
5
5
|
import {
|
|
6
6
|
getCompilerOptionsForPackage,
|
|
@@ -50,10 +50,11 @@ function adjustDtsMapSources(content, originalDir, newDir) {
|
|
|
50
50
|
}
|
|
51
51
|
function createDtsPathRewriter(pkgDir) {
|
|
52
52
|
const pkgName = path.basename(pkgDir);
|
|
53
|
-
const distDir = path.join(pkgDir, "dist");
|
|
53
|
+
const distDir = pathNorm(path.join(pkgDir, "dist"));
|
|
54
54
|
const distPrefix = distDir + path.sep;
|
|
55
|
-
const ownNestedPrefix = path.join(distDir, pkgName, "src") + path.sep;
|
|
55
|
+
const ownNestedPrefix = pathNorm(path.join(distDir, pkgName, "src")) + path.sep;
|
|
56
56
|
return (fileName, content) => {
|
|
57
|
+
fileName = pathNorm(fileName);
|
|
57
58
|
if (!fileName.startsWith(distPrefix)) return null;
|
|
58
59
|
if (fileName.startsWith(ownNestedPrefix)) {
|
|
59
60
|
const flatPath = path.join(distDir, fileName.slice(ownNestedPrefix.length));
|
|
@@ -82,12 +83,12 @@ async function buildDts(info) {
|
|
|
82
83
|
const shouldEmit2 = info.emit !== false;
|
|
83
84
|
if (shouldEmit2) {
|
|
84
85
|
rootFiles = getPackageSourceFiles(info.pkgDir, parsedConfig);
|
|
85
|
-
const
|
|
86
|
-
diagnosticFilter = (d) => d.file == null || d.file.fileName
|
|
86
|
+
const pkgSrcDir = path.join(info.pkgDir, "src");
|
|
87
|
+
diagnosticFilter = (d) => d.file == null || pathIsChildPath(d.file.fileName, pkgSrcDir);
|
|
87
88
|
} else {
|
|
88
89
|
rootFiles = getPackageFiles(info.pkgDir, parsedConfig);
|
|
89
|
-
const
|
|
90
|
-
diagnosticFilter = (d) => d.file == null || d.file.fileName
|
|
90
|
+
const pkgDir = info.pkgDir;
|
|
91
|
+
diagnosticFilter = (d) => d.file == null || pathIsChildPath(d.file.fileName, pkgDir);
|
|
91
92
|
}
|
|
92
93
|
tsBuildInfoFile = path.join(
|
|
93
94
|
info.pkgDir,
|
|
@@ -95,10 +96,10 @@ async function buildDts(info) {
|
|
|
95
96
|
shouldEmit2 ? "dts.tsbuildinfo" : `typecheck-${info.env}.tsbuildinfo`
|
|
96
97
|
);
|
|
97
98
|
} else {
|
|
98
|
-
const
|
|
99
|
-
rootFiles = parsedConfig.fileNames.filter((f) => !f
|
|
99
|
+
const packagesDir = path.join(info.cwd, "packages");
|
|
100
|
+
rootFiles = parsedConfig.fileNames.filter((f) => !pathIsChildPath(f, packagesDir));
|
|
100
101
|
baseOptions = parsedConfig.options;
|
|
101
|
-
diagnosticFilter = (d) => d.file == null || !d.file.fileName
|
|
102
|
+
diagnosticFilter = (d) => d.file == null || !pathIsChildPath(d.file.fileName, packagesDir);
|
|
102
103
|
tsBuildInfoFile = path.join(info.cwd, ".cache", "typecheck-root.tsbuildinfo");
|
|
103
104
|
}
|
|
104
105
|
const shouldEmit = info.emit !== false;
|
|
@@ -193,7 +194,7 @@ async function startDtsWatch(info) {
|
|
|
193
194
|
info.env,
|
|
194
195
|
info.pkgDir
|
|
195
196
|
);
|
|
196
|
-
const
|
|
197
|
+
const pkgSrcDir = path.join(info.pkgDir, "src");
|
|
197
198
|
const options = {
|
|
198
199
|
...baseOptions,
|
|
199
200
|
emitDeclarationOnly: true,
|
|
@@ -210,7 +211,7 @@ async function startDtsWatch(info) {
|
|
|
210
211
|
const collectedErrors = [];
|
|
211
212
|
const reportDiagnostic = (diagnostic) => {
|
|
212
213
|
if (diagnostic.category === ts.DiagnosticCategory.Error) {
|
|
213
|
-
if (diagnostic.file != null && !diagnostic.file.fileName
|
|
214
|
+
if (diagnostic.file != null && !pathIsChildPath(diagnostic.file.fileName, pkgSrcDir)) {
|
|
214
215
|
return;
|
|
215
216
|
}
|
|
216
217
|
const message = ts.flattenDiagnosticMessageText(diagnostic.messageText, "\n");
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/workers/dts.worker.ts"],
|
|
4
|
-
"mappings": "AAAA,OAAO,UAAU;AACjB,OAAO,QAAQ;AACf,SAAS,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["shouldEmit"]
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"library.worker.d.ts","sourceRoot":"","sources":["
|
|
1
|
+
{"version":3,"file":"library.worker.d.ts","sourceRoot":"","sources":["..\\..\\src\\workers\\library.worker.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAe/D;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,oBAAoB,CAAC;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,oBAAoB,CAAC;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,mBAAoB,SAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAClE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAClC,KAAK,EAAE,iBAAiB,CAAC;IACzB,KAAK,EAAE,iBAAiB,CAAC;CAC1B;AAsCD;;GAEG;AACH,iBAAe,KAAK,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAuCxE;AA6ED;;;;GAIG;AACH,iBAAe,UAAU,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CA8D/D;AAED;;;GAGG;AACH,iBAAe,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,CAExC;AAED,QAAA,MAAM,MAAM;;;eACD,OAAO,KAAK;oBAAc,OAAO,UAAU;mBAAa,OAAO,SAAS;;;CAMjF,CAAC;AAEH,eAAe,MAAM,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-runtime.worker.d.ts","sourceRoot":"","sources":["
|
|
1
|
+
{"version":3,"file":"server-runtime.worker.d.ts","sourceRoot":"","sources":["..\\..\\src\\workers\\server-runtime.worker.ts"],"names":[],"mappings":"AASA;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACrC;AAED;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,yBAA0B,SAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IACxE,WAAW,EAAE,uBAAuB,CAAC;IACrC,KAAK,EAAE,uBAAuB,CAAC;CAChC;AAmED;;;GAGG;AACH,iBAAe,KAAK,CAAC,IAAI,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC,CAyChE;AAED,QAAA,MAAM,MAAM;;;eAAyB,OAAO,KAAK;;;CAE/C,CAAC;AAEH,eAAe,MAAM,CAAC"}
|
|
@@ -2,6 +2,7 @@ import proxy from "@fastify/http-proxy";
|
|
|
2
2
|
import { createWorker } from "@simplysm/core-node";
|
|
3
3
|
import { consola } from "consola";
|
|
4
4
|
import net from "net";
|
|
5
|
+
import { pathToFileURL } from "url";
|
|
5
6
|
import { registerCleanupHandlers } from "../utils/worker-utils.js";
|
|
6
7
|
const logger = consola.withTag("sd:cli:server-runtime:worker");
|
|
7
8
|
let serverInstance;
|
|
@@ -48,7 +49,7 @@ async function findAvailablePort(startPort, maxRetries = 20) {
|
|
|
48
49
|
}
|
|
49
50
|
async function start(info) {
|
|
50
51
|
try {
|
|
51
|
-
const module = await import(info.mainJsPath);
|
|
52
|
+
const module = await import(pathToFileURL(info.mainJsPath).href);
|
|
52
53
|
const server = module.server;
|
|
53
54
|
if (server == null) {
|
|
54
55
|
throw new Error("main.js\uC5D0\uC11C server \uC778\uC2A4\uD134\uC2A4\uB97C export\uD574\uC57C \uD569\uB2C8\uB2E4.");
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/workers/server-runtime.worker.ts"],
|
|
4
|
-
"mappings": "AAAA,OAAO,WAAW;AAClB,SAAS,oBAAoB;AAC7B,SAAS,eAAe;AACxB,OAAO,SAAS;AAChB,SAAS,+BAA+B;AAoCxC,MAAM,SAAS,QAAQ,QAAQ,8BAA8B;AAG7D,IAAI;AAKJ,eAAe,UAAyB;AACtC,QAAM,SAAS;AACf,MAAI,UAAU,MAAM;AAClB,UAAM,OAAO,MAAM;AAAA,EACrB;AACA,mBAAiB;AACnB;AAIA,QAAQ,GAAG,qBAAqB,CAAC,QAAQ;AACvC,SAAO,MAAM,kDAAyB,GAAG;AACzC,SAAO,KAAK,SAAS;AAAA,IACnB,SAAS,eAAe,QAAQ,IAAI,UAAU,OAAO,GAAG;AAAA,EAC1D,CAAC;AACH,CAAC;AAED,QAAQ,GAAG,sBAAsB,CAAC,WAAW;AAC3C,SAAO,MAAM,0DAAiC,MAAM;AACpD,SAAO,KAAK,SAAS;AAAA,IACnB,SAAS,kBAAkB,QAAQ,OAAO,UAAU,OAAO,MAAM;AAAA,EACnE,CAAC;AACH,CAAC;AAED,wBAAwB,SAAS,MAAM;AAKvC,SAAS,gBAAgB,MAAgC;AACvD,SAAO,IAAI,QAAQ,CAAC,YAAY;AAC9B,UAAM,SAAS,IAAI,aAAa;AAChC,WAAO,KAAK,SAAS,MAAM,QAAQ,KAAK,CAAC;AACzC,WAAO,KAAK,aAAa,MAAM;AAC7B,aAAO,MAAM,MAAM,QAAQ,IAAI,CAAC;AAAA,IAClC,CAAC;AACD,WAAO,OAAO,MAAM,SAAS;AAAA,EAC/B,CAAC;AACH;AAKA,eAAe,kBAAkB,WAAmB,aAAa,IAAqB;AACpF,WAAS,IAAI,GAAG,IAAI,YAAY,KAAK;AACnC,UAAM,OAAO,YAAY;AACzB,QAAI,MAAM,gBAAgB,IAAI,GAAG;AAC/B,aAAO;AAAA,IACT;AAAA,EACF;AACA,QAAM,IAAI;AAAA,IACR,gBAAM,SAAS,gBAAM,YAAY,aAAa,CAAC;AAAA,EACjD;AACF;AAMA,eAAe,MAAM,MAA6C;AAChE,MAAI;AAEF,UAAM,SAAS,MAAM,OAAO,KAAK;
|
|
4
|
+
"mappings": "AAAA,OAAO,WAAW;AAClB,SAAS,oBAAoB;AAC7B,SAAS,eAAe;AACxB,OAAO,SAAS;AAChB,SAAS,qBAAqB;AAC9B,SAAS,+BAA+B;AAoCxC,MAAM,SAAS,QAAQ,QAAQ,8BAA8B;AAG7D,IAAI;AAKJ,eAAe,UAAyB;AACtC,QAAM,SAAS;AACf,MAAI,UAAU,MAAM;AAClB,UAAM,OAAO,MAAM;AAAA,EACrB;AACA,mBAAiB;AACnB;AAIA,QAAQ,GAAG,qBAAqB,CAAC,QAAQ;AACvC,SAAO,MAAM,kDAAyB,GAAG;AACzC,SAAO,KAAK,SAAS;AAAA,IACnB,SAAS,eAAe,QAAQ,IAAI,UAAU,OAAO,GAAG;AAAA,EAC1D,CAAC;AACH,CAAC;AAED,QAAQ,GAAG,sBAAsB,CAAC,WAAW;AAC3C,SAAO,MAAM,0DAAiC,MAAM;AACpD,SAAO,KAAK,SAAS;AAAA,IACnB,SAAS,kBAAkB,QAAQ,OAAO,UAAU,OAAO,MAAM;AAAA,EACnE,CAAC;AACH,CAAC;AAED,wBAAwB,SAAS,MAAM;AAKvC,SAAS,gBAAgB,MAAgC;AACvD,SAAO,IAAI,QAAQ,CAAC,YAAY;AAC9B,UAAM,SAAS,IAAI,aAAa;AAChC,WAAO,KAAK,SAAS,MAAM,QAAQ,KAAK,CAAC;AACzC,WAAO,KAAK,aAAa,MAAM;AAC7B,aAAO,MAAM,MAAM,QAAQ,IAAI,CAAC;AAAA,IAClC,CAAC;AACD,WAAO,OAAO,MAAM,SAAS;AAAA,EAC/B,CAAC;AACH;AAKA,eAAe,kBAAkB,WAAmB,aAAa,IAAqB;AACpF,WAAS,IAAI,GAAG,IAAI,YAAY,KAAK;AACnC,UAAM,OAAO,YAAY;AACzB,QAAI,MAAM,gBAAgB,IAAI,GAAG;AAC/B,aAAO;AAAA,IACT;AAAA,EACF;AACA,QAAM,IAAI;AAAA,IACR,gBAAM,SAAS,gBAAM,YAAY,aAAa,CAAC;AAAA,EACjD;AACF;AAMA,eAAe,MAAM,MAA6C;AAChE,MAAI;AAEF,UAAM,SAAS,MAAM,OAAO,cAAc,KAAK,UAAU,EAAE;AAC3D,UAAM,SAAS,OAAO;AAEtB,QAAI,UAAU,MAAM;AAClB,YAAM,IAAI,MAAM,kGAAsC;AAAA,IACxD;AAGA,qBAAiB;AAGjB,UAAM,eAAe,OAAO,QAAQ;AACpC,UAAM,gBAAgB,MAAM,kBAAkB,YAAY;AAC1D,QAAI,kBAAkB,cAAc;AAClC,aAAO,KAAK,gBAAM,YAAY,+BAAW,aAAa,qBAAM;AAC5D,aAAO,QAAQ,OAAO;AAAA,IACxB;AAGA,eAAW,CAAC,MAAM,IAAI,KAAK,OAAO,QAAQ,KAAK,WAAW,GAAG;AAC3D,YAAM,OAAO,QAAQ,SAAS,OAAO;AAAA,QACnC,QAAQ,IAAI,IAAI;AAAA,QAChB,UAAU,oBAAoB,IAAI;AAAA,QAClC,eAAe,IAAI,IAAI;AAAA,QACvB,WAAW;AAAA,MACb,CAAC;AAAA,IACH;AAGA,UAAM,OAAO,OAAO;AAEpB,WAAO,KAAK,eAAe,EAAE,MAAM,OAAO,QAAQ,KAAK,CAAC;AAAA,EAC1D,SAAS,KAAK;AACZ,WAAO,MAAM,4CAAwB,GAAG;AACxC,WAAO,KAAK,SAAS;AAAA,MACnB,SAAS,eAAe,QAAQ,IAAI,UAAU,OAAO,GAAG;AAAA,IAC1D,CAAC;AAAA,EACH;AACF;AAEA,MAAM,SAAS,aAAiE;AAAA,EAC9E;AACF,CAAC;AAED,IAAO,gCAAQ;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.worker.d.ts","sourceRoot":"","sources":["
|
|
1
|
+
{"version":3,"file":"server.worker.d.ts","sourceRoot":"","sources":["..\\..\\src\\workers\\server.worker.ts"],"names":[],"mappings":"AAsBA;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,oBAAoB;IACpB,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,qCAAqC;IACrC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,wCAAwC;IACxC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,2CAA2C;IAC3C,GAAG,CAAC,EAAE;QACJ,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;KAC7B,CAAC;IACF,8EAA8E;IAC9E,cAAc,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;CACnC;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,oBAAoB;IACpB,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,qCAAqC;IACrC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,wCAAwC;IACxC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;CACtB;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,kBAAmB,SAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IACjE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAClC,KAAK,EAAE,gBAAgB,CAAC;IACxB,KAAK,EAAE,gBAAgB,CAAC;CACzB;AA+LD;;GAEG;AACH,iBAAe,KAAK,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAsDtE;AAKD;;;;GAIG;AACH,iBAAe,UAAU,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CA2F9D;AAED;;;GAGG;AACH,iBAAe,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,CAExC;AAED,QAAA,MAAM,MAAM;;;eACD,OAAO,KAAK;oBAAc,OAAO,UAAU;mBAAa,OAAO,SAAS;;;CAMjF,CAAC;AAEH,eAAe,MAAM,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@simplysm/sd-cli",
|
|
3
|
-
"version": "13.0.
|
|
3
|
+
"version": "13.0.40",
|
|
4
4
|
"description": "심플리즘 패키지 - CLI 도구",
|
|
5
5
|
"author": "김석래",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -18,9 +18,6 @@
|
|
|
18
18
|
"templates"
|
|
19
19
|
],
|
|
20
20
|
"sideEffects": false,
|
|
21
|
-
"bin": {
|
|
22
|
-
"sd-cli": "./dist/sd-cli.js"
|
|
23
|
-
},
|
|
24
21
|
"dependencies": {
|
|
25
22
|
"@fastify/http-proxy": "^11.4.1",
|
|
26
23
|
"@inquirer/prompts": "^8.2.1",
|
|
@@ -28,7 +25,7 @@
|
|
|
28
25
|
"esbuild": "^0.27.3",
|
|
29
26
|
"esbuild-plugin-solid": "^0.6.0",
|
|
30
27
|
"eslint": "^9.39.2",
|
|
31
|
-
"glob": "^13.0.
|
|
28
|
+
"glob": "^13.0.6",
|
|
32
29
|
"handlebars": "^4.7.8",
|
|
33
30
|
"jiti": "^2.6.1",
|
|
34
31
|
"semver": "^7.7.4",
|
|
@@ -44,13 +41,16 @@
|
|
|
44
41
|
"vite-plugin-solid": "^2.11.10",
|
|
45
42
|
"vite-tsconfig-paths": "^6.1.1",
|
|
46
43
|
"yargs": "^18.0.0",
|
|
47
|
-
"@simplysm/core-
|
|
48
|
-
"@simplysm/core-
|
|
49
|
-
"@simplysm/storage": "13.0.
|
|
44
|
+
"@simplysm/core-node": "13.0.40",
|
|
45
|
+
"@simplysm/core-common": "13.0.40",
|
|
46
|
+
"@simplysm/storage": "13.0.40"
|
|
50
47
|
},
|
|
51
48
|
"devDependencies": {
|
|
52
49
|
"@types/semver": "^7.7.1",
|
|
53
50
|
"@types/ssh2": "^1.15.5",
|
|
54
51
|
"@types/yargs": "^17.0.35"
|
|
52
|
+
},
|
|
53
|
+
"bin": {
|
|
54
|
+
"sd-cli": "./dist/sd-cli.js"
|
|
55
55
|
}
|
|
56
56
|
}
|
package/src/commands/lint.ts
CHANGED
|
@@ -77,7 +77,9 @@ export async function loadIgnorePatterns(cwd: string): Promise<string[]> {
|
|
|
77
77
|
}
|
|
78
78
|
|
|
79
79
|
const jiti = createJiti(import.meta.url);
|
|
80
|
-
const configModule = await jiti.import(
|
|
80
|
+
const configModule = await jiti.import<{ default: Record<string, unknown>[] } | undefined>(
|
|
81
|
+
configPath,
|
|
82
|
+
);
|
|
81
83
|
|
|
82
84
|
let configs: unknown;
|
|
83
85
|
if (Array.isArray(configModule)) {
|
|
@@ -200,13 +202,31 @@ export async function runLint(options: LintOptions): Promise<void> {
|
|
|
200
202
|
break;
|
|
201
203
|
}
|
|
202
204
|
}
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
205
|
+
|
|
206
|
+
// TypeScript 설정 파일 지원: jiti로 로드 후 config 객체로 전달
|
|
207
|
+
let stylelintOptions: stylelint.LinterOptions;
|
|
208
|
+
if (configFile != null && /\.ts$/.test(configFile)) {
|
|
209
|
+
const jiti = createJiti(import.meta.url);
|
|
210
|
+
const configModule = await jiti.import<{ default: stylelint.Config }>(configFile);
|
|
211
|
+
const config = configModule.default;
|
|
212
|
+
stylelintOptions = {
|
|
213
|
+
files: cssFiles,
|
|
214
|
+
config,
|
|
215
|
+
configBasedir: cwd,
|
|
216
|
+
fix,
|
|
217
|
+
cache: true,
|
|
218
|
+
cacheLocation: path.join(cwd, ".cache", "stylelint.cache"),
|
|
219
|
+
};
|
|
220
|
+
} else {
|
|
221
|
+
stylelintOptions = {
|
|
222
|
+
files: cssFiles,
|
|
223
|
+
configFile,
|
|
224
|
+
fix,
|
|
225
|
+
cache: true,
|
|
226
|
+
cacheLocation: path.join(cwd, ".cache", "stylelint.cache"),
|
|
227
|
+
};
|
|
228
|
+
}
|
|
229
|
+
stylelintResult = await stylelint.lint(stylelintOptions);
|
|
210
230
|
logger.success("Stylelint 실행 완료");
|
|
211
231
|
}
|
|
212
232
|
}
|
package/src/utils/copy-public.ts
CHANGED
|
@@ -1,5 +1,13 @@
|
|
|
1
1
|
import path from "path";
|
|
2
|
-
import {
|
|
2
|
+
import {
|
|
3
|
+
fsCopy,
|
|
4
|
+
fsMkdir,
|
|
5
|
+
fsRm,
|
|
6
|
+
fsGlob,
|
|
7
|
+
FsWatcher,
|
|
8
|
+
fsExists,
|
|
9
|
+
pathIsChildPath,
|
|
10
|
+
} from "@simplysm/core-node";
|
|
3
11
|
|
|
4
12
|
/**
|
|
5
13
|
* public/ 및 public-dev/ 디렉토리의 파일을 dist/로 복사한다.
|
|
@@ -77,7 +85,7 @@ export async function watchPublicFiles(
|
|
|
77
85
|
for (const { event, path: filePath } of changes) {
|
|
78
86
|
// 어느 소스 디렉토리에서 온 변경인지 판별
|
|
79
87
|
let sourceDir: string;
|
|
80
|
-
if (filePath
|
|
88
|
+
if (pathIsChildPath(filePath, publicDevDir)) {
|
|
81
89
|
sourceDir = publicDevDir;
|
|
82
90
|
} else {
|
|
83
91
|
sourceDir = publicDir;
|
|
@@ -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 { fsCopy, fsMkdir, fsRm, FsWatcher } from "@simplysm/core-node";
|
|
5
|
+
import { fsCopy, fsMkdir, fsRm, FsWatcher, pathIsChildPath } from "@simplysm/core-node";
|
|
6
6
|
|
|
7
7
|
/**
|
|
8
8
|
* replaceDeps 설정의 glob 패턴과 대상 패키지 목록을 매칭하여
|
|
@@ -310,12 +310,20 @@ export async function watchReplaceDeps(
|
|
|
310
310
|
if (watchedSources.has(entry.resolvedSourcePath)) continue;
|
|
311
311
|
watchedSources.add(entry.resolvedSourcePath);
|
|
312
312
|
|
|
313
|
+
const excludedPaths = [...EXCLUDED_NAMES].map((name) =>
|
|
314
|
+
path.join(entry.resolvedSourcePath, name),
|
|
315
|
+
);
|
|
316
|
+
|
|
313
317
|
const watcher = await FsWatcher.watch([entry.resolvedSourcePath], { followSymlinks: false });
|
|
314
318
|
watcher.onChange({ delay: 300 }, async (changeInfos) => {
|
|
315
319
|
for (const { path: changedPath } of changeInfos) {
|
|
316
|
-
// 제외 항목
|
|
317
|
-
|
|
318
|
-
|
|
320
|
+
// 제외 항목 필터링: basename 일치 또는 제외 디렉토리 하위 경로
|
|
321
|
+
if (
|
|
322
|
+
EXCLUDED_NAMES.has(path.basename(changedPath)) ||
|
|
323
|
+
excludedPaths.some((ep) => pathIsChildPath(changedPath, ep))
|
|
324
|
+
) {
|
|
325
|
+
continue;
|
|
326
|
+
}
|
|
319
327
|
|
|
320
328
|
// 이 소스 경로를 사용하는 모든 entry에 대해 복사
|
|
321
329
|
for (const e of entries) {
|
package/src/utils/tsconfig.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import ts from "typescript";
|
|
2
2
|
import path from "path";
|
|
3
|
-
import { fsExists, fsReadJson } from "@simplysm/core-node";
|
|
3
|
+
import { fsExists, fsReadJson, pathIsChildPath } from "@simplysm/core-node";
|
|
4
4
|
import { SdError } from "@simplysm/core-common";
|
|
5
5
|
|
|
6
6
|
/**
|
|
@@ -110,15 +110,13 @@ export function getPackageSourceFiles(
|
|
|
110
110
|
pkgDir: string,
|
|
111
111
|
parsedConfig: ts.ParsedCommandLine,
|
|
112
112
|
): string[] {
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
return parsedConfig.fileNames.filter((f) => f.startsWith(pkgSrcPrefix));
|
|
113
|
+
const pkgSrcDir = path.join(pkgDir, "src");
|
|
114
|
+
return parsedConfig.fileNames.filter((f) => pathIsChildPath(f, pkgSrcDir));
|
|
116
115
|
}
|
|
117
116
|
|
|
118
117
|
/**
|
|
119
118
|
* 패키지의 전체 파일 목록 가져오기 (src + tests 포함)
|
|
120
119
|
*/
|
|
121
120
|
export function getPackageFiles(pkgDir: string, parsedConfig: ts.ParsedCommandLine): string[] {
|
|
122
|
-
|
|
123
|
-
return parsedConfig.fileNames.filter((f) => f.startsWith(pkgPrefix));
|
|
121
|
+
return parsedConfig.fileNames.filter((f) => pathIsChildPath(f, pkgDir));
|
|
124
122
|
}
|
package/src/utils/vite-config.ts
CHANGED
|
@@ -8,7 +8,7 @@ import { VitePWA } from "vite-plugin-pwa";
|
|
|
8
8
|
import tailwindcss from "tailwindcss";
|
|
9
9
|
import type esbuild from "esbuild";
|
|
10
10
|
import { getTailwindConfigDeps } from "./tailwind-config-deps.js";
|
|
11
|
-
import { FsWatcher } from "@simplysm/core-node";
|
|
11
|
+
import { FsWatcher, pathNorm } from "@simplysm/core-node";
|
|
12
12
|
|
|
13
13
|
/**
|
|
14
14
|
* Tailwind config의 scope 패키지 의존성을 watch하는 Vite 플러그인.
|
|
@@ -34,7 +34,7 @@ function sdTailwindConfigDepsPlugin(pkgDir: string, scopes: string[]): Plugin {
|
|
|
34
34
|
}
|
|
35
35
|
|
|
36
36
|
server.watcher.on("change", (changed) => {
|
|
37
|
-
if (externalDeps.some((d) =>
|
|
37
|
+
if (externalDeps.some((d) => pathNorm(d) === pathNorm(changed))) {
|
|
38
38
|
// jiti (Tailwind의 config 로더)가 사용하는 require 캐시를 정리하여
|
|
39
39
|
// config 재로드 시 변경된 파일이 새로 읽히도록 한다
|
|
40
40
|
const _require = createRequire(import.meta.url);
|
|
@@ -348,6 +348,10 @@ export function createViteConfig(options: ViteConfigOptions): ViteUserConfig {
|
|
|
348
348
|
} else {
|
|
349
349
|
// dev 모드
|
|
350
350
|
config.server = {
|
|
351
|
+
// serverPort === 0: 서버 연결 클라이언트 (proxy 대상)
|
|
352
|
+
// → host를 127.0.0.1로 명시하여 IPv4 바인딩 보장
|
|
353
|
+
// (Windows에서 localhost가 ::1(IPv6)로 해석되면 proxy가 127.0.0.1로 연결 시 ECONNREFUSED 발생)
|
|
354
|
+
host: serverPort === 0 ? "127.0.0.1" : undefined,
|
|
351
355
|
port: serverPort === 0 ? undefined : serverPort,
|
|
352
356
|
strictPort: serverPort !== 0 && serverPort !== undefined,
|
|
353
357
|
};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import path from "path";
|
|
2
2
|
import ts from "typescript";
|
|
3
|
-
import { createWorker } from "@simplysm/core-node";
|
|
3
|
+
import { createWorker, pathIsChildPath, pathNorm } from "@simplysm/core-node";
|
|
4
4
|
import { consola } from "consola";
|
|
5
5
|
import {
|
|
6
6
|
getCompilerOptionsForPackage,
|
|
@@ -148,12 +148,14 @@ function createDtsPathRewriter(
|
|
|
148
148
|
pkgDir: string,
|
|
149
149
|
): (fileName: string, content: string) => [string, string] | null {
|
|
150
150
|
const pkgName = path.basename(pkgDir);
|
|
151
|
-
const distDir = path.join(pkgDir, "dist");
|
|
151
|
+
const distDir = pathNorm(path.join(pkgDir, "dist"));
|
|
152
152
|
const distPrefix = distDir + path.sep;
|
|
153
153
|
// 중첩 구조에서 현재 패키지의 접두사: dist/{pkgName}/src/
|
|
154
|
-
const ownNestedPrefix = path.join(distDir, pkgName, "src") + path.sep;
|
|
154
|
+
const ownNestedPrefix = pathNorm(path.join(distDir, pkgName, "src")) + path.sep;
|
|
155
155
|
|
|
156
156
|
return (fileName, content) => {
|
|
157
|
+
fileName = pathNorm(fileName);
|
|
158
|
+
|
|
157
159
|
if (!fileName.startsWith(distPrefix)) return null;
|
|
158
160
|
|
|
159
161
|
if (fileName.startsWith(ownNestedPrefix)) {
|
|
@@ -201,13 +203,13 @@ async function buildDts(info: DtsBuildInfo): Promise<DtsBuildResult> {
|
|
|
201
203
|
if (shouldEmit) {
|
|
202
204
|
// emit 모드: src만 대상 (d.ts 생성)
|
|
203
205
|
rootFiles = getPackageSourceFiles(info.pkgDir, parsedConfig);
|
|
204
|
-
const
|
|
205
|
-
diagnosticFilter = (d) => d.file == null || d.file.fileName
|
|
206
|
+
const pkgSrcDir = path.join(info.pkgDir, "src");
|
|
207
|
+
diagnosticFilter = (d) => d.file == null || pathIsChildPath(d.file.fileName, pkgSrcDir);
|
|
206
208
|
} else {
|
|
207
209
|
// 타입체크 모드: 패키지 전체 파일 대상 (src + tests)
|
|
208
210
|
rootFiles = getPackageFiles(info.pkgDir, parsedConfig);
|
|
209
|
-
const
|
|
210
|
-
diagnosticFilter = (d) => d.file == null || d.file.fileName
|
|
211
|
+
const pkgDir = info.pkgDir;
|
|
212
|
+
diagnosticFilter = (d) => d.file == null || pathIsChildPath(d.file.fileName, pkgDir);
|
|
211
213
|
}
|
|
212
214
|
|
|
213
215
|
tsBuildInfoFile = path.join(
|
|
@@ -217,10 +219,10 @@ async function buildDts(info: DtsBuildInfo): Promise<DtsBuildResult> {
|
|
|
217
219
|
);
|
|
218
220
|
} else {
|
|
219
221
|
// non-package 모드: packages/ 제외한 나머지 파일 타입체크
|
|
220
|
-
const
|
|
221
|
-
rootFiles = parsedConfig.fileNames.filter((f) => !f
|
|
222
|
+
const packagesDir = path.join(info.cwd, "packages");
|
|
223
|
+
rootFiles = parsedConfig.fileNames.filter((f) => !pathIsChildPath(f, packagesDir));
|
|
222
224
|
baseOptions = parsedConfig.options;
|
|
223
|
-
diagnosticFilter = (d) => d.file == null || !d.file.fileName
|
|
225
|
+
diagnosticFilter = (d) => d.file == null || !pathIsChildPath(d.file.fileName, packagesDir);
|
|
224
226
|
tsBuildInfoFile = path.join(info.cwd, ".cache", "typecheck-root.tsbuildinfo");
|
|
225
227
|
}
|
|
226
228
|
|
|
@@ -355,7 +357,7 @@ async function startDtsWatch(info: DtsWatchInfo): Promise<void> {
|
|
|
355
357
|
);
|
|
356
358
|
|
|
357
359
|
// 해당 패키지 경로 (필터링용)
|
|
358
|
-
const
|
|
360
|
+
const pkgSrcDir = path.join(info.pkgDir, "src");
|
|
359
361
|
|
|
360
362
|
const options: ts.CompilerOptions = {
|
|
361
363
|
...baseOptions,
|
|
@@ -376,7 +378,7 @@ async function startDtsWatch(info: DtsWatchInfo): Promise<void> {
|
|
|
376
378
|
const reportDiagnostic: ts.DiagnosticReporter = (diagnostic) => {
|
|
377
379
|
if (diagnostic.category === ts.DiagnosticCategory.Error) {
|
|
378
380
|
// 해당 패키지 src 폴더 내 파일만 에러 수집 (다른 패키지 에러 무시)
|
|
379
|
-
if (diagnostic.file != null && !diagnostic.file.fileName
|
|
381
|
+
if (diagnostic.file != null && !pathIsChildPath(diagnostic.file.fileName, pkgSrcDir)) {
|
|
380
382
|
return;
|
|
381
383
|
}
|
|
382
384
|
|
|
@@ -2,6 +2,7 @@ import proxy from "@fastify/http-proxy";
|
|
|
2
2
|
import { createWorker } from "@simplysm/core-node";
|
|
3
3
|
import { consola } from "consola";
|
|
4
4
|
import net from "net";
|
|
5
|
+
import { pathToFileURL } from "url";
|
|
5
6
|
import { registerCleanupHandlers } from "../utils/worker-utils";
|
|
6
7
|
|
|
7
8
|
//#region Types
|
|
@@ -108,7 +109,7 @@ async function findAvailablePort(startPort: number, maxRetries = 20): Promise<nu
|
|
|
108
109
|
async function start(info: ServerRuntimeStartInfo): Promise<void> {
|
|
109
110
|
try {
|
|
110
111
|
// main.js import (server 인스턴스를 export해야 함)
|
|
111
|
-
const module = await import(info.mainJsPath);
|
|
112
|
+
const module = await import(pathToFileURL(info.mainJsPath).href);
|
|
112
113
|
const server = module.server;
|
|
113
114
|
|
|
114
115
|
if (server == null) {
|
|
@@ -15,9 +15,9 @@
|
|
|
15
15
|
"vitest": "vitest"
|
|
16
16
|
},
|
|
17
17
|
"devDependencies": {
|
|
18
|
-
"@simplysm/sd-cli": "~13.0.
|
|
19
|
-
"@simplysm/sd-claude": "~13.0.
|
|
20
|
-
"@simplysm/lint": "~13.0.
|
|
18
|
+
"@simplysm/sd-cli": "~13.0.40",
|
|
19
|
+
"@simplysm/sd-claude": "~13.0.40",
|
|
20
|
+
"@simplysm/lint": "~13.0.40",
|
|
21
21
|
"@types/node": "^20.19.33",
|
|
22
22
|
"eslint": "^9.39.2",
|
|
23
23
|
"prettier": "^3.8.1",
|