@rxap/plugin-utilities 16.3.0 → 16.4.0-dev.1

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.
Files changed (8) hide show
  1. package/CHANGELOG.md +12 -0
  2. package/README.md +1 -1
  3. package/package.json +11 -7
  4. package/src/lib/guess-output-path.d.ts +1 -1
  5. package/src/lib/guess-output-path.js +3 -2
  6. package/src/lib/guess-output-path.js.map +1 -1
  7. package/src/lib/project-package-name-mapping.js +4 -2
  8. package/src/lib/project-package-name-mapping.js.map +1 -1
package/CHANGELOG.md CHANGED
@@ -3,6 +3,18 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
+ # [16.4.0-dev.1](https://gitlab.com/rxap/packages/compare/@rxap/plugin-utilities@16.4.0-dev.0...@rxap/plugin-utilities@16.4.0-dev.1) (2024-05-27)
7
+
8
+ ### Bug Fixes
9
+
10
+ - **plugin-utilities:** change cache variables to nullable in project-package-name-mapping.ts ([5b1d168](https://gitlab.com/rxap/packages/commit/5b1d16837debeb7ba26eaa0d7a5533c05c6e3abd))
11
+
12
+ # [16.4.0-dev.0](https://gitlab.com/rxap/packages/compare/@rxap/plugin-utilities@16.3.0...@rxap/plugin-utilities@16.4.0-dev.0) (2024-05-04)
13
+
14
+ ### Features
15
+
16
+ - support replacement of the projectName variable name ([06ed250](https://gitlab.com/rxap/packages/commit/06ed2508794db12fed5558a316ee5b8c862ed92b))
17
+
6
18
  # [16.3.0](https://gitlab.com/rxap/packages/compare/@rxap/plugin-utilities@16.3.0-dev.1...@rxap/plugin-utilities@16.3.0) (2024-04-18)
7
19
 
8
20
  **Note:** Version bump only for package @rxap/plugin-utilities
package/README.md CHANGED
@@ -17,5 +17,5 @@ yarn add @rxap/plugin-utilities
17
17
  ```
18
18
  **Install peer dependencies:**
19
19
  ```bash
20
- yarn add @nx/devkit@^16.10.0 @rxap/node-utilities@^1.2.0 @rxap/workspace-utilities@^16.1.0 tslib@2.6.2
20
+ yarn add @nx/devkit@^16.10.0 @rxap/node-utilities@^1.2.0 @rxap/workspace-utilities@^16.3.0-dev.1 tslib@2.6.2
21
21
  ```
package/package.json CHANGED
@@ -1,5 +1,5 @@
1
1
  {
2
- "version": "16.3.0",
2
+ "version": "16.4.0-dev.1",
3
3
  "name": "@rxap/plugin-utilities",
4
4
  "license": "GPL-3.0-or-later",
5
5
  "dependencies": {
@@ -13,9 +13,9 @@
13
13
  "peerDependencies": {
14
14
  "@nx/devkit": "^16.10.0",
15
15
  "@rxap/node-utilities": "^1.2.0",
16
- "@rxap/workspace-utilities": "^16.1.0",
16
+ "@rxap/workspace-utilities": "^16.3.0-dev.1",
17
17
  "tslib": "2.6.2",
18
- "@rxap/utilities": "16.1.0"
18
+ "@rxap/utilities": "16.2.0-dev.1"
19
19
  },
20
20
  "author": {
21
21
  "name": "Merzough Münker",
@@ -37,16 +37,20 @@
37
37
  "nx-migrations": {
38
38
  "packageGroup": [
39
39
  {
40
- "package": "@rxap/generator-utilities",
41
- "version": "1.1.1-dev.1"
40
+ "package": "@nx/devkit",
41
+ "version": "16.10.0"
42
42
  },
43
43
  {
44
44
  "package": "@rxap/node-utilities",
45
45
  "version": "1.2.0"
46
46
  },
47
+ {
48
+ "package": "@rxap/utilities",
49
+ "version": "16.2.0-dev.1"
50
+ },
47
51
  {
48
52
  "package": "@rxap/workspace-utilities",
49
- "version": "16.1.0"
53
+ "version": "16.3.0-dev.1"
50
54
  }
51
55
  ]
52
56
  },
@@ -60,6 +64,6 @@
60
64
  "directory": "packages/plugin/utilities"
61
65
  },
62
66
  "type": "commonjs",
63
- "gitHead": "d8fa8d10b2a11aebda6a6321f1e4a678337f16a2",
67
+ "gitHead": "ca2e1999cd330fd3c1a07a2b2471a36567dab3e9",
64
68
  "main": "./src/index.js"
65
69
  }
package/src/lib/guess-output-path.d.ts CHANGED
@@ -1,4 +1,4 @@
1
1
  import { ExecutorContext, TargetConfiguration } from '@nx/devkit';
2
2
  export declare function GuessOutputPathFromContext(context: ExecutorContext, projectName?: string | undefined, configurationName?: string | undefined, targetName?: string): string;
3
3
  export declare function GuessOutputPathFromTargetString(context: ExecutorContext, targetString?: string): string;
4
- export declare function GuessOutputPath(projectRoot: string, buildTarget: TargetConfiguration, configurationName?: string): string;
4
+ export declare function GuessOutputPath(projectName: string, projectRoot: string, buildTarget: TargetConfiguration, configurationName?: string): string;
package/src/lib/guess-output-path.js CHANGED
@@ -18,7 +18,7 @@ function GuessOutputPathFromContext(context, projectName = context.projectName,
18
18
  throw new Error(`Could not find target 'build' for project '${projectName}'`);
19
19
  }
20
20
  const projectRoot = (0, project_1.GetProjectRoot)(context, projectName);
21
- return GuessOutputPath(projectRoot, target, configurationName);
21
+ return GuessOutputPath(projectName, projectRoot, target, configurationName);
22
22
  }
23
23
  exports.GuessOutputPathFromContext = GuessOutputPathFromContext;
24
24
  function GuessOutputPathFromTargetString(context, targetString) {
@@ -40,7 +40,7 @@ function GuessOutputPathFromTargetString(context, targetString) {
40
40
  return GuessOutputPathFromContext(context, projectName, configurationName, targetName);
41
41
  }
42
42
  exports.GuessOutputPathFromTargetString = GuessOutputPathFromTargetString;
43
- function GuessOutputPath(projectRoot, buildTarget, configurationName) {
43
+ function GuessOutputPath(projectName, projectRoot, buildTarget, configurationName) {
44
44
  let outputPath = (0, workspace_utilities_1.GetTargetOptions)(buildTarget, configurationName)['outputPath'];
45
45
  if (!outputPath) {
46
46
  if (buildTarget.outputs && buildTarget.outputs.length) {
@@ -60,6 +60,7 @@ function GuessOutputPath(projectRoot, buildTarget, configurationName) {
60
60
  throw new Error(`The outputPath is not a string. Found: ${outputPath}`);
61
61
  }
62
62
  return outputPath
63
+ .replace(/\{projectName}/, projectName)
63
64
  .replace(/\{projectRoot}/, projectRoot)
64
65
  .replace(/\{workspaceRoot}\//, '');
65
66
  }
package/src/lib/guess-output-path.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"guess-output-path.js","sourceRoot":"","sources":["../../../../../../packages/plugin/utilities/src/lib/guess-output-path.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"guess-output-path.js","sourceRoot":"","sources":["../../../../../../packages/plugin/utilities/src/lib/guess-output-path.ts"],"names":[],"mappings":"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"}
package/src/lib/project-package-name-mapping.js CHANGED
@@ -2,14 +2,16 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.HasProjectWithPackageName = exports.ProjectNameToPackageName = exports.PackageNameToProjectName = exports.LoadProjectToPackageMapping = void 0;
4
4
  const fs_1 = require("fs");
5
- const PACKAGE_NAME_TO_PROJECT_NAME_CACHE = {};
6
- const PROJECT_NAME_TO_PACKAGE_NAME_CACHE = {};
5
+ let PACKAGE_NAME_TO_PROJECT_NAME_CACHE = null;
6
+ let PROJECT_NAME_TO_PACKAGE_NAME_CACHE = null;
7
7
  function LoadProjectToPackageMapping(context) {
8
8
  const { projectGraph } = context;
9
9
  if (!projectGraph) {
10
10
  throw new Error('The projectGraph is undefined. Ensure the projectGraph is passed into the executor context.');
11
11
  }
12
12
  const projectNames = Object.keys(projectGraph.nodes);
13
+ PACKAGE_NAME_TO_PROJECT_NAME_CACHE = {};
14
+ PROJECT_NAME_TO_PACKAGE_NAME_CACHE = {};
13
15
  for (const projectName of projectNames) {
14
16
  const project = projectGraph.nodes[projectName];
15
17
  if (project.type !== 'lib') {
package/src/lib/project-package-name-mapping.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"project-package-name-mapping.js","sourceRoot":"","sources":["../../../../../../packages/plugin/utilities/src/lib/project-package-name-mapping.ts"],"names":[],"mappings":";;;AACA,2BAGY;AAEZ,MAAM,kCAAkC,GAA2B,EAAE,CAAC;AACtE,MAAM,kCAAkC,GAA2B,EAAE,CAAC;AAEtE,SAAgB,2BAA2B,CAAC,OAAwB;IAElE,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC;IAEjC,IAAI,CAAC,YAAY,EAAE;QACjB,MAAM,IAAI,KAAK,CAAC,6FAA6F,CAAC,CAAC;KAChH;IAED,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IACrD,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE;QACtC,MAAM,OAAO,GAAG,YAAY,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAChD,IAAI,OAAO,CAAC,IAAI,KAAK,KAAK,EAAE;YAC1B,SAAS;SACV;QACD,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC;QACtC,IAAI,CAAC,IAAA,eAAU,EAAC,GAAI,WAAY,eAAe,CAAC,EAAE;YAChD,SAAS;SACV;QACD,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,iBAAY,EAAC,GAAI,WAAY,eAAe,CAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;QACjG,kCAAkC,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC;QACnE,kCAAkC,CAAC,WAAW,CAAC,GAAG,WAAW,CAAC,IAAI,CAAC;KACpE;AACH,CAAC;AAtBD,kEAsBC;AAED,SAAgB,wBAAwB,CAAC,WAAmB;IAC1D,IAAI,CAAC,kCAAkC,EAAE;QACvC,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC;KAC/E;IACD,IAAI,kCAAkC,CAAC,WAAW,CAAC,EAAE;QACnD,OAAO,kCAAkC,CAAC,WAAW,CAAC,CAAC;KACxD;IACD,MAAM,IAAI,KAAK,CAAC,uCAAwC,WAAY,GAAG,CAAC,CAAC;AAC3E,CAAC;AARD,4DAQC;AAED,SAAgB,wBAAwB,CAAC,WAAmB;IAC1D,IAAI,CAAC,kCAAkC,EAAE;QACvC,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC;KAC/E;IACD,IAAI,kCAAkC,CAAC,WAAW,CAAC,EAAE;QACnD,OAAO,kCAAkC,CAAC,WAAW,CAAC,CAAC;KACxD;IACD,MAAM,IAAI,KAAK,CAAC,uCAAwC,WAAY,GAAG,CAAC,CAAC;AAC3E,CAAC;AARD,4DAQC;AAED,SAAgB,yBAAyB,CAAC,WAAmB;IAC3D,IAAI,CAAC,kCAAkC,EAAE;QACvC,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC;KAC/E;IACD,OAAO,kCAAkC,CAAC,WAAW,CAAC,KAAK,SAAS,CAAC;AACvE,CAAC;AALD,8DAKC"}
1
+ {"version":3,"file":"project-package-name-mapping.js","sourceRoot":"","sources":["../../../../../../packages/plugin/utilities/src/lib/project-package-name-mapping.ts"],"names":[],"mappings":";;;AACA,2BAGY;AAEZ,IAAI,kCAAkC,GAAkC,IAAI,CAAC;AAC7E,IAAI,kCAAkC,GAAkC,IAAI,CAAC;AAE7E,SAAgB,2BAA2B,CAAC,OAAwB;IAElE,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC;IAEjC,IAAI,CAAC,YAAY,EAAE;QACjB,MAAM,IAAI,KAAK,CAAC,6FAA6F,CAAC,CAAC;KAChH;IAED,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IACrD,kCAAkC,GAAG,EAAE,CAAC;IACxC,kCAAkC,GAAG,EAAE,CAAC;IACxC,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE;QACtC,MAAM,OAAO,GAAG,YAAY,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAChD,IAAI,OAAO,CAAC,IAAI,KAAK,KAAK,EAAE;YAC1B,SAAS;SACV;QACD,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC;QACtC,IAAI,CAAC,IAAA,eAAU,EAAC,GAAI,WAAY,eAAe,CAAC,EAAE;YAChD,SAAS;SACV;QACD,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,iBAAY,EAAC,GAAI,WAAY,eAAe,CAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;QACjG,kCAAkC,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC;QACnE,kCAAkC,CAAC,WAAW,CAAC,GAAG,WAAW,CAAC,IAAI,CAAC;KACpE;AACH,CAAC;AAxBD,kEAwBC;AAED,SAAgB,wBAAwB,CAAC,WAAmB;IAC1D,IAAI,CAAC,kCAAkC,EAAE;QACvC,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC;KAC/E;IACD,IAAI,kCAAkC,CAAC,WAAW,CAAC,EAAE;QACnD,OAAO,kCAAkC,CAAC,WAAW,CAAC,CAAC;KACxD;IACD,MAAM,IAAI,KAAK,CAAC,uCAAwC,WAAY,GAAG,CAAC,CAAC;AAC3E,CAAC;AARD,4DAQC;AAED,SAAgB,wBAAwB,CAAC,WAAmB;IAC1D,IAAI,CAAC,kCAAkC,EAAE;QACvC,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC;KAC/E;IACD,IAAI,kCAAkC,CAAC,WAAW,CAAC,EAAE;QACnD,OAAO,kCAAkC,CAAC,WAAW,CAAC,CAAC;KACxD;IACD,MAAM,IAAI,KAAK,CAAC,uCAAwC,WAAY,GAAG,CAAC,CAAC;AAC3E,CAAC;AARD,4DAQC;AAED,SAAgB,yBAAyB,CAAC,WAAmB;IAC3D,IAAI,CAAC,kCAAkC,EAAE;QACvC,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC;KAC/E;IACD,OAAO,kCAAkC,CAAC,WAAW,CAAC,KAAK,SAAS,CAAC;AACvE,CAAC;AALD,8DAKC"}