@storm-software/workspace-tools 1.5.3 → 1.5.4

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 CHANGED
@@ -1,3 +1,10 @@
1
+ ## [1.5.3](https://github.com/storm-software/storm-ops/compare/workspace-tools-v1.5.2...workspace-tools-v1.5.3) (2023-11-07)
2
+
3
+
4
+ ### Bug Fixes
5
+
6
+ * **workspace-tools:** Resolved various type issues with preset execution ([189ed86](https://github.com/storm-software/storm-ops/commit/189ed867e688af05a3b1aebbd8a053c2c707a457))
7
+
1
8
  ## [1.5.2](https://github.com/storm-software/storm-ops/compare/workspace-tools-v1.5.1...workspace-tools-v1.5.2) (2023-11-07)
2
9
 
3
10
 
package/README.md CHANGED
@@ -15,7 +15,7 @@ This package is part of the <b>⚡Storm-Ops</b> monorepo. The Storm-Ops packages
15
15
 
16
16
  <h3 align="center">💻 Visit <a href="https://stormsoftware.org" target="_blank">stormsoftware.org</a> to stay up to date with this developer</h3><br />
17
17
 
18
- [![Version](https://img.shields.io/badge/version-1.5.1-1fb2a6.svg?style=for-the-badge&color=1fb2a6)](https://prettier.io/)&nbsp;
18
+ [![Version](https://img.shields.io/badge/version-1.5.3-1fb2a6.svg?style=for-the-badge&color=1fb2a6)](https://prettier.io/)&nbsp;
19
19
  [![Nx](https://img.shields.io/badge/Nx-17.0.2-lightgrey?style=for-the-badge&logo=nx&logoWidth=20&&color=1fb2a6)](http://nx.dev/)&nbsp;[![NextJs](https://img.shields.io/badge/Next.js-14.0.2-lightgrey?style=for-the-badge&logo=nextdotjs&logoWidth=20&color=1fb2a6)](https://nextjs.org/)&nbsp;[![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg?style=for-the-badge&logo=commitlint&color=1fb2a6)](http://commitizen.github.io/cz-cli/)&nbsp;![Semantic-Release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=for-the-badge&color=1fb2a6)&nbsp;[![documented with docusaurus](https://img.shields.io/badge/documented_with-docusaurus-success.svg?style=for-the-badge&logo=readthedocs&color=1fb2a6)](https://docusaurus.io/)&nbsp;![GitHub Workflow Status (with event)](https://img.shields.io/github/actions/workflow/status/storm-software/storm-ops/cr.yml?style=for-the-badge&logo=github-actions&color=1fb2a6)
20
20
 
21
21
  <h3 align="center" bold="true">⚠️ <b>Attention</b> ⚠️ - This repository, and the apps, libraries, and tools contained within, is still in it's initial development phase. As a result, bugs and issues are expected with it's usage. When the main development phase completes, a proper release will be performed, the packages will be availible through NPM (and other distributions), and this message will be removed. However, in the meantime, please feel free to report any issues you may come across.</h3><br />
package/config/nx.json CHANGED
@@ -129,6 +129,5 @@
129
129
  "{projectRoot}/tsconfig.storybook.json"
130
130
  ]
131
131
  }
132
- },
133
- "plugins": ["@nx/next"]
132
+ }
134
133
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@storm-software/workspace-tools",
3
- "version": "1.5.3",
3
+ "version": "1.5.4",
4
4
  "private": false,
5
5
  "description": "⚡ A Nx plugin package that contains various executors and generators used in a Storm workspaces.",
6
6
  "keywords": [
@@ -18,7 +18,7 @@ STORM_REPO_OWNER="sullivanpj"
18
18
  STORM_REPO_WORKER="stormie-bot"
19
19
  STORM_REPO_ORG="<%= organization %>"
20
20
  STORM_REPO_NAME="<%= name %>"
21
- STORM_REPO_URL="https://github.com/<%= organization %>/<%= name %>"
21
+ STORM_REPO_URL="<%= repositoryUrl %>"
22
22
  STORM_BRANCH="main"
23
23
  STORM_PRE_MAJOR=false
24
24
 
@@ -30,7 +30,7 @@ HEALTH_CHECK_PATH="/healthcheck"
30
30
  LOG_LEVEL="info"
31
31
  # LOG_PATH="C:\\Development\\stormstack\\logs"
32
32
 
33
- PNPM_VERSION="8.10.2"
33
+ PNPM_VERSION="<%= pnpmVersion %>"
34
34
 
35
35
  DEV_EDITOR_ID="vscode"
36
36
 
@@ -1 +1 @@
1
- 20.9.0
1
+ <%= nodeVersion %>
@@ -16,7 +16,7 @@ runs:
16
16
  - uses: pnpm/action-setup@v2.4.0
17
17
  id: pnpm-install
18
18
  with:
19
- version: 8.7.4
19
+ version: 8.10.2
20
20
  run_install: false
21
21
 
22
22
  - name: Get pnpm store directory
@@ -1,4 +1,4 @@
1
- name: "CI/CD"
1
+ name: "Build and Release"
2
2
 
3
3
  on:
4
4
  workflow_dispatch:
@@ -6,7 +6,7 @@ env:
6
6
  CI: true
7
7
  NX_DAEMON: false
8
8
  NX_VERBOSE_LOGGING: true
9
- GITHUB_ACTOR: "🤖 Storm Bot"
9
+ GITHUB_ACTOR: ${{ github.actor }}
10
10
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
11
11
  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
12
12
 
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "recommendations": [
3
3
  "nrwl.angular-console",
4
- "storm-software.power-plant",
4
+ "storm-software.acidic",
5
5
  "esbenp.prettier-vscode",
6
6
  "firsttris.vscode-jest-runner",
7
7
  "dbaeumer.vscode-eslint",
@@ -6,7 +6,7 @@
6
6
  "type": "extensionHost",
7
7
  "request": "launch",
8
8
  "args": [
9
- "--extensionDevelopmentPath=${workspaceFolder}/node_modules/@power-plant/language"
9
+ "--extensionDevelopmentPath=${workspaceFolder}/node_modules/@acidic/language"
10
10
  ]
11
11
  },
12
12
  {
@@ -14,7 +14,7 @@
14
14
  "type": "extensionHost",
15
15
  "request": "launch",
16
16
  "args": [
17
- "--extensionDevelopmentPath=${workspaceFolder}/node_modules/power-plant"
17
+ "--extensionDevelopmentPath=${workspaceFolder}/node_modules/acidic"
18
18
  ]
19
19
  },
20
20
  {
@@ -31,9 +31,7 @@
31
31
  "request": "attach",
32
32
  "skipFiles": ["<node_internals>/**"],
33
33
  "sourceMaps": true,
34
- "outFiles": [
35
- "${workspaceFolder}/node_modules/@power-plant/language/**/*.js"
36
- ]
34
+ "outFiles": ["${workspaceFolder}/node_modules/@acidic/language/**/*.js"]
37
35
  }
38
36
  ]
39
37
  }
@@ -5,9 +5,10 @@
5
5
  </div>
6
6
 
7
7
  <br />
8
- Storm Software's <b>⚡<%= name %></b> monorepo contains various configurations and tools used to manage the Storm Software repositories.
8
+ <h1>@<%= namespace %>/<%= name %></h1>
9
+ <%= descirption %>
9
10
  <br /><br />
10
- Storm-Ops is built using <a href="https://nx.dev/" target="_blank">Nx</a>, a set of extensible dev tools for monorepos, which helps you develop like Google, Facebook, and Microsoft. Building on top of Nx, the Open System provides a set of tools and patterns that help you scale your monorepo to many teams while keeping the codebase maintainable.
11
+ <b>⚡ Storm Workspaces</b> are built using <a href="https://nx.dev/" target="_blank">Nx</a>, a set of extensible dev tools for monorepos, which helps you develop like Google, Facebook, and Microsoft. Building on top of Nx, the Open System provides a set of tools and patterns that help you scale your monorepo to many teams while keeping the codebase maintainable.
11
12
 
12
13
  <h3 align="center">💻 Visit <a href="https://stormsoftware.org" target="_blank">stormsoftware.org</a> to stay up to date with this developer</h3><br />
13
14
 
@@ -1,96 +1,3 @@
1
1
  {
2
- "$schema": "./node_modules/nx/schemas/nx-schema.json",
3
- "extends": "@storm-software/workspace-tools/config/nx.json",
4
- "affected": {
5
- "defaultBase": "main"
6
- },
7
- "workspaceLayout": {
8
- "projectNameAndRootFormat": "as-provided"
9
- },
10
- "tasksRunnerOptions": {
11
- "default": {
12
- "runner": "nx/tasks-runners/default",
13
- "options": {
14
- "cacheableOperations": ["build", "lint", "format", "test", "e2e"],
15
- "parallel": 5
16
- }
17
- }
18
- },
19
- "targetDefaults": {
20
- "build": {
21
- "cache": true,
22
- "dependsOn": ["^build"],
23
- "inputs": ["production", "^production"],
24
- "outputs": ["{options.outputPath}"],
25
- "options": {
26
- "outputPath": "dist/{projectRoot}",
27
- "tsConfig": "{projectRoot}/tsconfig.lib.json",
28
- "assets": [
29
- {
30
- "glob": "*.md",
31
- "input": "{projectRoot}",
32
- "output": "."
33
- },
34
- {
35
- "glob": "LICENSE",
36
- "input": ".",
37
- "output": "."
38
- }
39
- ]
40
- }
41
- },
42
- "lint": {
43
- "cache": true,
44
- "executor": "@nx/eslint:lint",
45
- "outputs": ["{options.outputFile}"],
46
- "options": {
47
- "lintFilePatterns": [
48
- "{projectRoot}/**/*.ts",
49
- "{projectRoot}/package.json"
50
- ]
51
- },
52
- "inputs": [
53
- "default",
54
- "{workspaceRoot}/.eslintrc.json",
55
- "{workspaceRoot}/.eslintignore",
56
- "{workspaceRoot}/eslint.config.js"
57
- ]
58
- },
59
- "test": {
60
- "cache": true,
61
- "inputs": ["default", "^production"],
62
- "executor": "@nx/jest:jest",
63
- "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
64
- "options": {
65
- "jestConfig": "{projectRoot}/jest.config.ts",
66
- "passWithNoTests": true
67
- },
68
- "configurations": {
69
- "ci": {
70
- "ci": true,
71
- "codeCoverage": true
72
- }
73
- }
74
- },
75
- "e2e": {
76
- "cache": true
77
- }
78
- },
79
- "namedInputs": {
80
- "default": ["{projectRoot}/**/*", "sharedGlobals"],
81
- "production": [
82
- "default",
83
- "!{projectRoot}/.eslintrc.json",
84
- "!{projectRoot}/eslint.config.js",
85
- "!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)",
86
- "!{projectRoot}/tsconfig.spec.json",
87
- "!{projectRoot}/jest.config.[jt]s"
88
- ],
89
- "sharedGlobals": []
90
- },
91
- "pluginsConfig": {
92
- "@nx/js": {
93
- "analyzeSourceFiles": true
94
- }
95
- }
2
+ "extends": "@storm-software/workspace-tools/config/nx.json"
96
3
  }
@@ -7,9 +7,5 @@
7
7
  "baseUrl": ".",
8
8
  "paths": {}
9
9
  },
10
- "references": [
11
- {
12
- "path": "./.storybook/tsconfig.json"
13
- }
14
- ]
10
+ "references": []
15
11
  }
@@ -25,9 +25,10 @@ function default_1(tree, options) {
25
25
  }
26
26
  });
