@storm-software/workspace-tools 1.5.22 → 1.5.24
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 +14 -0
- package/package.json +1 -1
- package/src/executors/tsup/executor.js +9 -4
- package/src/executors/tsup/executor.js.map +1 -1
- package/src/generators/preset/files/.husky/post-checkout +1 -1
- package/src/generators/preset/files/.husky/post-commit +1 -1
- package/src/generators/preset/files/.husky/post-merge +1 -1
- package/src/generators/preset/files/.husky/pre-commit +1 -1
- package/src/generators/preset/files/.husky/pre-push +1 -1
- package/src/generators/preset/generator.js +1 -1
- package/src/generators/preset/generator.js.map +1 -1
- package/src/utils/apply-workspace-tokens.js +5 -3
- package/src/utils/apply-workspace-tokens.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,17 @@
|
|
|
1
|
+
## [1.5.23](https://github.com/storm-software/storm-ops/compare/workspace-tools-v1.5.22...workspace-tools-v1.5.23) (2023-11-10)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* **workspace-tools:** Resolved project configuration reference issue in tsup executor ([f6f8cef](https://github.com/storm-software/storm-ops/commit/f6f8ceff5ff7fc94c4c1680db2ce25afcc8254d4))
|
|
7
|
+
|
|
8
|
+
## [1.5.22](https://github.com/storm-software/storm-ops/compare/workspace-tools-v1.5.21...workspace-tools-v1.5.22) (2023-11-10)
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
### Bug Fixes
|
|
12
|
+
|
|
13
|
+
* **git-tools:** Resolved issue with missing husky hooks ([505113d](https://github.com/storm-software/storm-ops/commit/505113d29a17b37c99aa00d93bb6a1b5f60412ed))
|
|
14
|
+
|
|
1
15
|
## [1.5.21](https://github.com/storm-software/storm-ops/compare/workspace-tools-v1.5.20...workspace-tools-v1.5.21) (2023-11-10)
|
|
2
16
|
|
|
3
17
|
|
package/package.json
CHANGED
|
@@ -10,13 +10,18 @@ const apply_workspace_tokens_1 = require("../../utils/apply-workspace-tokens");
|
|
|
10
10
|
const get_workspace_root_1 = require("../../utils/get-workspace-root");
|
|
11
11
|
const get_config_1 = require("./get-config");
|
|
12
12
|
function runExecutor(options, context) {
|
|
13
|
-
var _a;
|
|
13
|
+
var _a, _b;
|
|
14
14
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
15
15
|
try {
|
|
16
16
|
console.log("⚡Running build executor on the workspace");
|
|
17
|
+
if (!((_a = context.projectsConfigurations) === null || _a === void 0 ? void 0 : _a.projects) ||
|
|
18
|
+
!context.projectName ||
|
|
19
|
+
!context.projectsConfigurations.projects[context.projectName]) {
|
|
20
|
+
throw Error("The Build process failed because the context is not valid. Please run this command from a workspace.");
|
|
21
|
+
}
|
|
17
22
|
const workspaceRoot = (0, get_workspace_root_1.getWorkspaceRoot)();
|
|
18
|
-
const projectRoot = context.projectsConfigurations[context.projectName].root;
|
|
19
|
-
const sourceRoot = context.projectsConfigurations[context.projectName].sourceRoot;
|
|
23
|
+
const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
|
|
24
|
+
const sourceRoot = context.projectsConfigurations.projects[context.projectName].sourceRoot;
|
|
20
25
|
const outputPath = (0, apply_workspace_tokens_1.applyWorkspaceTokens)(options.outputPath
|
|
21
26
|
? options.outputPath
|
|
22
27
|
: (0, path_1.join)(workspaceRoot, "dist", projectRoot), context);
|
|
@@ -60,7 +65,7 @@ function runExecutor(options, context) {
|
|
|
60
65
|
options.external.push(tpd.node.data.packageName);
|
|
61
66
|
externalDependencies.push(tpd);
|
|
62
67
|
}
|
|
63
|
-
const cpjOptions = Object.assign(Object.assign({}, options), { generateLockfile: true, outputFileExtensionForCjs: (0, build_esbuild_options_1.getOutExtension)("cjs", Object.assign(Object.assign({ external: [] }, options), { singleEntry: ((
|
|
68
|
+
const cpjOptions = Object.assign(Object.assign({}, options), { generateLockfile: true, outputFileExtensionForCjs: (0, build_esbuild_options_1.getOutExtension)("cjs", Object.assign(Object.assign({ external: [] }, options), { singleEntry: ((_b = options.additionalEntryPoints) === null || _b === void 0 ? void 0 : _b.length) === 0, thirdParty: true, assets, userDefinedBuildOptions: {} })), excludeLibsInPackageJson: true, updateBuildableProjectDepsInPackageJson: externalDependencies.length > 0 });
|
|
64
69
|
// If we're bundling third-party packages, then any extra deps from external should be the only deps in package.json
|
|
65
70
|
if (externalDependencies.length > 0) {
|
|
66
71
|
cpjOptions.overrideDependencies = externalDependencies;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/workspace-tools/src/executors/tsup/executor.ts"],"names":[],"mappings":";;;AAEA,uGAA8F;AAC9F,yGAAoG;AACpG,+BAA6E;AAE7E,+BAA4B;AAC5B,+BAA8C;AAC9C,+EAA0E;AAC1E,uEAAkE;AAClE,6CAAyC;AAGzC,SAA8B,WAAW,CACvC,OAA2B,EAC3B,OAAwB;;;QAExB,IAAI;YACF,OAAO,CAAC,GAAG,CAAC,0CAA0C,CAAC,CAAC;YAExD,MAAM,aAAa,GAAG,IAAA,qCAAgB,GAAE,CAAC;YACzC,MAAM,WAAW,GACf,OAAO,CAAC,sBAAsB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/workspace-tools/src/executors/tsup/executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -71,7 +71,7 @@ function default_1(tree, options) {
|
|
|
71
71
|
// generate a start script into the package.json
|
|
72
72
|
json.scripts.adr = "pnpm log4brains adr new";
|
|
73
73
|
json.scripts["adr-preview"] = "pnpm log4brains preview";
|
|
74
|
-
json.scripts.prepare = "pnpm add husky -w";
|
|
74
|
+
json.scripts.prepare = "pnpm add husky -w && pnpm husky install";
|
|
75
75
|
json.scripts.preinstall = "npx -y only-allow pnpm";
|
|
76
76
|
json.scripts["install:csb"] =
|
|
77
77
|
"corepack enable && pnpm install --frozen-lockfile";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/workspace-tools/src/generators/preset/generator.ts"],"names":[],"mappings":";;;AAAA,uCAQoB;AACpB,6BAA6B;AAC7B,mDAI8B;AAG9B,mBAA+B,IAAU,EAAE,OAA8B;;;QACvE,IAAI;YACF,MAAM,WAAW,GAAG,GAAG,CAAC;YAExB,MAAA,OAAO,CAAC,WAAW,oCAAnB,OAAO,CAAC,WAAW,GAAK,QACtB,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,IAClD,uHAAuH,EAAC;YACxH,MAAA,OAAO,CAAC,SAAS,oCAAjB,OAAO,CAAC,SAAS,GAAK,OAAO,CAAC,YAAY,EAAC;YAE3C,IAAA,gCAAuB,EAAC,IAAI,EAAE,IAAI,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,IAAI,EAAE,EAAE;gBACrE,IAAI,EAAE,WAAW;gBACjB,WAAW,EAAE,aAAa;gBAC1B,OAAO,EAAE;oBACP,gBAAgB,EAAE;wBAChB,UAAU,EAAE,kBAAkB;wBAC9B,SAAS,EAAE;4BACT,MAAM,EAAE,IAAI;4BACZ,QAAQ,EAAE,uBAAuB;4BACjC,SAAS,EAAE,4BAA4B;yBACxC;qBACF;iBACF;aACF,CAAC,CAAC;YAEH,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,IAAI,CAAC,EAAE;;gBACtC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC;gBAElC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;gBACvB,IAAI,CAAC,8CAA8C,GAAG,CAAC,CAAC;gBACxD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;gBACpB,MAAA,IAAI,CAAC,QAAQ,oCAAb,IAAI,CAAC,QAAQ,GAAK;oBAChB,OAAO,CAAC,IAAI;oBACZ,OAAO,CAAC,SAAS;oBACjB,OAAO;oBACP,YAAY;oBACZ,WAAW;oBACX,QAAQ;oBACR,aAAa;oBACb,cAAc;oBACd,QAAQ;oBACR,QAAQ;oBACR,QAAQ;oBACR,UAAU;oBACV,QAAQ;oBACR,QAAQ;oBACR,SAAS;oBACT,YAAY;oBACZ,UAAU;iBACX,EAAC;gBAEF,MAAA,IAAI,CAAC,QAAQ,oCAAb,IAAI,CAAC,QAAQ,GAAK,2BAA2B,EAAC;gBAC9C,MAAA,IAAI,CAAC,IAAI,oCAAT,IAAI,CAAC,IAAI,GAAK;oBACZ,GAAG,EAAE,mCAAmC;oBACxC,KAAK,EAAE,2BAA2B;iBACnC,EAAC;gBAEF,IAAI,CAAC,OAAO,GAAG,oBAAoB,CAAC;gBACpC,MAAA,IAAI,CAAC,MAAM,oCAAX,IAAI,CAAC,MAAM,GAAK;oBACd,IAAI,EAAE,gBAAgB;oBACtB,KAAK,EAAE,2BAA2B;oBAClC,GAAG,EAAE,2BAA2B;iBACjC,EAAC;gBAEF,MAAA,IAAI,CAAC,SAAS,oCAAd,IAAI,CAAC,SAAS,GAAK,IAAI,OAAO,CAAC,SAAS,EAAE,EAAC;gBAC3C,MAAA,IAAI,CAAC,WAAW,oCAAhB,IAAI,CAAC,WAAW,GAAK,OAAO,CAAC,WAAW,EAAC;gBAEzC,MAAA,OAAO,CAAC,aAAa,oCAArB,OAAO,CAAC,aAAa,GAAK,sBAAsB,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,IAAI,GAAG,EAAC;gBACxF,MAAA,IAAI,CAAC,UAAU,oCAAf,IAAI,CAAC,UAAU,GAAK;oBAClB,IAAI,EAAE,QAAQ;oBACd,GAAG,EAAE,GAAG,OAAO,CAAC,aAAa,MAAM;iBACpC,EAAC;gBAEF,gDAAgD;gBAEhD,IAAI,CAAC,OAAO,CAAC,GAAG,GAAG,yBAAyB,CAAC;gBAC7C,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,GAAG,yBAAyB,CAAC;gBACxD,IAAI,CAAC,OAAO,CAAC,OAAO,GAAG,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/workspace-tools/src/generators/preset/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.applyWorkspaceTokens = void 0;
|
|
4
4
|
const get_workspace_root_1 = require("./get-workspace-root");
|
|
5
5
|
const applyWorkspaceTokens = (option, config) => {
|
|
6
|
+
var _a;
|
|
6
7
|
let result = option;
|
|
7
8
|
if (!result) {
|
|
8
9
|
return result;
|
|
@@ -11,12 +12,13 @@ const applyWorkspaceTokens = (option, config) => {
|
|
|
11
12
|
let projectName;
|
|
12
13
|
let projectRoot;
|
|
13
14
|
let sourceRoot;
|
|
14
|
-
if ((config === null || config === void 0 ? void 0 : config.projectsConfigurations) &&
|
|
15
|
+
if (((_a = config === null || config === void 0 ? void 0 : config.projectsConfigurations) === null || _a === void 0 ? void 0 : _a.projects) &&
|
|
15
16
|
(config === null || config === void 0 ? void 0 : config.projectName)) {
|
|
16
17
|
const context = config;
|
|
17
18
|
projectName = context.projectName;
|
|
18
|
-
projectRoot = context.projectsConfigurations[projectName].root;
|
|
19
|
-
sourceRoot =
|
|
19
|
+
projectRoot = context.projectsConfigurations.projects[projectName].root;
|
|
20
|
+
sourceRoot =
|
|
21
|
+
context.projectsConfigurations.projects[projectName].sourceRoot;
|
|
20
22
|
}
|
|
21
23
|
else {
|
|
22
24
|
const projectConfig = config;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apply-workspace-tokens.js","sourceRoot":"","sources":["../../../../../packages/workspace-tools/src/utils/apply-workspace-tokens.ts"],"names":[],"mappings":";;;AACA,6DAAwD;AAEjD,MAAM,oBAAoB,GAAG,CAClC,MAAc,EACd,MAA8C,EACtC,EAAE
|
|
1
|
+
{"version":3,"file":"apply-workspace-tokens.js","sourceRoot":"","sources":["../../../../../packages/workspace-tools/src/utils/apply-workspace-tokens.ts"],"names":[],"mappings":";;;AACA,6DAAwD;AAEjD,MAAM,oBAAoB,GAAG,CAClC,MAAc,EACd,MAA8C,EACtC,EAAE;;IACV,IAAI,MAAM,GAAG,MAAM,CAAC;IACpB,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,MAAM,CAAC;KACf;IAED,MAAM,aAAa,GAAG,IAAA,qCAAgB,GAAE,CAAC;IAEzC,IAAI,WAAoB,CAAC;IACzB,IAAI,WAAoB,CAAC;IACzB,IAAI,UAAmB,CAAC;IACxB,IACE,CAAA,MAAC,MAA0B,aAA1B,MAAM,uBAAN,MAAM,CAAsB,sBAAsB,0CAAE,QAAQ;SAC5D,MAA0B,aAA1B,MAAM,uBAAN,MAAM,CAAsB,WAAW,CAAA,EACxC;QACA,MAAM,OAAO,GAAG,MAAyB,CAAC;QAC1C,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;QAClC,WAAW,GAAG,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC;QACxE,UAAU;YACR,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,UAAU,CAAC;KACnE;SAAM;QACL,MAAM,aAAa,GAAG,MAA8B,CAAC;QACrD,WAAW,GAAG,aAAa,CAAC,IAAI,CAAC;QACjC,WAAW,GAAG,aAAa,CAAC,IAAI,CAAC;QACjC,UAAU,GAAG,aAAa,CAAC,UAAU,CAAC;KACvC;IAED,IAAI,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE;QACpC,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC;KAC1D;IACD,IAAI,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE;QACpC,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC;KAC1D;IACD,IAAI,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE;QACnC,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;KACxD;IACD,IAAI,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE;QACtC,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAC;KAC9D;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AA5CW,QAAA,oBAAoB,wBA4C/B"}
|