@storm-software/workspace-tools 1.5.16 → 1.5.18

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,17 @@
1
+ ## [1.5.17](https://github.com/storm-software/storm-ops/compare/workspace-tools-v1.5.16...workspace-tools-v1.5.17) (2023-11-10)
2
+
3
+
4
+ ### Bug Fixes
5
+
6
+ * **workspace-tools:** Resolved issue with node-library generator package.json creation ([d18d160](https://github.com/storm-software/storm-ops/commit/d18d160f1dd7958df7c0d9c0b1921600dbb3741d))
7
+
8
+ ## [1.5.16](https://github.com/storm-software/storm-ops/compare/workspace-tools-v1.5.15...workspace-tools-v1.5.16) (2023-11-09)
9
+
10
+
11
+ ### Bug Fixes
12
+
13
+ * **workspace-tools:** Resolved issue with dependency versions in preset ([3e8225a](https://github.com/storm-software/storm-ops/commit/3e8225aed8de591575b225b01d4fb7fb9ed4d56a))
14
+
1
15
  ## [1.5.15](https://github.com/storm-software/storm-ops/compare/workspace-tools-v1.5.14...workspace-tools-v1.5.15) (2023-11-09)
2
16
 
3
17
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@storm-software/workspace-tools",
3
- "version": "1.5.16",
3
+ "version": "1.5.18",
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": [
@@ -6,12 +6,11 @@ const devkit_1 = require("@nx/devkit");
6
6
  const js_1 = require("@nx/js");
7
7
  const init_1 = require("@nx/js/src/generators/init/init");
8
8
  const generator_1 = require("@nx/js/src/generators/setup-verdaccio/generator");
9
- const path_1 = require("path");
10
9
  const versions_1 = require("../../utils/versions");
11
10
  const normalize_options_1 = require("./normalize-options");
12
11
  function nodeLibraryGenerator(tree, schema) {
13
12
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
14
- const filesDir = (0, path_1.join)(__dirname, "./files");
13
+ const filesDir = (0, devkit_1.joinPathFragments)(__dirname, "./files");
15
14
  const options = yield (0, normalize_options_1.normalizeOptions)(tree, schema);
16
15
  const tasks = [];
17
16
  tasks.push(yield (0, init_1.default)(tree, Object.assign(Object.assign({}, options), { tsConfigName: options.rootProject ? "tsconfig.json" : "tsconfig.base.json" })));
@@ -35,9 +34,9 @@ function nodeLibraryGenerator(tree, schema) {
35
34
  outputs: ["{options.outputPath}"],
36
35
  options: {
37
36
  outputPath: getOutputPath(options),
38
- main: (0, path_1.join)(options.projectRoot, "src/index.ts"),
39
- tsConfig: (0, path_1.join)(options.projectRoot, "tsconfig.json"),
40
- project: (0, path_1.join)(options.projectRoot, "package.json"),
37
+ main: (0, devkit_1.joinPathFragments)(options.projectRoot, "src/index.ts"),
38
+ tsConfig: (0, devkit_1.joinPathFragments)(options.projectRoot, "tsconfig.json"),
39
+ project: (0, devkit_1.joinPathFragments)(options.projectRoot, "package.json"),
41
40
  defaultConfiguration: "production",
42
41
  configurations: {
43
42
  production: {
@@ -57,16 +56,45 @@ function nodeLibraryGenerator(tree, schema) {
57
56
  name,
58
57
  propertyName, js: !!options.js, cliCommand: "nx", strict: undefined, tmpl: "", offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot), buildable: options.bundler && options.bundler !== "none", hasUnitTestRunner: options.unitTestRunner !== "none" }));
59
58
  const packageJsonPath = (0, devkit_1.joinPathFragments)(options.projectRoot, "package.json");
60
- (0, devkit_1.updateJson)(tree, packageJsonPath, (json) => {
61
- json.name = options.importPath;
62
- json.version = "0.0.1";
63
- // If the package is publishable or root/standalone, we should remove the private field.
64
- if (json.private && (options.publishable || options.rootProject)) {
65
- delete json.private;
66
- }
67
- return Object.assign(Object.assign({}, json), { files: [
59
+ if (tree.exists(packageJsonPath)) {
60
+ (0, devkit_1.updateJson)(tree, packageJsonPath, (json) => {
61
+ json.name = options.importPath;
62
+ json.version = "0.0.1";
63
+ // If the package is publishable or root/standalone, we should remove the private field.
64
+ if (json.private && (options.publishable || options.rootProject)) {
65
+ delete json.private;
66
+ }
67
+ return Object.assign(Object.assign({}, json), { files: [
68
+ (0, devkit_1.joinPathFragments)((0, devkit_1.offsetFromRoot)(options.projectRoot), "dist", options.projectRoot, "src")
69
+ ], type: "module", types: "legacy/index.d.ts", main: "legacy/index.cjs", module: "legacy/index.js", exports: {
70
+ ".": {
71
+ import: {
72
+ types: "./modern/index.d.ts",
73
+ default: "./modern/index.js"
74
+ },
75
+ require: {
76
+ types: "./modern/index.d.cts",
77
+ default: "./modern/index.cjs"
78
+ }
79
+ },
80
+ "./package.json": "./package.json"
81
+ }, sideEffects: false, dependencies: Object.assign({}, json.dependencies), publishConfig: {
82
+ access: "public"
83
+ } });
84
+ });
85
+ }
86
+ else {
87
+ (0, devkit_1.writeJson)(tree, packageJsonPath, {
88
+ name: options.importPath,
89
+ private: options.publishable && !options.rootProject,
90
+ files: [
68
91
  (0, devkit_1.joinPathFragments)((0, devkit_1.offsetFromRoot)(options.projectRoot), "dist", options.projectRoot, "src")
69
- ], type: "module", types: "legacy/index.d.ts", main: "legacy/index.cjs", module: "legacy/index.js", exports: {
92
+ ],
93
+ type: "module",
94
+ types: "legacy/index.d.ts",
95
+ main: "legacy/index.cjs",
96
+ module: "legacy/index.js",
97
+ exports: {
70
98
  ".": {
71
99
  import: {
72
100
  types: "./modern/index.d.ts",
@@ -78,10 +106,18 @@ function nodeLibraryGenerator(tree, schema) {
78
106
  }
79
107
  },
80
108
  "./package.json": "./package.json"
81
- }, sideEffects: false, dependencies: Object.assign({}, json.dependencies), publishConfig: {
109
+ },
110
+ sideEffects: false,
111
+ devDependencies: {
112
+ "@storm-software/workspace-tools": "latest",
113
+ "@storm-software/testing-tools": "latest",
114
+ "@types/node": versions_1.typesNodeVersion
115
+ },
116
+ publishConfig: {
82
117
  access: "public"
83
- } });
84
- });
118
+ }
119
+ });
120
+ }
85
121
  yield (0, devkit_1.formatFiles)(tree);
86
122
  });
87
123
  }
@@ -1 +1 @@
1
- {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/workspace-tools/src/generators/node-library/generator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/workspace-tools/src/generators/node-library/generator.ts"],"names":[],"mappings":"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"}