27
27
  (0, devkit_1.updateJson)(tree, "package.json", json => {
28
- var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
28
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
29
29
  json.scripts = json.scripts || {};
30
30
  json.version = "0.0.0";
31
+ json.triggerEmptyDevReleaseByIncrementingThisNumber = 0;
31
32
  json.private = true;
32
33
  (_a = json.keywords) !== null && _a !== void 0 ? _a : (json.keywords = [
33
34
  options.name,
@@ -116,8 +117,7 @@ function default_1(tree, options) {
116
117
  json.scripts.format = "nx format:write";
117
118
  json.scripts.help = "nx help";
118
119
  json.scripts["dep-graph"] = "nx dep-graph";
119
- json.scripts["local-registry"] =
120
- "nx local-registry @storm-software/storm-ops";
120
+ json.scripts["local-registry"] = `nx local-registry @${options.namespace}/${options.name}`;
121
121
  json.scripts.e2e = "nx e2e";
122
122
  if (options.includeApps) {
123
123
  json.scripts.test = "nx test";
@@ -133,14 +133,11 @@ function default_1(tree, options) {
133
133
  json.scripts["api-extractor"] =
134
134
  "nx g @storm-software/workspace-tools:api-extractor --outputPath 'docs/api-reference' --clean --no-interactive";
135
135
  json.scripts.release = "pnpm storm-git release";
136
- (_k = json.packageManager) !== null && _k !== void 0 ? _k : (json.packageManager = "pnpm@8.10.2");
136
+ (_k = json.packageManager) !== null && _k !== void 0 ? _k : (json.packageManager = `pnpm@${versions_1.pnpmVersion}`);
137
137
  json.engines = {
138
+ node: `>=${versions_1.nodeVersion}`,
138
139
  pnpm: `>=${versions_1.pnpmVersion}`
139
140
  };
140
- if (options.includeApps) {
141
- json.engines.node = `>=${versions_1.nodeVersion}`;
142
- }
143
- (_l = json.packageManager) !== null && _l !== void 0 ? _l : (json.packageManager = "pnpm@8.10.2");
144
141
  json.prettier = "@storm-software/linting-tools/prettier/config.json";
145
142
  if (options.includeApps) {
146
143
  json.bundlewatch = {
@@ -163,7 +160,8 @@ function default_1(tree, options) {
163
160
  };
164
161
  return json;
165
162
  });
166
- (0, devkit_1.generateFiles)(tree, path.join(__dirname, "files"), projectRoot, options);
163
+ (0, devkit_1.generateFiles)(tree, path.join(__dirname, "files"), projectRoot, Object.assign(Object.assign({}, options), { pnpmVersion: versions_1.pnpmVersion,
164
+ nodeVersion: versions_1.nodeVersion }));
167
165
  yield (0, devkit_1.formatFiles)(tree);
168
166
  let dependencies = {
169
167
  "nx": "latest",
@@ -1 +1 @@
1
- {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/workspace-tools/src/generators/preset/generator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/workspace-tools/src/generators/preset/generator.ts"],"names":[],"mappings":"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"}
@@ -14,5 +14,5 @@ export declare const eslintVersion = "~8.53.0";
14
14
  export declare const lintStagedVersion = "15.0.2";
15
15
  export declare const semanticReleaseVersion = "22.0.7";
16
16
  export declare const nxVersion = "^17.0.3";
17
- export declare const nodeVersion = "20.9.0";
17
+ export declare const nodeVersion = "18.17.1";
18
18
  export declare const pnpmVersion = "8.10.2";
@@ -17,6 +17,6 @@ exports.eslintVersion = "~8.53.0";
17
17
  exports.lintStagedVersion = "15.0.2";
18
18
  exports.semanticReleaseVersion = "22.0.7";
19
19
  exports.nxVersion = "^17.0.3";
20
- exports.nodeVersion = "20.9.0";
20
+ exports.nodeVersion = "18.17.1";
21
21
  exports.pnpmVersion = "8.10.2";
22
22
  //# sourceMappingURL=versions.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/workspace-tools/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,WAAW,GAAG,QAAQ,CAAC;AACvB,QAAA,0BAA0B,GAAG,OAAO,CAAC;AACrC,QAAA,qBAAqB,GAAG,OAAO,CAAC;AAChC,QAAA,eAAe,GAAG,QAAQ,CAAC;AAC3B,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,cAAc,GAAG,SAAS,CAAC;AAC3B,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAC7B,QAAA,cAAc,GAAG,OAAO,CAAC;AACzB,QAAA,YAAY,GAAG,OAAO,CAAC;AACvB,QAAA,gBAAgB,GAAG,QAAQ,CAAC;AAC5B,QAAA,gBAAgB,GAAG,QAAQ,CAAC;AAC5B,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAC7B,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAC7B,QAAA,sBAAsB,GAAG,QAAQ,CAAC;AAElC,QAAA,SAAS,GAAG,SAAS,CAAC;AACtB,QAAA,WAAW,GAAG,QAAQ,CAAC;AACvB,QAAA,WAAW,GAAG,QAAQ,CAAC"}
1
+ {"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/workspace-tools/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,WAAW,GAAG,QAAQ,CAAC;AACvB,QAAA,0BAA0B,GAAG,OAAO,CAAC;AACrC,QAAA,qBAAqB,GAAG,OAAO,CAAC;AAChC,QAAA,eAAe,GAAG,QAAQ,CAAC;AAC3B,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,cAAc,GAAG,SAAS,CAAC;AAC3B,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAC7B,QAAA,cAAc,GAAG,OAAO,CAAC;AACzB,QAAA,YAAY,GAAG,OAAO,CAAC;AACvB,QAAA,gBAAgB,GAAG,QAAQ,CAAC;AAC5B,QAAA,gBAAgB,GAAG,QAAQ,CAAC;AAC5B,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAC7B,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAC7B,QAAA,sBAAsB,GAAG,QAAQ,CAAC;AAElC,QAAA,SAAS,GAAG,SAAS,CAAC;AACtB,QAAA,WAAW,GAAG,SAAS,CAAC;AACxB,QAAA,WAAW,GAAG,QAAQ,CAAC"}