@storm-software/cloudflare-tools 0.70.31 → 0.70.32
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/CHANGELOG.md +22 -0
- package/README.md +1 -1
- package/dist/{chunk-GBH7EUPD.mjs → chunk-6A7H2KUQ.mjs} +4 -4
- package/dist/{chunk-4XOYLZYF.js → chunk-D7QBZ5SX.js} +3 -3
- package/dist/{chunk-WAFEBLGS.js → chunk-F5BKXRUC.js} +5 -5
- package/dist/{chunk-RSNYZTUY.mjs → chunk-G2NSVE4M.mjs} +44 -0
- package/dist/{chunk-UJR46SM6.mjs → chunk-GWZM33BG.mjs} +2 -2
- package/dist/{chunk-DEOKIEVB.js → chunk-H3AT6FQM.js} +123 -70
- package/dist/{chunk-DTVTFZ3M.js → chunk-HYSCV25J.js} +45 -1
- package/dist/{chunk-3ND7IFGL.mjs → chunk-TLDPJKAD.mjs} +1 -1
- package/dist/{chunk-B5JIAZPS.mjs → chunk-U72IN2SJ.mjs} +62 -9
- package/dist/{chunk-HWDSHE6T.js → chunk-ZZUYDEXF.js} +4 -4
- package/dist/executors.js +4 -4
- package/dist/executors.mjs +4 -4
- package/dist/generators.js +4 -4
- package/dist/generators.mjs +3 -3
- package/dist/index.js +9 -9
- package/dist/index.mjs +10 -10
- package/dist/src/executors/cloudflare-publish/executor.js +2 -2
- package/dist/src/executors/cloudflare-publish/executor.mjs +2 -2
- package/dist/src/executors/r2-upload-publish/executor.js +4 -4
- package/dist/src/executors/r2-upload-publish/executor.mjs +3 -3
- package/dist/src/executors/serve/executor.js +3 -3
- package/dist/src/executors/serve/executor.mjs +2 -2
- package/dist/src/generators/init/generator.js +2 -2
- package/dist/src/generators/init/generator.mjs +1 -1
- package/dist/src/generators/worker/generator.js +4 -4
- package/dist/src/generators/worker/generator.mjs +3 -3
- package/package.json +5 -5
- package/dist/chunk-L5AZ34A2.mjs +0 -209
- package/dist/chunk-NALNCVVQ.js +0 -209
|
@@ -9,7 +9,10 @@ var _chunkNU34IEWNjs = require('./chunk-NU34IEWN.js');
|
|
|
9
9
|
|
|
10
10
|
|
|
11
11
|
|
|
12
|
-
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
var _chunkHYSCV25Jjs = require('./chunk-HYSCV25J.js');
|
|
13
16
|
|
|
14
17
|
|
|
15
18
|
|
|
@@ -57,7 +60,7 @@ var applyWorkspaceBaseTokens = async (option, tokenParams) => {
|
|
|
57
60
|
if (result.includes("{workspaceRoot}")) {
|
|
58
61
|
result = result.replaceAll(
|
|
59
62
|
"{workspaceRoot}",
|
|
60
|
-
_nullishCoalesce(_nullishCoalesce(tokenParams.workspaceRoot, () => ( _optionalChain([tokenParams, 'access', _3 => _3.config, 'optionalAccess', _4 => _4.workspaceRoot]))), () => (
|
|
63
|
+
_nullishCoalesce(_nullishCoalesce(tokenParams.workspaceRoot, () => ( _optionalChain([tokenParams, 'access', _3 => _3.config, 'optionalAccess', _4 => _4.workspaceRoot]))), () => ( _chunkHYSCV25Jjs.findWorkspaceRoot.call(void 0, )))
|
|
61
64
|
);
|
|
62
65
|
}
|
|
63
66
|
return result;
|
|
@@ -106,7 +109,7 @@ var withRunExecutor = (name, executorFn, executorOptions = {}) => async (_option
|
|
|
106
109
|
"The Build process failed because the context is not valid. Please run this command from a workspace."
|
|
107
110
|
);
|
|
108
111
|
}
|
|
109
|
-
const workspaceRoot2 =
|
|
112
|
+
const workspaceRoot2 = _chunkHYSCV25Jjs.findWorkspaceRoot.call(void 0, );
|
|
110
113
|
const projectRoot = context.projectsConfigurations.projects[context.projectName].root || workspaceRoot2;
|
|
111
114
|
const sourceRoot = context.projectsConfigurations.projects[context.projectName].sourceRoot || projectRoot || workspaceRoot2;
|
|
112
115
|
const projectName = context.projectName;
|
|
@@ -122,7 +125,7 @@ var withRunExecutor = (name, executorFn, executorOptions = {}) => async (_option
|
|
|
122
125
|
`,
|
|
123
126
|
config
|
|
124
127
|
);
|
|
125
|
-
config = await
|
|
128
|
+
config = await _chunkHYSCV25Jjs.getConfig.call(void 0, workspaceRoot2);
|
|
126
129
|
}
|
|
127
130
|
if (_optionalChain([executorOptions, 'optionalAccess', _7 => _7.hooks, 'optionalAccess', _8 => _8.applyDefaultOptions])) {
|
|
128
131
|
_chunk2CDSXWFAjs.writeDebug.call(void 0, "Running the applyDefaultOptions hook...", config);
|
|
@@ -504,7 +507,7 @@ var copyAssets = async (config, assets, outputPath, projectRoot, sourceRoot, gen
|
|
|
504
507
|
}
|
|
505
508
|
_chunk2CDSXWFAjs.writeTrace.call(void 0,
|
|
506
509
|
`\u{1F4DD} Copying the following assets to the output directory:
|
|
507
|
-
${pendingAssets.map((pendingAsset) => typeof pendingAsset === "string" ? ` - ${pendingAsset} -> ${outputPath}` : ` - ${pendingAsset.input}/${pendingAsset.glob} -> ${
|
|
510
|
+
${pendingAssets.map((pendingAsset) => typeof pendingAsset === "string" ? ` - ${pendingAsset} -> ${outputPath}` : ` - ${pendingAsset.input}/${pendingAsset.glob} -> ${_chunkHYSCV25Jjs.joinPaths.call(void 0, outputPath, pendingAsset.output)}`).join("\n")}`,
|
|
508
511
|
config
|
|
509
512
|
);
|
|
510
513
|
const assetHandler = new (0, _copyassetshandler.CopyAssetsHandler)({
|
|
@@ -517,17 +520,17 @@ ${pendingAssets.map((pendingAsset) => typeof pendingAsset === "string" ? ` - ${p
|
|
|
517
520
|
_chunk2CDSXWFAjs.writeTrace.call(void 0, "Completed copying assets to the output directory", config);
|
|
518
521
|
if (includeSrc === true) {
|
|
519
522
|
_chunk2CDSXWFAjs.writeDebug.call(void 0,
|
|
520
|
-
`\u{1F4DD} Adding banner and writing source files: ${
|
|
523
|
+
`\u{1F4DD} Adding banner and writing source files: ${_chunkHYSCV25Jjs.joinPaths.call(void 0,
|
|
521
524
|
outputPath,
|
|
522
525
|
"src"
|
|
523
526
|
)}`,
|
|
524
527
|
config
|
|
525
528
|
);
|
|
526
529
|
const files = await _glob.glob.call(void 0, [
|
|
527
|
-
|
|
528
|
-
|
|
529
|
-
|
|
530
|
-
|
|
530
|
+
_chunkHYSCV25Jjs.joinPaths.call(void 0, config.workspaceRoot, outputPath, "src/**/*.ts"),
|
|
531
|
+
_chunkHYSCV25Jjs.joinPaths.call(void 0, config.workspaceRoot, outputPath, "src/**/*.tsx"),
|
|
532
|
+
_chunkHYSCV25Jjs.joinPaths.call(void 0, config.workspaceRoot, outputPath, "src/**/*.js"),
|
|
533
|
+
_chunkHYSCV25Jjs.joinPaths.call(void 0, config.workspaceRoot, outputPath, "src/**/*.jsx")
|
|
531
534
|
]);
|
|
532
535
|
await Promise.allSettled(
|
|
533
536
|
files.map(
|
|
@@ -582,7 +585,7 @@ var addPackageDependencies = async (workspaceRoot2, projectRoot, projectName, pa
|
|
|
582
585
|
)) {
|
|
583
586
|
const projectNode = project.node;
|
|
584
587
|
if (projectNode.data.root) {
|
|
585
|
-
const projectPackageJsonPath =
|
|
588
|
+
const projectPackageJsonPath = _chunkHYSCV25Jjs.joinPaths.call(void 0,
|
|
586
589
|
workspaceRoot2,
|
|
587
590
|
projectNode.data.root,
|
|
588
591
|
"package.json"
|
|
@@ -604,7 +607,7 @@ var addPackageDependencies = async (workspaceRoot2, projectRoot, projectName, pa
|
|
|
604
607
|
`\u{1F4E6} Adding local packages to package.json: ${localPackages.map((p) => p.name).join(", ")}`
|
|
605
608
|
);
|
|
606
609
|
const projectJsonFile = await _promises.readFile.call(void 0,
|
|
607
|
-
|
|
610
|
+
_chunkHYSCV25Jjs.joinPaths.call(void 0, projectRoot, "project.json"),
|
|
608
611
|
"utf8"
|
|
609
612
|
);
|
|
610
613
|
const projectJson = JSON.parse(projectJsonFile);
|
|
@@ -617,7 +620,7 @@ var addPackageDependencies = async (workspaceRoot2, projectRoot, projectName, pa
|
|
|
617
620
|
}
|
|
618
621
|
const implicitDependencies = _optionalChain([projectConfigurations, 'access', _37 => _37.projects, 'optionalAccess', _38 => _38[projectName2], 'access', _39 => _39.implicitDependencies, 'optionalAccess', _40 => _40.reduce, 'call', _41 => _41((ret, dep) => {
|
|
619
622
|
if (_optionalChain([projectConfigurations, 'access', _42 => _42.projects, 'optionalAccess', _43 => _43[dep]])) {
|
|
620
|
-
const depPackageJsonPath =
|
|
623
|
+
const depPackageJsonPath = _chunkHYSCV25Jjs.joinPaths.call(void 0,
|
|
621
624
|
workspaceRoot2,
|
|
622
625
|
projectConfigurations.projects[dep].root,
|
|
623
626
|
"package.json"
|
|
@@ -653,9 +656,9 @@ var addPackageDependencies = async (workspaceRoot2, projectRoot, projectName, pa
|
|
|
653
656
|
return packageJson;
|
|
654
657
|
};
|
|
655
658
|
var addWorkspacePackageJsonFields = async (workspaceConfig, projectRoot, sourceRoot, projectName, includeSrc = false, packageJson) => {
|
|
656
|
-
const workspaceRoot2 = workspaceConfig.workspaceRoot ? workspaceConfig.workspaceRoot :
|
|
659
|
+
const workspaceRoot2 = workspaceConfig.workspaceRoot ? workspaceConfig.workspaceRoot : _chunkHYSCV25Jjs.findWorkspaceRoot.call(void 0, );
|
|
657
660
|
const workspacePackageJsonContent = await _promises.readFile.call(void 0,
|
|
658
|
-
|
|
661
|
+
_chunkHYSCV25Jjs.joinPaths.call(void 0, workspaceRoot2, "package.json"),
|
|
659
662
|
"utf8"
|
|
660
663
|
);
|
|
661
664
|
const workspacePackageJson = JSON.parse(workspacePackageJsonContent);
|
|
@@ -666,7 +669,7 @@ var addWorkspacePackageJsonFields = async (workspaceConfig, projectRoot, sourceR
|
|
|
666
669
|
if (distSrc.startsWith("/")) {
|
|
667
670
|
distSrc = distSrc.substring(1);
|
|
668
671
|
}
|
|
669
|
-
packageJson.source ??= `${
|
|
672
|
+
packageJson.source ??= `${_chunkHYSCV25Jjs.joinPaths.call(void 0, distSrc, "index.ts").replaceAll("\\", "/")}`;
|
|
670
673
|
}
|
|
671
674
|
packageJson.files ??= ["dist/**/*"];
|
|
672
675
|
if (includeSrc === true && !packageJson.files.includes("src")) {
|
|
@@ -691,7 +694,7 @@ var addWorkspacePackageJsonFields = async (workspaceConfig, projectRoot, sourceR
|
|
|
691
694
|
packageJson.contributors = [packageJson.author];
|
|
692
695
|
}
|
|
693
696
|
packageJson.repository ??= workspacePackageJson.repository;
|
|
694
|
-
packageJson.repository.directory ??= projectRoot ? projectRoot :
|
|
697
|
+
packageJson.repository.directory ??= projectRoot ? projectRoot : _chunkHYSCV25Jjs.joinPaths.call(void 0, "packages", projectName);
|
|
695
698
|
return packageJson;
|
|
696
699
|
};
|
|
697
700
|
var addPackageJsonExport = (file, type = "module", sourceRoot) => {
|
|
@@ -830,7 +833,7 @@ async function resolveContext(userOptions) {
|
|
|
830
833
|
if (!workspaceRoot2) {
|
|
831
834
|
throw new Error("Cannot find Nx workspace root");
|
|
832
835
|
}
|
|
833
|
-
const workspaceConfig = await
|
|
836
|
+
const workspaceConfig = await _chunkHYSCV25Jjs.getWorkspaceConfig.call(void 0, true, {
|
|
834
837
|
workspaceRoot: workspaceRoot2.dir
|
|
835
838
|
});
|
|
836
839
|
_chunk2CDSXWFAjs.writeDebug.call(void 0, " \u2699\uFE0F Resolving build options", workspaceConfig);
|
|
@@ -838,7 +841,7 @@ async function resolveContext(userOptions) {
|
|
|
838
841
|
const projectGraph = await _devkit.createProjectGraphAsync.call(void 0, {
|
|
839
842
|
exitOnError: true
|
|
840
843
|
});
|
|
841
|
-
const projectJsonPath =
|
|
844
|
+
const projectJsonPath = _chunkHYSCV25Jjs.joinPaths.call(void 0,
|
|
842
845
|
workspaceRoot2.dir,
|
|
843
846
|
projectRoot,
|
|
844
847
|
"project.json"
|
|
@@ -857,7 +860,7 @@ async function resolveContext(userOptions) {
|
|
|
857
860
|
}
|
|
858
861
|
const options = _defu2.default.call(void 0, userOptions, DEFAULT_BUILD_OPTIONS);
|
|
859
862
|
options.name ??= projectName;
|
|
860
|
-
const packageJsonPath =
|
|
863
|
+
const packageJsonPath = _chunkHYSCV25Jjs.joinPaths.call(void 0,
|
|
861
864
|
workspaceRoot2.dir,
|
|
862
865
|
options.projectRoot,
|
|
863
866
|
"package.json"
|
|
@@ -869,7 +872,7 @@ async function resolveContext(userOptions) {
|
|
|
869
872
|
const define = _defu2.default.call(void 0, _nullishCoalesce(options.define, () => ( {})), _nullishCoalesce(env, () => ( {})));
|
|
870
873
|
const resolvedOptions = {
|
|
871
874
|
...options,
|
|
872
|
-
tsconfig: userOptions.tsconfig === null ? void 0 : userOptions.tsconfig ? userOptions.tsconfig :
|
|
875
|
+
tsconfig: userOptions.tsconfig === null ? void 0 : userOptions.tsconfig ? userOptions.tsconfig : _chunkHYSCV25Jjs.joinPaths.call(void 0, workspaceRoot2.dir, projectRoot, "tsconfig.json"),
|
|
873
876
|
metafile: userOptions.mode === "development",
|
|
874
877
|
clean: false,
|
|
875
878
|
env,
|
|
@@ -894,8 +897,8 @@ async function resolveContext(userOptions) {
|
|
|
894
897
|
projectConfigurations,
|
|
895
898
|
projectName,
|
|
896
899
|
projectGraph,
|
|
897
|
-
sourceRoot: resolvedOptions.sourceRoot || projectJson.sourceRoot ||
|
|
898
|
-
outputPath: resolvedOptions.outputPath ||
|
|
900
|
+
sourceRoot: resolvedOptions.sourceRoot || projectJson.sourceRoot || _chunkHYSCV25Jjs.joinPaths.call(void 0, resolvedOptions.projectRoot, "src"),
|
|
901
|
+
outputPath: resolvedOptions.outputPath || _chunkHYSCV25Jjs.joinPaths.call(void 0,
|
|
899
902
|
workspaceConfig.workspaceRoot,
|
|
900
903
|
"dist",
|
|
901
904
|
resolvedOptions.projectRoot
|
|
@@ -919,10 +922,10 @@ ${_chunk2CDSXWFAjs.formatLogMessage.call(void 0, context.options)}`,
|
|
|
919
922
|
|
|
920
923
|
|
|
921
924
|
async function generatePackageJson(context) {
|
|
922
|
-
if (context.options.generatePackageJson !== false && _fs.existsSync.call(void 0,
|
|
925
|
+
if (context.options.generatePackageJson !== false && _fs.existsSync.call(void 0, _chunkHYSCV25Jjs.joinPaths.call(void 0, context.options.projectRoot, "package.json"))) {
|
|
923
926
|
_chunk2CDSXWFAjs.writeDebug.call(void 0, " \u270D\uFE0F Writing package.json file", context.workspaceConfig);
|
|
924
927
|
const stopwatch = _chunk2CDSXWFAjs.getStopwatch.call(void 0, "Write package.json file");
|
|
925
|
-
const packageJsonPath =
|
|
928
|
+
const packageJsonPath = _chunkHYSCV25Jjs.joinPaths.call(void 0,
|
|
926
929
|
context.options.projectRoot,
|
|
927
930
|
"project.json"
|
|
928
931
|
);
|
|
@@ -930,7 +933,7 @@ async function generatePackageJson(context) {
|
|
|
930
933
|
throw new Error("Cannot find package.json configuration");
|
|
931
934
|
}
|
|
932
935
|
const packageJsonFile = await _promises2.default.readFile(
|
|
933
|
-
|
|
936
|
+
_chunkHYSCV25Jjs.joinPaths.call(void 0,
|
|
934
937
|
context.workspaceConfig.workspaceRoot,
|
|
935
938
|
context.options.projectRoot,
|
|
936
939
|
"package.json"
|
|
@@ -1036,7 +1039,7 @@ async function generatePackageJson(context) {
|
|
|
1036
1039
|
}
|
|
1037
1040
|
}
|
|
1038
1041
|
await _devkit.writeJsonFile.call(void 0,
|
|
1039
|
-
|
|
1042
|
+
_chunkHYSCV25Jjs.joinPaths.call(void 0, context.outputPath, "package.json"),
|
|
1040
1043
|
packageJson
|
|
1041
1044
|
);
|
|
1042
1045
|
stopwatch();
|
|
@@ -1069,7 +1072,7 @@ async function executeTsup(context) {
|
|
|
1069
1072
|
const stopwatch = _chunk2CDSXWFAjs.getStopwatch.call(void 0, `${context.options.name} build`);
|
|
1070
1073
|
await build({
|
|
1071
1074
|
...context.options,
|
|
1072
|
-
outDir: context.options.distDir ?
|
|
1075
|
+
outDir: context.options.distDir ? _chunkHYSCV25Jjs.joinPaths.call(void 0, context.outputPath, context.options.distDir) : context.outputPath,
|
|
1073
1076
|
workspaceConfig: context.workspaceConfig
|
|
1074
1077
|
});
|
|
1075
1078
|
stopwatch();
|
|
@@ -1183,7 +1186,7 @@ var _jiti = require('jiti');
|
|
|
1183
1186
|
var _fileutils = require('nx/src/utils/fileutils');
|
|
1184
1187
|
async function napiExecutor(options, context, config) {
|
|
1185
1188
|
const jiti = _jiti.createJiti.call(void 0, config.workspaceRoot, {
|
|
1186
|
-
fsCache: config.skipCache ? false :
|
|
1189
|
+
fsCache: config.skipCache ? false : _chunkHYSCV25Jjs.joinPaths.call(void 0,
|
|
1187
1190
|
config.workspaceRoot,
|
|
1188
1191
|
config.directories.cache || "node_modules/.cache/storm",
|
|
1189
1192
|
"jiti"
|
|
@@ -1199,20 +1202,69 @@ async function napiExecutor(options, context, config) {
|
|
|
1199
1202
|
);
|
|
1200
1203
|
}
|
|
1201
1204
|
const projectRoot = _optionalChain([context, 'access', _85 => _85.projectGraph, 'optionalAccess', _86 => _86.nodes, 'access', _87 => _87[_nullishCoalesce(context.projectName, () => ( ""))], 'access', _88 => _88.data, 'access', _89 => _89.root]);
|
|
1202
|
-
const packageJson =
|
|
1205
|
+
const packageJson = _chunkHYSCV25Jjs.joinPaths.call(void 0, _nullishCoalesce(projectRoot, () => ( ".")), "package.json");
|
|
1203
1206
|
if (!_fileutils.fileExists.call(void 0, packageJson)) {
|
|
1204
1207
|
throw new Error(`Could not find package.json at ${packageJson}`);
|
|
1205
1208
|
}
|
|
1206
1209
|
const napi = new NapiCli();
|
|
1207
|
-
const
|
|
1210
|
+
const normalizedOptions = { ...options };
|
|
1208
1211
|
const metadata = cargoMetadata();
|
|
1209
|
-
|
|
1210
|
-
|
|
1211
|
-
|
|
1212
|
+
normalizedOptions.targetDir = options.targetDir || _optionalChain([metadata, 'optionalAccess', _90 => _90.target_directory]) || _chunkHYSCV25Jjs.joinPaths.call(void 0, config.workspaceRoot, "dist", "target");
|
|
1213
|
+
normalizedOptions.outputDir = options.outputPath;
|
|
1214
|
+
normalizedOptions.packageJsonPath = options.packageJsonPath || packageJson;
|
|
1215
|
+
if (options.cwd) {
|
|
1216
|
+
normalizedOptions.cwd = _chunkHYSCV25Jjs.correctPaths.call(void 0, options.cwd);
|
|
1217
|
+
} else {
|
|
1218
|
+
normalizedOptions.cwd = _chunkHYSCV25Jjs.correctPaths.call(void 0, projectRoot);
|
|
1219
|
+
const absoluteProjectRoot = _chunkHYSCV25Jjs.joinPaths.call(void 0,
|
|
1220
|
+
config.workspaceRoot,
|
|
1221
|
+
projectRoot || "."
|
|
1222
|
+
);
|
|
1223
|
+
if (normalizedOptions.outputDir) {
|
|
1224
|
+
normalizedOptions.outputDir = _chunkHYSCV25Jjs.relative.call(void 0,
|
|
1225
|
+
absoluteProjectRoot,
|
|
1226
|
+
_chunkHYSCV25Jjs.correctPaths.call(void 0,
|
|
1227
|
+
_chunkHYSCV25Jjs.isAbsolute.call(void 0, normalizedOptions.outputDir) ? normalizedOptions.outputDir : _chunkHYSCV25Jjs.joinPaths.call(void 0, config.workspaceRoot, normalizedOptions.outputDir)
|
|
1228
|
+
)
|
|
1229
|
+
);
|
|
1230
|
+
}
|
|
1231
|
+
if (normalizedOptions.packageJsonPath) {
|
|
1232
|
+
normalizedOptions.packageJsonPath = _chunkHYSCV25Jjs.relative.call(void 0,
|
|
1233
|
+
absoluteProjectRoot,
|
|
1234
|
+
_chunkHYSCV25Jjs.correctPaths.call(void 0,
|
|
1235
|
+
_chunkHYSCV25Jjs.isAbsolute.call(void 0, normalizedOptions.packageJsonPath) ? normalizedOptions.packageJsonPath : _chunkHYSCV25Jjs.joinPaths.call(void 0, config.workspaceRoot, normalizedOptions.packageJsonPath)
|
|
1236
|
+
)
|
|
1237
|
+
);
|
|
1238
|
+
}
|
|
1239
|
+
if (normalizedOptions.targetDir) {
|
|
1240
|
+
normalizedOptions.targetDir = _chunkHYSCV25Jjs.relative.call(void 0,
|
|
1241
|
+
absoluteProjectRoot,
|
|
1242
|
+
_chunkHYSCV25Jjs.correctPaths.call(void 0,
|
|
1243
|
+
_chunkHYSCV25Jjs.isAbsolute.call(void 0, normalizedOptions.targetDir) ? normalizedOptions.targetDir : _chunkHYSCV25Jjs.joinPaths.call(void 0, config.workspaceRoot, normalizedOptions.targetDir)
|
|
1244
|
+
)
|
|
1245
|
+
);
|
|
1246
|
+
}
|
|
1247
|
+
if (normalizedOptions.configPath) {
|
|
1248
|
+
normalizedOptions.configPath = _chunkHYSCV25Jjs.relative.call(void 0,
|
|
1249
|
+
absoluteProjectRoot,
|
|
1250
|
+
_chunkHYSCV25Jjs.correctPaths.call(void 0,
|
|
1251
|
+
_chunkHYSCV25Jjs.isAbsolute.call(void 0, normalizedOptions.configPath) ? normalizedOptions.configPath : _chunkHYSCV25Jjs.joinPaths.call(void 0, config.workspaceRoot, normalizedOptions.configPath)
|
|
1252
|
+
)
|
|
1253
|
+
);
|
|
1254
|
+
}
|
|
1255
|
+
if (normalizedOptions.manifestPath) {
|
|
1256
|
+
normalizedOptions.manifestPath = _chunkHYSCV25Jjs.relative.call(void 0,
|
|
1257
|
+
absoluteProjectRoot,
|
|
1258
|
+
_chunkHYSCV25Jjs.correctPaths.call(void 0,
|
|
1259
|
+
_chunkHYSCV25Jjs.isAbsolute.call(void 0, normalizedOptions.manifestPath) ? normalizedOptions.manifestPath : _chunkHYSCV25Jjs.joinPaths.call(void 0, config.workspaceRoot, normalizedOptions.manifestPath)
|
|
1260
|
+
)
|
|
1261
|
+
);
|
|
1262
|
+
}
|
|
1263
|
+
}
|
|
1212
1264
|
if (process.env.VERCEL) {
|
|
1213
1265
|
return { success: true };
|
|
1214
1266
|
}
|
|
1215
|
-
const { task } = await napi.build(
|
|
1267
|
+
const { task } = await napi.build(normalizedOptions);
|
|
1216
1268
|
return { success: true, terminalOutput: await task };
|
|
1217
1269
|
}
|
|
1218
1270
|
var executor_default7 = withRunExecutor(
|
|
@@ -1222,11 +1274,12 @@ var executor_default7 = withRunExecutor(
|
|
|
1222
1274
|
skipReadingConfig: false,
|
|
1223
1275
|
hooks: {
|
|
1224
1276
|
applyDefaultOptions: (options) => {
|
|
1225
|
-
options.outputPath ??= "
|
|
1277
|
+
options.outputPath ??= "{sourceRoot}";
|
|
1226
1278
|
options.toolchain ??= "stable";
|
|
1227
1279
|
options.dtsCache ??= true;
|
|
1228
1280
|
options.platform ??= true;
|
|
1229
1281
|
options.constEnum ??= false;
|
|
1282
|
+
options.verbose ??= false;
|
|
1230
1283
|
options.jsBinding ??= "binding.js";
|
|
1231
1284
|
options.dts ??= "binding.d.ts";
|
|
1232
1285
|
return options;
|
|
@@ -1353,11 +1406,11 @@ function toTSDownFormat(format3) {
|
|
|
1353
1406
|
// ../tsdown/src/build.ts
|
|
1354
1407
|
var resolveOptions = async (userOptions) => {
|
|
1355
1408
|
const options = getDefaultOptions(userOptions);
|
|
1356
|
-
const workspaceRoot2 =
|
|
1409
|
+
const workspaceRoot2 = _chunkHYSCV25Jjs.findWorkspaceRoot.call(void 0, options.projectRoot);
|
|
1357
1410
|
if (!workspaceRoot2) {
|
|
1358
1411
|
throw new Error("Cannot find Nx workspace root");
|
|
1359
1412
|
}
|
|
1360
|
-
const workspaceConfig = await
|
|
1413
|
+
const workspaceConfig = await _chunkHYSCV25Jjs.getWorkspaceConfig.call(void 0, options.debug === true, {
|
|
1361
1414
|
workspaceRoot: workspaceRoot2
|
|
1362
1415
|
});
|
|
1363
1416
|
_chunk2CDSXWFAjs.writeDebug.call(void 0, " \u2699\uFE0F Resolving build options", workspaceConfig);
|
|
@@ -1365,7 +1418,7 @@ var resolveOptions = async (userOptions) => {
|
|
|
1365
1418
|
const projectGraph = await _devkit.createProjectGraphAsync.call(void 0, {
|
|
1366
1419
|
exitOnError: true
|
|
1367
1420
|
});
|
|
1368
|
-
const projectJsonPath =
|
|
1421
|
+
const projectJsonPath = _chunkHYSCV25Jjs.joinPaths.call(void 0,
|
|
1369
1422
|
workspaceRoot2,
|
|
1370
1423
|
options.projectRoot,
|
|
1371
1424
|
"project.json"
|
|
@@ -1382,7 +1435,7 @@ var resolveOptions = async (userOptions) => {
|
|
|
1382
1435
|
"The Build process failed because the project does not have a valid configuration in the project.json file. Check if the file exists in the root of the project."
|
|
1383
1436
|
);
|
|
1384
1437
|
}
|
|
1385
|
-
const packageJsonPath =
|
|
1438
|
+
const packageJsonPath = _chunkHYSCV25Jjs.joinPaths.call(void 0,
|
|
1386
1439
|
workspaceRoot2,
|
|
1387
1440
|
options.projectRoot,
|
|
1388
1441
|
"package.json"
|
|
@@ -1391,13 +1444,13 @@ var resolveOptions = async (userOptions) => {
|
|
|
1391
1444
|
throw new Error("Cannot find package.json configuration");
|
|
1392
1445
|
}
|
|
1393
1446
|
const debug = _nullishCoalesce(options.debug, () => ( (options.mode || workspaceConfig.mode) === "development"));
|
|
1394
|
-
const sourceRoot = projectJson.sourceRoot ||
|
|
1447
|
+
const sourceRoot = projectJson.sourceRoot || _chunkHYSCV25Jjs.joinPaths.call(void 0, options.projectRoot, "src");
|
|
1395
1448
|
const result = {
|
|
1396
1449
|
name: projectName,
|
|
1397
1450
|
mode: "production",
|
|
1398
1451
|
target: DEFAULT_TARGET,
|
|
1399
1452
|
generatePackageJson: true,
|
|
1400
|
-
outDir:
|
|
1453
|
+
outDir: _chunkHYSCV25Jjs.joinPaths.call(void 0, "dist", options.projectRoot),
|
|
1401
1454
|
minify: !debug,
|
|
1402
1455
|
plugins: [],
|
|
1403
1456
|
assets: [],
|
|
@@ -1409,12 +1462,12 @@ var resolveOptions = async (userOptions) => {
|
|
|
1409
1462
|
clean: false,
|
|
1410
1463
|
fixedExtension: true,
|
|
1411
1464
|
nodeProtocol: true,
|
|
1412
|
-
tsconfig:
|
|
1465
|
+
tsconfig: _chunkHYSCV25Jjs.joinPaths.call(void 0, options.projectRoot, "tsconfig.json"),
|
|
1413
1466
|
debug,
|
|
1414
1467
|
sourceRoot,
|
|
1415
1468
|
cwd: workspaceConfig.workspaceRoot,
|
|
1416
1469
|
entry: {
|
|
1417
|
-
["index"]:
|
|
1470
|
+
["index"]: _chunkHYSCV25Jjs.joinPaths.call(void 0, sourceRoot, "index.ts")
|
|
1418
1471
|
},
|
|
1419
1472
|
workspace: true,
|
|
1420
1473
|
...options,
|
|
@@ -1433,15 +1486,15 @@ var resolveOptions = async (userOptions) => {
|
|
|
1433
1486
|
return result;
|
|
1434
1487
|
};
|
|
1435
1488
|
async function generatePackageJson2(options) {
|
|
1436
|
-
if (options.generatePackageJson !== false && _fs.existsSync.call(void 0,
|
|
1489
|
+
if (options.generatePackageJson !== false && _fs.existsSync.call(void 0, _chunkHYSCV25Jjs.joinPaths.call(void 0, options.projectRoot, "package.json"))) {
|
|
1437
1490
|
_chunk2CDSXWFAjs.writeDebug.call(void 0, " \u270D\uFE0F Writing package.json file", options.workspaceConfig);
|
|
1438
1491
|
const stopwatch = _chunk2CDSXWFAjs.getStopwatch.call(void 0, "Write package.json file");
|
|
1439
|
-
const packageJsonPath =
|
|
1492
|
+
const packageJsonPath = _chunkHYSCV25Jjs.joinPaths.call(void 0, options.projectRoot, "project.json");
|
|
1440
1493
|
if (!_fs.existsSync.call(void 0, packageJsonPath)) {
|
|
1441
1494
|
throw new Error("Cannot find package.json configuration");
|
|
1442
1495
|
}
|
|
1443
1496
|
const packageJsonFile = await _promises2.default.readFile(
|
|
1444
|
-
|
|
1497
|
+
_chunkHYSCV25Jjs.joinPaths.call(void 0,
|
|
1445
1498
|
options.workspaceConfig.workspaceRoot,
|
|
1446
1499
|
options.projectRoot,
|
|
1447
1500
|
"package.json"
|
|
@@ -1503,7 +1556,7 @@ async function generatePackageJson2(options) {
|
|
|
1503
1556
|
},
|
|
1504
1557
|
packageJson.exports
|
|
1505
1558
|
);
|
|
1506
|
-
await _devkit.writeJsonFile.call(void 0,
|
|
1559
|
+
await _devkit.writeJsonFile.call(void 0, _chunkHYSCV25Jjs.joinPaths.call(void 0, options.outDir, "package.json"), packageJson);
|
|
1507
1560
|
stopwatch();
|
|
1508
1561
|
}
|
|
1509
1562
|
return options;
|
|
@@ -1695,7 +1748,7 @@ async function unbuildExecutorFn(options, context, config) {
|
|
|
1695
1748
|
);
|
|
1696
1749
|
}
|
|
1697
1750
|
const jiti = _jiti.createJiti.call(void 0, config.workspaceRoot, {
|
|
1698
|
-
fsCache: config.skipCache ? false :
|
|
1751
|
+
fsCache: config.skipCache ? false : _chunkHYSCV25Jjs.joinPaths.call(void 0,
|
|
1699
1752
|
config.workspaceRoot,
|
|
1700
1753
|
config.directories.cache || "node_modules/.cache/storm",
|
|
1701
1754
|
"jiti"
|
|
@@ -1717,7 +1770,7 @@ async function unbuildExecutorFn(options, context, config) {
|
|
|
1717
1770
|
{
|
|
1718
1771
|
stubOptions: {
|
|
1719
1772
|
jiti: {
|
|
1720
|
-
fsCache: config.skipCache ? false :
|
|
1773
|
+
fsCache: config.skipCache ? false : _chunkHYSCV25Jjs.joinPaths.call(void 0,
|
|
1721
1774
|
config.workspaceRoot,
|
|
1722
1775
|
config.directories.cache || "node_modules/.cache/storm",
|
|
1723
1776
|
"jiti"
|
|
@@ -1784,14 +1837,14 @@ var withRunGenerator = (name, generatorFn, generatorOptions = {
|
|
|
1784
1837
|
_chunk2CDSXWFAjs.writeInfo.call(void 0, `\u26A1 Running the ${name} generator...
|
|
1785
1838
|
|
|
1786
1839
|
`, config);
|
|
1787
|
-
const workspaceRoot2 =
|
|
1840
|
+
const workspaceRoot2 = _chunkHYSCV25Jjs.findWorkspaceRoot.call(void 0, );
|
|
1788
1841
|
if (!generatorOptions.skipReadingConfig) {
|
|
1789
1842
|
_chunk2CDSXWFAjs.writeDebug.call(void 0,
|
|
1790
1843
|
`Loading the Storm Config from environment variables and storm.config.js file...
|
|
1791
1844
|
- workspaceRoot: ${workspaceRoot2}`,
|
|
1792
1845
|
config
|
|
1793
1846
|
);
|
|
1794
|
-
config = await
|
|
1847
|
+
config = await _chunkHYSCV25Jjs.getConfig.call(void 0, workspaceRoot2);
|
|
1795
1848
|
}
|
|
1796
1849
|
if (_optionalChain([generatorOptions, 'optionalAccess', _120 => _120.hooks, 'optionalAccess', _121 => _121.applyDefaultOptions])) {
|
|
1797
1850
|
_chunk2CDSXWFAjs.writeDebug.call(void 0, "Running the applyDefaultOptions hook...", config);
|
|
@@ -1910,16 +1963,16 @@ async function typeScriptLibraryGeneratorFn(tree, options, config) {
|
|
|
1910
1963
|
const projectConfig = {
|
|
1911
1964
|
root: normalized.directory,
|
|
1912
1965
|
projectType: "library",
|
|
1913
|
-
sourceRoot:
|
|
1966
|
+
sourceRoot: _chunkHYSCV25Jjs.joinPaths.call(void 0, _nullishCoalesce(normalized.directory, () => ( "")), "src"),
|
|
1914
1967
|
targets: {
|
|
1915
1968
|
build: {
|
|
1916
1969
|
executor: options.buildExecutor,
|
|
1917
1970
|
outputs: ["{options.outputPath}"],
|
|
1918
1971
|
options: {
|
|
1919
|
-
entry: [
|
|
1972
|
+
entry: [_chunkHYSCV25Jjs.joinPaths.call(void 0, normalized.projectRoot, "src", "index.ts")],
|
|
1920
1973
|
outputPath: getOutputPath(normalized),
|
|
1921
|
-
tsconfig:
|
|
1922
|
-
project:
|
|
1974
|
+
tsconfig: _chunkHYSCV25Jjs.joinPaths.call(void 0, normalized.projectRoot, "tsconfig.json"),
|
|
1975
|
+
project: _chunkHYSCV25Jjs.joinPaths.call(void 0, normalized.projectRoot, "package.json"),
|
|
1923
1976
|
defaultConfiguration: "production",
|
|
1924
1977
|
platform: "neutral",
|
|
1925
1978
|
assets: [
|
|
@@ -1976,7 +2029,7 @@ async function typeScriptLibraryGeneratorFn(tree, options, config) {
|
|
|
1976
2029
|
if (!normalized.importPath) {
|
|
1977
2030
|
normalized.importPath = normalized.name;
|
|
1978
2031
|
}
|
|
1979
|
-
const packageJsonPath =
|
|
2032
|
+
const packageJsonPath = _chunkHYSCV25Jjs.joinPaths.call(void 0, normalized.projectRoot, "package.json");
|
|
1980
2033
|
if (tree.exists(packageJsonPath)) {
|
|
1981
2034
|
_devkit.updateJson.call(void 0, tree, packageJsonPath, (json) => {
|
|
1982
2035
|
if (!normalized.importPath) {
|
|
@@ -2033,14 +2086,14 @@ async function typeScriptLibraryGeneratorFn(tree, options, config) {
|
|
|
2033
2086
|
}));
|
|
2034
2087
|
}
|
|
2035
2088
|
_js.addTsConfigPath.call(void 0, tree, normalized.importPath, [
|
|
2036
|
-
|
|
2089
|
+
_chunkHYSCV25Jjs.joinPaths.call(void 0,
|
|
2037
2090
|
normalized.projectRoot,
|
|
2038
2091
|
"./src",
|
|
2039
2092
|
`index.${normalized.js ? "js" : "ts"}`
|
|
2040
2093
|
)
|
|
2041
2094
|
]);
|
|
2042
|
-
_js.addTsConfigPath.call(void 0, tree,
|
|
2043
|
-
|
|
2095
|
+
_js.addTsConfigPath.call(void 0, tree, _chunkHYSCV25Jjs.joinPaths.call(void 0, normalized.importPath, "/*"), [
|
|
2096
|
+
_chunkHYSCV25Jjs.joinPaths.call(void 0, normalized.projectRoot, "./src", "/*")
|
|
2044
2097
|
]);
|
|
2045
2098
|
if (tree.exists("package.json")) {
|
|
2046
2099
|
const packageJson = _devkit.readJson.call(void 0, tree, "package.json");
|
|
@@ -2051,7 +2104,7 @@ async function typeScriptLibraryGeneratorFn(tree, options, config) {
|
|
|
2051
2104
|
description = packageJson.description;
|
|
2052
2105
|
}
|
|
2053
2106
|
}
|
|
2054
|
-
const tsconfigPath =
|
|
2107
|
+
const tsconfigPath = _chunkHYSCV25Jjs.joinPaths.call(void 0, normalized.projectRoot, "tsconfig.json");
|
|
2055
2108
|
if (tree.exists(tsconfigPath)) {
|
|
2056
2109
|
_devkit.updateJson.call(void 0, tree, tsconfigPath, (json) => {
|
|
2057
2110
|
json.composite ??= true;
|
|
@@ -2079,7 +2132,7 @@ function getOutputPath(options) {
|
|
|
2079
2132
|
} else {
|
|
2080
2133
|
parts.push(options.projectRoot);
|
|
2081
2134
|
}
|
|
2082
|
-
return
|
|
2135
|
+
return _chunkHYSCV25Jjs.joinPaths.call(void 0, ...parts);
|
|
2083
2136
|
}
|
|
2084
2137
|
function createProjectTsConfigJson(tree, options) {
|
|
2085
2138
|
const tsconfig = {
|
|
@@ -2087,7 +2140,7 @@ function createProjectTsConfigJson(tree, options) {
|
|
|
2087
2140
|
..._nullishCoalesce(_optionalChain([options, 'optionalAccess', _149 => _149.tsconfigOptions]), () => ( {})),
|
|
2088
2141
|
compilerOptions: {
|
|
2089
2142
|
...options.rootProject ? _js.tsConfigBaseOptions : {},
|
|
2090
|
-
outDir:
|
|
2143
|
+
outDir: _chunkHYSCV25Jjs.joinPaths.call(void 0, _devkit.offsetFromRoot.call(void 0, options.projectRoot), "dist/out-tsc"),
|
|
2091
2144
|
noEmit: true,
|
|
2092
2145
|
..._nullishCoalesce(_optionalChain([options, 'optionalAccess', _150 => _150.tsconfigOptions, 'optionalAccess', _151 => _151.compilerOptions]), () => ( {}))
|
|
2093
2146
|
},
|
|
@@ -2105,7 +2158,7 @@ function createProjectTsConfigJson(tree, options) {
|
|
|
2105
2158
|
"src/**/*.test.ts"
|
|
2106
2159
|
]
|
|
2107
2160
|
};
|
|
2108
|
-
_devkit.writeJson.call(void 0, tree,
|
|
2161
|
+
_devkit.writeJson.call(void 0, tree, _chunkHYSCV25Jjs.joinPaths.call(void 0, options.projectRoot, "tsconfig.json"), tsconfig);
|
|
2109
2162
|
}
|
|
2110
2163
|
async function normalizeOptions(tree, options, config) {
|
|
2111
2164
|
let importPath = options.importPath;
|
|
@@ -2170,7 +2223,7 @@ async function normalizeOptions(tree, options, config) {
|
|
|
2170
2223
|
|
|
2171
2224
|
// ../workspace-tools/src/generators/browser-library/generator.ts
|
|
2172
2225
|
async function browserLibraryGeneratorFn(tree, schema, config) {
|
|
2173
|
-
const filesDir =
|
|
2226
|
+
const filesDir = _chunkHYSCV25Jjs.joinPaths.call(void 0,
|
|
2174
2227
|
__dirname,
|
|
2175
2228
|
"src",
|
|
2176
2229
|
"generators",
|
|
@@ -2261,9 +2314,9 @@ async function configSchemaGeneratorFn(tree, options, config) {
|
|
|
2261
2314
|
`Determining the Storm Workspace Configuration JSON Schema...`,
|
|
2262
2315
|
config
|
|
2263
2316
|
);
|
|
2264
|
-
const jsonSchema = z.toJSONSchema(
|
|
2317
|
+
const jsonSchema = z.toJSONSchema(_chunkHYSCV25Jjs.workspaceConfigSchema, {
|
|
2265
2318
|
target: "draft-7",
|
|
2266
|
-
metadata:
|
|
2319
|
+
metadata: _chunkHYSCV25Jjs.schemaRegistry
|
|
2267
2320
|
});
|
|
2268
2321
|
jsonSchema.$id ??= "https://public.storm-cdn.com/schemas/storm-workspace.schema.json";
|
|
2269
2322
|
jsonSchema.title ??= "Storm Workspace Configuration JSON Schema";
|
|
@@ -2275,7 +2328,7 @@ async function configSchemaGeneratorFn(tree, options, config) {
|
|
|
2275
2328
|
);
|
|
2276
2329
|
}
|
|
2277
2330
|
const outputPath = options.outputFile.replaceAll("{workspaceRoot}", "").replaceAll(
|
|
2278
|
-
_nullishCoalesce(_optionalChain([config, 'optionalAccess', _160 => _160.workspaceRoot]), () => (
|
|
2331
|
+
_nullishCoalesce(_optionalChain([config, 'optionalAccess', _160 => _160.workspaceRoot]), () => ( _chunkHYSCV25Jjs.findWorkspaceRoot.call(void 0, ))),
|
|
2279
2332
|
options.outputFile.startsWith("./") ? "" : "./"
|
|
2280
2333
|
);
|
|
2281
2334
|
_chunk2CDSXWFAjs.writeTrace.call(void 0,
|
|
@@ -2319,7 +2372,7 @@ var generator_default2 = withRunGenerator(
|
|
|
2319
2372
|
|
|
2320
2373
|
|
|
2321
2374
|
async function neutralLibraryGeneratorFn(tree, schema, config) {
|
|
2322
|
-
const filesDir =
|
|
2375
|
+
const filesDir = _chunkHYSCV25Jjs.joinPaths.call(void 0,
|
|
2323
2376
|
__dirname,
|
|
2324
2377
|
"src",
|
|
2325
2378
|
"generators",
|
|
@@ -2378,7 +2431,7 @@ var generator_default3 = withRunGenerator(
|
|
|
2378
2431
|
|
|
2379
2432
|
|
|
2380
2433
|
async function nodeLibraryGeneratorFn(tree, schema, config) {
|
|
2381
|
-
const filesDir =
|
|
2434
|
+
const filesDir = _chunkHYSCV25Jjs.joinPaths.call(void 0,
|
|
2382
2435
|
__dirname,
|
|
2383
2436
|
"src",
|
|
2384
2437
|
"generators",
|
|
@@ -18,6 +18,7 @@ function normalizeWindowsPath(input = "") {
|
|
|
18
18
|
var _UNC_REGEX = /^[/\\]{2}/;
|
|
19
19
|
var _IS_ABSOLUTE_RE = /^[/\\](?![/\\])|^[/\\]{2}(?!\.)|^[A-Za-z]:[/\\]/;
|
|
20
20
|
var _DRIVE_LETTER_RE = /^[A-Za-z]:$/;
|
|
21
|
+
var _ROOT_FOLDER_RE = /^\/([A-Za-z]:)?$/;
|
|
21
22
|
var correctPaths = function(path) {
|
|
22
23
|
if (!path || path.length === 0) {
|
|
23
24
|
return ".";
|
|
@@ -68,6 +69,30 @@ var joinPaths = function(...segments) {
|
|
|
68
69
|
}
|
|
69
70
|
return correctPaths(path);
|
|
70
71
|
};
|
|
72
|
+
function cwd() {
|
|
73
|
+
if (typeof process !== "undefined" && typeof process.cwd === "function") {
|
|
74
|
+
return process.cwd().replace(/\\/g, "/");
|
|
75
|
+
}
|
|
76
|
+
return "/";
|
|
77
|
+
}
|
|
78
|
+
var resolve = function(...arguments_) {
|
|
79
|
+
arguments_ = arguments_.map((argument) => normalizeWindowsPath(argument));
|
|
80
|
+
let resolvedPath = "";
|
|
81
|
+
let resolvedAbsolute = false;
|
|
82
|
+
for (let index = arguments_.length - 1; index >= -1 && !resolvedAbsolute; index--) {
|
|
83
|
+
const path = index >= 0 ? arguments_[index] : cwd();
|
|
84
|
+
if (!path || path.length === 0) {
|
|
85
|
+
continue;
|
|
86
|
+
}
|
|
87
|
+
resolvedPath = `${path}/${resolvedPath}`;
|
|
88
|
+
resolvedAbsolute = isAbsolute(path);
|
|
89
|
+
}
|
|
90
|
+
resolvedPath = normalizeString(resolvedPath, !resolvedAbsolute);
|
|
91
|
+
if (resolvedAbsolute && !isAbsolute(resolvedPath)) {
|
|
92
|
+
return `/${resolvedPath}`;
|
|
93
|
+
}
|
|
94
|
+
return resolvedPath.length > 0 ? resolvedPath : ".";
|
|
95
|
+
};
|
|
71
96
|
function normalizeString(path, allowAboveRoot) {
|
|
72
97
|
let res = "";
|
|
73
98
|
let lastSegmentLength = 0;
|
|
@@ -131,6 +156,22 @@ function normalizeString(path, allowAboveRoot) {
|
|
|
131
156
|
var isAbsolute = function(p) {
|
|
132
157
|
return _IS_ABSOLUTE_RE.test(p);
|
|
133
158
|
};
|
|
159
|
+
var relative = function(from, to) {
|
|
160
|
+
const _from = resolve(from).replace(_ROOT_FOLDER_RE, "$1").split("/");
|
|
161
|
+
const _to = resolve(to).replace(_ROOT_FOLDER_RE, "$1").split("/");
|
|
162
|
+
if (_to[0][1] === ":" && _from[0][1] === ":" && _from[0] !== _to[0]) {
|
|
163
|
+
return _to.join("/");
|
|
164
|
+
}
|
|
165
|
+
const _fromCopy = [..._from];
|
|
166
|
+
for (const segment of _fromCopy) {
|
|
167
|
+
if (_to[0] !== segment) {
|
|
168
|
+
break;
|
|
169
|
+
}
|
|
170
|
+
_from.shift();
|
|
171
|
+
_to.shift();
|
|
172
|
+
}
|
|
173
|
+
return [..._from.map(() => ".."), ..._to].join("/");
|
|
174
|
+
};
|
|
134
175
|
|
|
135
176
|
// ../config-tools/src/utilities/find-up.ts
|
|
136
177
|
var _fs = require('fs');
|
|
@@ -1686,4 +1727,7 @@ function getWorkspaceConfig(skipLogs = true, options = {}) {
|
|
|
1686
1727
|
|
|
1687
1728
|
|
|
1688
1729
|
|
|
1689
|
-
|
|
1730
|
+
|
|
1731
|
+
|
|
1732
|
+
|
|
1733
|
+
exports.correctPaths = correctPaths; exports.joinPaths = joinPaths; exports.isAbsolute = isAbsolute; exports.relative = relative; exports.findWorkspaceRoot = findWorkspaceRoot; exports.schemaRegistry = schemaRegistry; exports.workspaceConfigSchema = workspaceConfigSchema; exports.getConfig = getConfig; exports.getWorkspaceConfig = getWorkspaceConfig;
|