@toolsplus/nx-forge 6.0.1 → 6.0.2

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 (58) hide show
  1. package/package.json +3 -2
  2. package/src/executors/build/executor.js +24 -40
  3. package/src/executors/build/executor.js.map +1 -1
  4. package/src/executors/build/lib/normalize-options.js +9 -2
  5. package/src/executors/build/lib/normalize-options.js.map +1 -1
  6. package/src/executors/build/lib/patch-manifest-yml.js +33 -22
  7. package/src/executors/build/lib/patch-manifest-yml.js.map +1 -1
  8. package/src/executors/build/lib/process-resource-dependencies.js +14 -12
  9. package/src/executors/build/lib/process-resource-dependencies.js.map +1 -1
  10. package/src/executors/deploy/executor.js +24 -24
  11. package/src/executors/deploy/executor.js.map +1 -1
  12. package/src/executors/deploy/lib/transform-manifest-yml.js +5 -5
  13. package/src/executors/deploy/lib/transform-manifest-yml.js.map +1 -1
  14. package/src/executors/install/executor.js +19 -22
  15. package/src/executors/install/executor.js.map +1 -1
  16. package/src/executors/package/executor.js +31 -29
  17. package/src/executors/package/executor.js.map +1 -1
  18. package/src/executors/register/executor.js +23 -26
  19. package/src/executors/register/executor.js.map +1 -1
  20. package/src/executors/register/lib/normalize-options.js +6 -2
  21. package/src/executors/register/lib/normalize-options.js.map +1 -1
  22. package/src/executors/register/lib/patch-manifest-yml.js +16 -13
  23. package/src/executors/register/lib/patch-manifest-yml.js.map +1 -1
  24. package/src/executors/tunnel/executor.js +32 -49
  25. package/src/executors/tunnel/executor.js.map +1 -1
  26. package/src/executors/tunnel/lib/extract-custom-ui-projects.js +14 -19
  27. package/src/executors/tunnel/lib/extract-custom-ui-projects.js.map +1 -1
  28. package/src/executors/tunnel/lib/run-tunnel.js +72 -76
  29. package/src/executors/tunnel/lib/run-tunnel.js.map +1 -1
  30. package/src/executors/tunnel/lib/start-custom-uis.js +6 -9
  31. package/src/executors/tunnel/lib/start-custom-uis.js.map +1 -1
  32. package/src/generators/application/generator.js +84 -57
  33. package/src/generators/application/generator.js.map +1 -1
  34. package/src/generators/application/lib/add-project-dependencies.js +33 -32
  35. package/src/generators/application/lib/add-project-dependencies.js.map +1 -1
  36. package/src/generators/application/lib/normalize-options.js +26 -21
  37. package/src/generators/application/lib/normalize-options.js.map +1 -1
  38. package/src/generators/init/generator.js +16 -20
  39. package/src/generators/init/generator.js.map +1 -1
  40. package/src/graph/create-dependencies.js +11 -23
  41. package/src/graph/create-dependencies.js.map +1 -1
  42. package/src/migrations/update-2-3-0/remove-implicit-custom-ui-dependencies.js +15 -18
  43. package/src/migrations/update-2-3-0/remove-implicit-custom-ui-dependencies.js.map +1 -1
  44. package/src/migrations/update-2-3-0/utils/manifest.js +3 -3
  45. package/src/migrations/update-2-3-0/utils/manifest.js.map +1 -1
  46. package/src/migrations/update-3-0-0-webpack-config-setup/update-3-0-0-webpack-config-setup.js +15 -18
  47. package/src/migrations/update-3-0-0-webpack-config-setup/update-3-0-0-webpack-config-setup.js.map +1 -1
  48. package/src/shared/manifest/util-manifest.d.ts +18 -9
  49. package/src/shared/manifest/util-manifest.js +53 -37
  50. package/src/shared/manifest/util-manifest.js.map +1 -1
  51. package/src/utils/forge/async-commands.js +1 -1
  52. package/src/utils/forge/async-commands.js.map +1 -1
  53. package/src/utils/forge/manifest-yml.d.ts +3 -1
  54. package/src/utils/forge/manifest-yml.js +8 -7
  55. package/src/utils/forge/manifest-yml.js.map +1 -1
  56. package/src/utils/forge/yaml-validator.d.ts +19 -0
  57. package/src/utils/forge/yaml-validator.js +73 -0
  58. package/src/utils/forge/yaml-validator.js.map +1 -0
@@ -14,74 +14,101 @@ const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-projec
14
14
  function updateTsConfigOptions(tree, options) {
15
15
  (0, devkit_1.updateJson)(tree, `${options.appProjectRoot}/tsconfig.json`, (json) => {
16
16
  if (options.rootProject) {
17
- return Object.assign(Object.assign({ compilerOptions: Object.assign(Object.assign(Object.assign({}, js_1.tsConfigBaseOptions), json.compilerOptions), { esModuleInterop: true }) }, json), { extends: undefined, exclude: ['node_modules', 'tmp'] });
17
+ return {
18
+ compilerOptions: {
19
+ ...js_1.tsConfigBaseOptions,
20
+ ...json.compilerOptions,
21
+ esModuleInterop: true,
22
+ },
23
+ ...json,
24
+ extends: undefined,
25
+ exclude: ['node_modules', 'tmp'],
26
+ };
18
27
  }
19
28
  else {
20
- return Object.assign(Object.assign({}, json), { compilerOptions: Object.assign(Object.assign({}, json.compilerOptions), { esModuleInterop: true }) });
29
+ return {
30
+ ...json,
31
+ compilerOptions: {
32
+ ...json.compilerOptions,
33
+ esModuleInterop: true,
34
+ },
35
+ };
21
36
  }
22
37
  });
23
38
  }
24
- function applicationGenerator(tree, schema) {
25
- return tslib_1.__awaiter(this, void 0, void 0, function* () {
26
- return yield applicationGeneratorInternal(tree, Object.assign({ addPlugin: false }, schema));
39
+ async function applicationGenerator(tree, schema) {
40
+ return await applicationGeneratorInternal(tree, {
41
+ addPlugin: false,
42
+ ...schema,
27
43
  });
28
44
  }
29
- function applicationGeneratorInternal(tree, rawOptions) {
30
- return tslib_1.__awaiter(this, void 0, void 0, function* () {
31
- const options = yield (0, lib_1.normalizeOptions)(tree, rawOptions);
32
- const tasks = [];
33
- const jsInitTask = yield (0, js_1.initGenerator)(tree, Object.assign(Object.assign({}, rawOptions), { tsConfigName: rawOptions.rootProject
34
- ? 'tsconfig.json'
35
- : 'tsconfig.base.json', skipFormat: true }));
36
- tasks.push(jsInitTask);
37
- const initTask = yield (0, generator_1.default)(tree, {
45
+ async function applicationGeneratorInternal(tree, rawOptions) {
46
+ const options = await (0, lib_1.normalizeOptions)(tree, rawOptions);
47
+ const tasks = [];
48
+ const jsInitTask = await (0, js_1.initGenerator)(tree, {
49
+ ...rawOptions,
50
+ tsConfigName: rawOptions.rootProject
51
+ ? 'tsconfig.json'
52
+ : 'tsconfig.base.json',
53
+ skipFormat: true,
54
+ });
55
+ tasks.push(jsInitTask);
56
+ const initTask = await (0, generator_1.default)(tree, {
57
+ skipFormat: true,
58
+ });
59
+ tasks.push(initTask);
60
+ const installTask = await (0, add_project_dependencies_1.addProjectDependencies)(tree, options);
61
+ tasks.push(installTask);
62
+ if (options.bundler === 'webpack') {
63
+ const { webpackInitGenerator } = (0, devkit_1.ensurePackage)('@nx/webpack', devkit_1.NX_VERSION);
64
+ const webpackInitTask = await webpackInitGenerator(tree, {
65
+ skipPackageJson: options.skipPackageJson,
38
66
  skipFormat: true,
67
+ addPlugin: options.addPlugin,
39
68
  });
40
- tasks.push(initTask);
41
- const installTask = yield (0, add_project_dependencies_1.addProjectDependencies)(tree, options);
42
- tasks.push(installTask);
43
- if (options.bundler === 'webpack') {
44
- const { webpackInitGenerator } = (0, devkit_1.ensurePackage)('@nx/webpack', devkit_1.NX_VERSION);
45
- const webpackInitTask = yield webpackInitGenerator(tree, {
46
- skipPackageJson: options.skipPackageJson,
47
- skipFormat: true,
48
- addPlugin: options.addPlugin,
49
- });
50
- tasks.push(webpackInitTask);
51
- }
52
- (0, lib_1.addAppFiles)(tree, options);
53
- (0, lib_1.addProject)(tree, options);
54
- updateTsConfigOptions(tree, options);
55
- if (options.linter === eslint_1.Linter.EsLint) {
56
- const lintTask = yield (0, eslint_1.lintProjectGenerator)(tree, {
57
- linter: options.linter,
58
- project: options.name,
59
- tsConfigPaths: [
60
- (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'),
61
- ],
62
- unitTestRunner: options.unitTestRunner,
63
- skipFormat: true,
64
- setParserOptionsProject: options.setParserOptionsProject,
65
- rootProject: options.rootProject,
66
- addPlugin: options.addPlugin,
67
- });
68
- tasks.push(lintTask);
69
- }
70
- if (options.unitTestRunner === 'jest') {
71
- const jestTask = yield (0, jest_1.configurationGenerator)(tree, Object.assign(Object.assign({}, options), { project: options.name, setupFile: 'none', skipSerializers: true, supportTsx: options.js, testEnvironment: 'node', compiler: options.swcJest ? 'swc' : 'tsc', skipFormat: true }));
72
- tasks.push(jestTask);
73
- }
74
- if (options.js) {
75
- (0, devkit_1.updateTsConfigsToJs)(tree, { projectRoot: options.appProjectRoot });
76
- }
77
- if (!options.skipFormat) {
78
- yield (0, devkit_1.formatFiles)(tree);
79
- }
80
- tasks.push(() => {
81
- (0, log_show_project_command_1.logShowProjectCommand)(options.name);
69
+ tasks.push(webpackInitTask);
70
+ }
71
+ (0, lib_1.addAppFiles)(tree, options);
72
+ (0, lib_1.addProject)(tree, options);
73
+ updateTsConfigOptions(tree, options);
74
+ if (options.linter === eslint_1.Linter.EsLint) {
75
+ const lintTask = await (0, eslint_1.lintProjectGenerator)(tree, {
76
+ linter: options.linter,
77
+ project: options.name,
78
+ tsConfigPaths: [
79
+ (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'),
80
+ ],
81
+ unitTestRunner: options.unitTestRunner,
82
+ skipFormat: true,
83
+ setParserOptionsProject: options.setParserOptionsProject,
84
+ rootProject: options.rootProject,
85
+ addPlugin: options.addPlugin,
86
+ });
87
+ tasks.push(lintTask);
88
+ }
89
+ if (options.unitTestRunner === 'jest') {
90
+ const jestTask = await (0, jest_1.configurationGenerator)(tree, {
91
+ ...options,
92
+ project: options.name,
93
+ setupFile: 'none',
94
+ skipSerializers: true,
95
+ supportTsx: options.js,
96
+ testEnvironment: 'node',
97
+ compiler: options.swcJest ? 'swc' : 'tsc',
98
+ skipFormat: true,
82
99
  });
83
- return (0, devkit_1.runTasksInSerial)(...tasks);
100
+ tasks.push(jestTask);
101
+ }
102
+ if (options.js) {
103
+ (0, devkit_1.updateTsConfigsToJs)(tree, { projectRoot: options.appProjectRoot });
104
+ }
105
+ if (!options.skipFormat) {
106
+ await (0, devkit_1.formatFiles)(tree);
107
+ }
108
+ tasks.push(() => {
109
+ (0, log_show_project_command_1.logShowProjectCommand)(options.name);
84
110
  });
111
+ return (0, devkit_1.runTasksInSerial)(...tasks);
85
112
  }
86
113
  exports.default = applicationGenerator;
87
114
  //# sourceMappingURL=generator.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/generators/application/generator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/generators/application/generator.ts"],"names":[],"mappings":"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"}
@@ -1,41 +1,42 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.addProjectDependencies = addProjectDependencies;
4
- const tslib_1 = require("tslib");
5
4
  const devkit_1 = require("@nx/devkit");
6
5
  const versions_1 = require("@nx/js/src/utils/versions");
7
- function getLatestPackageVersion(pkg) {
8
- return tslib_1.__awaiter(this, void 0, void 0, function* () {
9
- var _a;
10
- try {
11
- const response = yield fetch(`https://registry.npmjs.org/${pkg}`);
12
- const json = yield response.json();
13
- return (_a = json === null || json === void 0 ? void 0 : json['dist-tags']) === null || _a === void 0 ? void 0 : _a['latest'];
14
- }
15
- catch (error) {
16
- devkit_1.logger.error(`Failed to fetch latest version of ${pkg}: ${error}`);
17
- throw new Error(`Failed to fetch latest version of ${pkg}`);
18
- }
19
- });
6
+ async function getLatestPackageVersion(pkg) {
7
+ var _a;
8
+ try {
9
+ const response = await fetch(`https://registry.npmjs.org/${pkg}`);
10
+ const json = await response.json();
11
+ return (_a = json === null || json === void 0 ? void 0 : json['dist-tags']) === null || _a === void 0 ? void 0 : _a['latest'];
12
+ }
13
+ catch (error) {
14
+ devkit_1.logger.error(`Failed to fetch latest version of ${pkg}: ${error}`);
15
+ throw new Error(`Failed to fetch latest version of ${pkg}`);
16
+ }
20
17
  }
21
- function addProjectDependencies(tree, options) {
22
- return tslib_1.__awaiter(this, void 0, void 0, function* () {
23
- const bundlers = {
24
- webpack: {
25
- '@nx/webpack': devkit_1.NX_VERSION,
26
- },
27
- esbuild: {
28
- '@nx/esbuild': devkit_1.NX_VERSION,
29
- esbuild: versions_1.esbuildVersion,
30
- },
31
- };
32
- const latestForgeApiVersion = yield getLatestPackageVersion('@forge/api');
33
- const latestForgeResolverVersion = yield getLatestPackageVersion('@forge/resolver');
34
- const forgeDependencies = {
35
- '@forge/api': latestForgeApiVersion,
36
- '@forge/resolver': latestForgeResolverVersion,
37
- };
38
- return (0, devkit_1.addDependenciesToPackageJson)(tree, Object.assign(Object.assign({}, forgeDependencies), { tslib: versions_1.tsLibVersion }), Object.assign(Object.assign({}, bundlers[options.bundler]), { '@types/node': versions_1.typesNodeVersion }));
18
+ async function addProjectDependencies(tree, options) {
19
+ const bundlers = {
20
+ webpack: {
21
+ '@nx/webpack': devkit_1.NX_VERSION,
22
+ },
23
+ esbuild: {
24
+ '@nx/esbuild': devkit_1.NX_VERSION,
25
+ esbuild: versions_1.esbuildVersion,
26
+ },
27
+ };
28
+ const latestForgeApiVersion = await getLatestPackageVersion('@forge/api');
29
+ const latestForgeResolverVersion = await getLatestPackageVersion('@forge/resolver');
30
+ const forgeDependencies = {
31
+ '@forge/api': latestForgeApiVersion,
32
+ '@forge/resolver': latestForgeResolverVersion,
33
+ };
34
+ return (0, devkit_1.addDependenciesToPackageJson)(tree, {
35
+ ...forgeDependencies,
36
+ tslib: versions_1.tsLibVersion,
37
+ }, {
38
+ ...bundlers[options.bundler],
39
+ '@types/node': versions_1.typesNodeVersion,
39
40
  });
40
41
  }
41
42
  //# sourceMappingURL=add-project-dependencies.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"add-project-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/generators/application/lib/add-project-dependencies.ts"],"names":[],"mappings":";;AA2BA,wDAmCC;;AA9DD,uCAMoB;AACpB,wDAImC;AAGnC,SAAe,uBAAuB,CACpC,GAAW;;;QAEX,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,8BAA8B,GAAG,EAAE,CAAC,CAAC;YAClE,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YACnC,OAAO,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAG,WAAW,CAAC,0CAAG,QAAQ,CAAC,CAAC;QACzC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,eAAM,CAAC,KAAK,CAAC,qCAAqC,GAAG,KAAK,KAAK,EAAE,CAAC,CAAC;YACnE,MAAM,IAAI,KAAK,CAAC,qCAAqC,GAAG,EAAE,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC;CAAA;AAED,SAAsB,sBAAsB,CAC1C,IAAU,EACV,OAA0B;;QAE1B,MAAM,QAAQ,GAAG;YACf,OAAO,EAAE;gBACP,aAAa,EAAE,mBAAU;aAC1B;YACD,OAAO,EAAE;gBACP,aAAa,EAAE,mBAAU;gBACzB,OAAO,EAAE,yBAAc;aACxB;SACO,CAAC;QAEX,MAAM,qBAAqB,GAAG,MAAM,uBAAuB,CAAC,YAAY,CAAC,CAAC;QAC1E,MAAM,0BAA0B,GAAG,MAAM,uBAAuB,CAC9D,iBAAiB,CAClB,CAAC;QAEF,MAAM,iBAAiB,GAAG;YACxB,YAAY,EAAE,qBAAqB;YACnC,iBAAiB,EAAE,0BAA0B;SAC9C,CAAC;QAEF,OAAO,IAAA,qCAA4B,EACjC,IAAI,kCAEC,iBAAiB,KACpB,KAAK,EAAE,uBAAY,qCAGhB,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,KAC5B,aAAa,EAAE,2BAAgB,IAElC,CAAC;IACJ,CAAC;CAAA"}
1
+ {"version":3,"file":"add-project-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/generators/application/lib/add-project-dependencies.ts"],"names":[],"mappings":";;AA2BA,wDAmCC;AA9DD,uCAMoB;AACpB,wDAImC;AAGnC,KAAK,UAAU,uBAAuB,CACpC,GAAW;;IAEX,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,8BAA8B,GAAG,EAAE,CAAC,CAAC;QAClE,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QACnC,OAAO,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAG,WAAW,CAAC,0CAAG,QAAQ,CAAC,CAAC;IACzC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,eAAM,CAAC,KAAK,CAAC,qCAAqC,GAAG,KAAK,KAAK,EAAE,CAAC,CAAC;QACnE,MAAM,IAAI,KAAK,CAAC,qCAAqC,GAAG,EAAE,CAAC,CAAC;IAC9D,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,sBAAsB,CAC1C,IAAU,EACV,OAA0B;IAE1B,MAAM,QAAQ,GAAG;QACf,OAAO,EAAE;YACP,aAAa,EAAE,mBAAU;SAC1B;QACD,OAAO,EAAE;YACP,aAAa,EAAE,mBAAU;YACzB,OAAO,EAAE,yBAAc;SACxB;KACO,CAAC;IAEX,MAAM,qBAAqB,GAAG,MAAM,uBAAuB,CAAC,YAAY,CAAC,CAAC;IAC1E,MAAM,0BAA0B,GAAG,MAAM,uBAAuB,CAC9D,iBAAiB,CAClB,CAAC;IAEF,MAAM,iBAAiB,GAAG;QACxB,YAAY,EAAE,qBAAqB;QACnC,iBAAiB,EAAE,0BAA0B;KAC9C,CAAC;IAEF,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ;QACE,GAAG,iBAAiB;QACpB,KAAK,EAAE,uBAAY;KACpB,EACD;QACE,GAAG,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC;QAC5B,aAAa,EAAE,2BAAgB;KAChC,CACF,CAAC;AACJ,CAAC"}
@@ -1,30 +1,35 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.normalizeOptions = normalizeOptions;
4
- const tslib_1 = require("tslib");
5
4
  const eslint_1 = require("@nx/eslint");
6
5
  const devkit_1 = require("@nx/devkit");
7
6
  const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
8
- function normalizeOptions(tree, options) {
9
- return tslib_1.__awaiter(this, void 0, void 0, function* () {
10
- var _a, _b, _c, _d;
11
- yield (0, project_name_and_root_utils_1.ensureProjectName)(tree, options, 'application');
12
- const { projectName: appProjectName, projectRoot: appProjectRoot } = yield (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
13
- name: options.name,
14
- projectType: 'application',
15
- directory: options.directory,
16
- rootProject: options.rootProject,
17
- });
18
- options.rootProject = appProjectRoot === '.';
19
- options.bundler = (_a = options.bundler) !== null && _a !== void 0 ? _a : 'webpack';
20
- const parsedTags = options.tags
21
- ? options.tags.split(',').map((s) => s.trim())
22
- : [];
23
- const nxJson = (0, devkit_1.readNxJson)(tree);
24
- const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
25
- nxJson.useInferencePlugins !== false;
26
- return Object.assign(Object.assign({ addPlugin }, options), { name: appProjectName, appProjectRoot,
27
- parsedTags, linter: (_b = options.linter) !== null && _b !== void 0 ? _b : eslint_1.Linter.EsLint, unitTestRunner: (_c = options.unitTestRunner) !== null && _c !== void 0 ? _c : 'jest', rootProject: (_d = options.rootProject) !== null && _d !== void 0 ? _d : false });
7
+ async function normalizeOptions(tree, options) {
8
+ var _a, _b, _c, _d;
9
+ await (0, project_name_and_root_utils_1.ensureProjectName)(tree, options, 'application');
10
+ const { projectName: appProjectName, projectRoot: appProjectRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
11
+ name: options.name,
12
+ projectType: 'application',
13
+ directory: options.directory,
14
+ rootProject: options.rootProject,
28
15
  });
16
+ options.rootProject = appProjectRoot === '.';
17
+ options.bundler = (_a = options.bundler) !== null && _a !== void 0 ? _a : 'webpack';
18
+ const parsedTags = options.tags
19
+ ? options.tags.split(',').map((s) => s.trim())
20
+ : [];
21
+ const nxJson = (0, devkit_1.readNxJson)(tree);
22
+ const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
23
+ nxJson.useInferencePlugins !== false;
24
+ return {
25
+ addPlugin,
26
+ ...options,
27
+ name: appProjectName,
28
+ appProjectRoot,
29
+ parsedTags,
30
+ linter: (_b = options.linter) !== null && _b !== void 0 ? _b : eslint_1.Linter.EsLint,
31
+ unitTestRunner: (_c = options.unitTestRunner) !== null && _c !== void 0 ? _c : 'jest',
32
+ rootProject: (_d = options.rootProject) !== null && _d !== void 0 ? _d : false,
33
+ };
29
34
  }
30
35
  //# sourceMappingURL=normalize-options.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;AAQA,4CAmCC;;AA3CD,uCAAoC;AACpC,uCAA8C;AAE9C,uGAG+D;AAE/D,SAAsB,gBAAgB,CACpC,IAAU,EACV,OAAoC;;;QAEpC,MAAM,IAAA,+CAAiB,EAAC,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;QACtD,MAAM,EAAE,WAAW,EAAE,cAAc,EAAE,WAAW,EAAE,cAAc,EAAE,GAChE,MAAM,IAAA,gEAAkC,EAAC,IAAI,EAAE;YAC7C,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,WAAW,EAAE,aAAa;YAC1B,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,WAAW,EAAE,OAAO,CAAC,WAAW;SACjC,CAAC,CAAC;QACL,OAAO,CAAC,WAAW,GAAG,cAAc,KAAK,GAAG,CAAC;QAE7C,OAAO,CAAC,OAAO,GAAG,MAAA,OAAO,CAAC,OAAO,mCAAI,SAAS,CAAC;QAE/C,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI;YAC7B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YAC9C,CAAC,CAAC,EAAE,CAAC;QAEP,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;QAChC,MAAM,SAAS,GACb,OAAO,CAAC,GAAG,CAAC,cAAc,KAAK,OAAO;YACtC,MAAM,CAAC,mBAAmB,KAAK,KAAK,CAAC;QAEvC,qCACE,SAAS,IACN,OAAO,KACV,IAAI,EAAE,cAAc,EACpB,cAAc;YACd,UAAU,EACV,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,eAAM,CAAC,MAAM,EACvC,cAAc,EAAE,MAAA,OAAO,CAAC,cAAc,mCAAI,MAAM,EAChD,WAAW,EAAE,MAAA,OAAO,CAAC,WAAW,mCAAI,KAAK,IACzC;IACJ,CAAC;CAAA"}
1
+ {"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;AAQA,4CAmCC;AA3CD,uCAAoC;AACpC,uCAA8C;AAE9C,uGAG+D;AAExD,KAAK,UAAU,gBAAgB,CACpC,IAAU,EACV,OAAoC;;IAEpC,MAAM,IAAA,+CAAiB,EAAC,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;IACtD,MAAM,EAAE,WAAW,EAAE,cAAc,EAAE,WAAW,EAAE,cAAc,EAAE,GAChE,MAAM,IAAA,gEAAkC,EAAC,IAAI,EAAE;QAC7C,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,WAAW,EAAE,aAAa;QAC1B,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,WAAW,EAAE,OAAO,CAAC,WAAW;KACjC,CAAC,CAAC;IACL,OAAO,CAAC,WAAW,GAAG,cAAc,KAAK,GAAG,CAAC;IAE7C,OAAO,CAAC,OAAO,GAAG,MAAA,OAAO,CAAC,OAAO,mCAAI,SAAS,CAAC;IAE/C,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI;QAC7B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9C,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IAChC,MAAM,SAAS,GACb,OAAO,CAAC,GAAG,CAAC,cAAc,KAAK,OAAO;QACtC,MAAM,CAAC,mBAAmB,KAAK,KAAK,CAAC;IAEvC,OAAO;QACL,SAAS;QACT,GAAG,OAAO;QACV,IAAI,EAAE,cAAc;QACpB,cAAc;QACd,UAAU;QACV,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,eAAM,CAAC,MAAM;QACvC,cAAc,EAAE,MAAA,OAAO,CAAC,cAAc,mCAAI,MAAM;QAChD,WAAW,EAAE,MAAA,OAAO,CAAC,WAAW,mCAAI,KAAK;KAC1C,CAAC;AACJ,CAAC"}
@@ -4,12 +4,10 @@ exports.default = default_1;
4
4
  const tslib_1 = require("tslib");
5
5
  const devkit_1 = require("@nx/devkit");
6
6
  const package_json_1 = tslib_1.__importDefault(require("../../../package.json"));
7
- function addDependencies(tree, keepExistingVersions) {
8
- return tslib_1.__awaiter(this, void 0, void 0, function* () {
9
- return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
10
- '@toolsplus/nx-forge': package_json_1.default.version,
11
- }, undefined, keepExistingVersions);
12
- });
7
+ async function addDependencies(tree, keepExistingVersions) {
8
+ return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
9
+ '@toolsplus/nx-forge': package_json_1.default.version,
10
+ }, undefined, keepExistingVersions);
13
11
  }
14
12
  function updateNxJson(host) {
15
13
  const nxJson = (0, devkit_1.readJson)(host, 'nx.json');
@@ -19,19 +17,17 @@ function updateNxJson(host) {
19
17
  }
20
18
  (0, devkit_1.writeJson)(host, 'nx.json', nxJson);
21
19
  }
22
- function default_1(tree, options) {
23
- return tslib_1.__awaiter(this, void 0, void 0, function* () {
24
- updateNxJson(tree);
25
- const tasks = [];
26
- if (!options.skipPackageJson) {
27
- tasks.push((0, devkit_1.removeDependenciesFromPackageJson)(tree, ['@toolsplus/nx-forge'], []));
28
- const addDependenciesTask = yield addDependencies(tree, options.keepExistingVersions);
29
- tasks.push(addDependenciesTask);
30
- }
31
- if (!options.skipFormat) {
32
- yield (0, devkit_1.formatFiles)(tree);
33
- }
34
- return (0, devkit_1.runTasksInSerial)(...tasks);
35
- });
20
+ async function default_1(tree, options) {
21
+ updateNxJson(tree);
22
+ const tasks = [];
23
+ if (!options.skipPackageJson) {
24
+ tasks.push((0, devkit_1.removeDependenciesFromPackageJson)(tree, ['@toolsplus/nx-forge'], []));
25
+ const addDependenciesTask = await addDependencies(tree, options.keepExistingVersions);
26
+ tasks.push(addDependenciesTask);
27
+ }
28
+ if (!options.skipFormat) {
29
+ await (0, devkit_1.formatFiles)(tree);
30
+ }
31
+ return (0, devkit_1.runTasksInSerial)(...tasks);
36
32
  }
37
33
  //# sourceMappingURL=generator.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/generators/init/generator.ts"],"names":[],"mappings":";;AAsCA,4BAwBC;;AA9DD,uCAUoB;AAEpB,iFAAsD;AAEtD,SAAe,eAAe,CAC5B,IAAU,EACV,oBAA6B;;QAE7B,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ,EAAE,EACF;YACE,qBAAqB,EAAE,sBAAiB,CAAC,OAAO;SACjD,EACD,SAAS,EACT,oBAAoB,CACrB,CAAC;IACJ,CAAC;CAAA;AAED,SAAS,YAAY,CAAC,IAAU;IAC9B,MAAM,MAAM,GAAwB,IAAA,iBAAQ,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAC9D,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC;IACtC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,qBAAqB,CAAC,EAAE,CAAC;QAC7D,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;IAC7C,CAAC;IACD,IAAA,kBAAS,EAAC,IAAI,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;AACrC,CAAC;AAED,mBACE,IAAU,EACV,OAA4B;;QAE5B,YAAY,CAAC,IAAI,CAAC,CAAC;QAEnB,MAAM,KAAK,GAAwB,EAAE,CAAC;QAEtC,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC;YAC7B,KAAK,CAAC,IAAI,CACR,IAAA,0CAAiC,EAAC,IAAI,EAAE,CAAC,qBAAqB,CAAC,EAAE,EAAE,CAAC,CACrE,CAAC;YACF,MAAM,mBAAmB,GAAG,MAAM,eAAe,CAC/C,IAAI,EACJ,OAAO,CAAC,oBAAoB,CAC7B,CAAC;YACF,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QAClC,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;YACxB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAC1B,CAAC;QAED,OAAO,IAAA,yBAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA"}
1
+ {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/generators/init/generator.ts"],"names":[],"mappings":";;AAsCA,4BAwBC;;AA9DD,uCAUoB;AAEpB,iFAAsD;AAEtD,KAAK,UAAU,eAAe,CAC5B,IAAU,EACV,oBAA6B;IAE7B,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ,EAAE,EACF;QACE,qBAAqB,EAAE,sBAAiB,CAAC,OAAO;KACjD,EACD,SAAS,EACT,oBAAoB,CACrB,CAAC;AACJ,CAAC;AAED,SAAS,YAAY,CAAC,IAAU;IAC9B,MAAM,MAAM,GAAwB,IAAA,iBAAQ,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAC9D,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC;IACtC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,qBAAqB,CAAC,EAAE,CAAC;QAC7D,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;IAC7C,CAAC;IACD,IAAA,kBAAS,EAAC,IAAI,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;AACrC,CAAC;AAEc,KAAK,oBAClB,IAAU,EACV,OAA4B;IAE5B,YAAY,CAAC,IAAI,CAAC,CAAC;IAEnB,MAAM,KAAK,GAAwB,EAAE,CAAC;IAEtC,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC;QAC7B,KAAK,CAAC,IAAI,CACR,IAAA,0CAAiC,EAAC,IAAI,EAAE,CAAC,qBAAqB,CAAC,EAAE,EAAE,CAAC,CACrE,CAAC;QACF,MAAM,mBAAmB,GAAG,MAAM,eAAe,CAC/C,IAAI,EACJ,OAAO,CAAC,oBAAoB,CAC7B,CAAC;QACF,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IAClC,CAAC;IAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;QACxB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;IAED,OAAO,IAAA,yBAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;AACpC,CAAC"}
@@ -1,11 +1,12 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.createDependencies = void 0;
4
- const tslib_1 = require("tslib");
5
4
  const devkit_1 = require("@nx/devkit");
6
5
  const manifest_yml_1 = require("../utils/forge/manifest-yml");
7
- const getUIResourceDependencies = (_a, context_1) => tslib_1.__awaiter(void 0, [_a, context_1], void 0, function* ([projectName, manifestFile], context) {
8
- const manifestSchema = yield (0, manifest_yml_1.readManifestYml)(manifestFile.file);
6
+ const getUIResourceDependencies = async ([projectName, manifestFile], context) => {
7
+ const manifestSchema = await (0, manifest_yml_1.readManifestYml)(manifestFile.file, {
8
+ interpolate: false,
9
+ });
9
10
  const uiResourceProjectNames = (0, manifest_yml_1.extractUIResourceProjectNames)(manifestSchema);
10
11
  const getUIResourceStaticDependency = (uiResourceProjectName) => {
11
12
  const uiResourceProjectConfiguration = context.projects[uiResourceProjectName];
@@ -30,31 +31,18 @@ const getUIResourceDependencies = (_a, context_1) => tslib_1.__awaiter(void 0, [
30
31
  ? acc // Dependency already exists, skip adding it again.
31
32
  : [...acc, getUIResourceStaticDependency(uiResourceProjectName)];
32
33
  }, []);
33
- });
34
- const createDependencies = (options, context) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
35
- var _a, e_1, _b, _c;
34
+ };
35
+ const createDependencies = async (options, context) => {
36
36
  let dependencies = [];
37
37
  for (const projectName in context.filesToProcess.projectFileMap) {
38
38
  const changed = context.filesToProcess.projectFileMap[projectName];
39
- try {
40
- for (var _d = true, _e = (e_1 = void 0, tslib_1.__asyncValues(changed.filter((f) => f.file.endsWith('manifest.yml')))), _f; _f = yield _e.next(), _a = _f.done, !_a; _d = true) {
41
- _c = _f.value;
42
- _d = false;
43
- const manifestFile = _c;
44
- devkit_1.logger.info(`[nx-forge] Processing ${projectName}:${manifestFile.file}`);
45
- const uiResourceDependencies = yield getUIResourceDependencies([projectName, manifestFile], context);
46
- dependencies = dependencies.concat(uiResourceDependencies);
47
- }
48
- }
49
- catch (e_1_1) { e_1 = { error: e_1_1 }; }
50
- finally {
51
- try {
52
- if (!_d && !_a && (_b = _e.return)) yield _b.call(_e);
53
- }
54
- finally { if (e_1) throw e_1.error; }
39
+ for await (const manifestFile of changed.filter((f) => f.file.endsWith('manifest.yml'))) {
40
+ devkit_1.logger.info(`[nx-forge] Processing ${projectName}:${manifestFile.file}`);
41
+ const uiResourceDependencies = await getUIResourceDependencies([projectName, manifestFile], context);
42
+ dependencies = dependencies.concat(uiResourceDependencies);
55
43
  }
56
44
  }
57
45
  return dependencies;
58
- });
46
+ };
59
47
  exports.createDependencies = createDependencies;
60
48
  //# sourceMappingURL=create-dependencies.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"create-dependencies.js","sourceRoot":"","sources":["../../../../../packages/nx-forge/src/graph/create-dependencies.ts"],"names":[],"mappings":";;;;AAAA,uCAOoB;AACpB,8DAGqC;AAErC,MAAM,yBAAyB,GAAG,gBAGM,EAAE,+DAFxC,CAAC,WAAW,EAAE,YAAY,CAAqB,EAC/C,OAAkC;IAElC,MAAM,cAAc,GAAG,MAAM,IAAA,8BAAe,EAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IAChE,MAAM,sBAAsB,GAAG,IAAA,4CAA6B,EAAC,cAAc,CAAC,CAAC;IAE7E,MAAM,6BAA6B,GAAG,CACpC,qBAA6B,EACF,EAAE;QAC7B,MAAM,8BAA8B,GAClC,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAC,CAAC;QAE1C,IAAI,CAAC,8BAA8B,EAAE,CAAC;YACpC,MAAM,IAAI,KAAK,CACb,6FAA6F,qBAAqB,kDAAkD,WAAW,oHAAoH,CACpS,CAAC;QACJ,CAAC;QAED,MAAM,oBAAoB,GAAG,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAE3D,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC1B,MAAM,IAAI,KAAK,CACb,6DAA6D,WAAW,EAAE,CAC3E,CAAC;QACJ,CAAC;QAED,OAAO;YACL,UAAU,EAAE,YAAY,CAAC,IAAI;YAC7B,MAAM,EAAE,WAAW;YACnB,MAAM,EAAE,qBAAqB;YAC7B,IAAI,EAAE,uBAAc,CAAC,MAAM;SAC5B,CAAC;IACJ,CAAC,CAAC;IAEF,OAAO,sBAAsB,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,qBAAqB,EAAE,EAAE;QAClE,OAAO,CAAC,YAAY,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,IAAI,CACnC,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,CACzB,IAAI,KAAK,QAAQ;YACjB,MAAM,KAAK,qBAAqB;YAChC,MAAM,KAAK,WAAW,CACzB;YACC,CAAC,CAAC,GAAG,CAAC,mDAAmD;YACzD,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,6BAA6B,CAAC,qBAAqB,CAAC,CAAC,CAAC;IACrE,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC,CAAA,CAAC;AAEK,MAAM,kBAAkB,GAAuB,CACpD,OAAO,EACP,OAAO,EACP,EAAE;;IACF,IAAI,YAAY,GAAgC,EAAE,CAAC;IAEnD,KAAK,MAAM,WAAW,IAAI,OAAO,CAAC,cAAc,CAAC,cAAc,EAAE,CAAC;QAChE,MAAM,OAAO,GAAG,OAAO,CAAC,cAAc,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;;YACnE,KAAiC,eAAA,oBAAA,sBAAA,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CACpD,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAChC,CAAA,CAAA,IAAA,sDAAE,CAAC;gBAF6B,cAEhC;gBAFgC,WAEhC;gBAFU,MAAM,YAAY,KAAA,CAAA;gBAG3B,eAAM,CAAC,IAAI,CAAC,yBAAyB,WAAW,IAAI,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;gBACzE,MAAM,sBAAsB,GAAG,MAAM,yBAAyB,CAC5D,CAAC,WAAW,EAAE,YAAY,CAAC,EAC3B,OAAO,CACR,CAAC;gBACF,YAAY,GAAG,YAAY,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC;YAC7D,CAAC;;;;;;;;;IACH,CAAC;IAED,OAAO,YAAY,CAAC;AACtB,CAAC,CAAA,CAAC;AArBW,QAAA,kBAAkB,sBAqB7B"}
1
+ {"version":3,"file":"create-dependencies.js","sourceRoot":"","sources":["../../../../../packages/nx-forge/src/graph/create-dependencies.ts"],"names":[],"mappings":";;;AAAA,uCAOoB;AACpB,8DAGqC;AAErC,MAAM,yBAAyB,GAAG,KAAK,EACrC,CAAC,WAAW,EAAE,YAAY,CAAqB,EAC/C,OAAkC,EACI,EAAE;IACxC,MAAM,cAAc,GAAG,MAAM,IAAA,8BAAe,EAAC,YAAY,CAAC,IAAI,EAAE;QAC9D,WAAW,EAAE,KAAK;KACnB,CAAC,CAAC;IACH,MAAM,sBAAsB,GAAG,IAAA,4CAA6B,EAAC,cAAc,CAAC,CAAC;IAE7E,MAAM,6BAA6B,GAAG,CACpC,qBAA6B,EACF,EAAE;QAC7B,MAAM,8BAA8B,GAClC,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAC,CAAC;QAE1C,IAAI,CAAC,8BAA8B,EAAE,CAAC;YACpC,MAAM,IAAI,KAAK,CACb,6FAA6F,qBAAqB,kDAAkD,WAAW,oHAAoH,CACpS,CAAC;QACJ,CAAC;QAED,MAAM,oBAAoB,GAAG,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAE3D,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC1B,MAAM,IAAI,KAAK,CACb,6DAA6D,WAAW,EAAE,CAC3E,CAAC;QACJ,CAAC;QAED,OAAO;YACL,UAAU,EAAE,YAAY,CAAC,IAAI;YAC7B,MAAM,EAAE,WAAW;YACnB,MAAM,EAAE,qBAAqB;YAC7B,IAAI,EAAE,uBAAc,CAAC,MAAM;SAC5B,CAAC;IACJ,CAAC,CAAC;IAEF,OAAO,sBAAsB,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,qBAAqB,EAAE,EAAE;QAClE,OAAO,CAAC,YAAY,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,IAAI,CACnC,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,CACzB,IAAI,KAAK,QAAQ;YACjB,MAAM,KAAK,qBAAqB;YAChC,MAAM,KAAK,WAAW,CACzB;YACC,CAAC,CAAC,GAAG,CAAC,mDAAmD;YACzD,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,6BAA6B,CAAC,qBAAqB,CAAC,CAAC,CAAC;IACrE,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC,CAAC;AAEK,MAAM,kBAAkB,GAAuB,KAAK,EACzD,OAAO,EACP,OAAO,EACP,EAAE;IACF,IAAI,YAAY,GAAgC,EAAE,CAAC;IAEnD,KAAK,MAAM,WAAW,IAAI,OAAO,CAAC,cAAc,CAAC,cAAc,EAAE,CAAC;QAChE,MAAM,OAAO,GAAG,OAAO,CAAC,cAAc,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;QACnE,IAAI,KAAK,EAAE,MAAM,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CACpD,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAChC,EAAE,CAAC;YACF,eAAM,CAAC,IAAI,CAAC,yBAAyB,WAAW,IAAI,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;YACzE,MAAM,sBAAsB,GAAG,MAAM,yBAAyB,CAC5D,CAAC,WAAW,EAAE,YAAY,CAAC,EAC3B,OAAO,CACR,CAAC;YACF,YAAY,GAAG,YAAY,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC;QAC7D,CAAC;IACH,CAAC;IAED,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC;AArBW,QAAA,kBAAkB,sBAqB7B"}
@@ -1,29 +1,26 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.default = update;
4
- const tslib_1 = require("tslib");
5
4
  /* eslint-disable @typescript-eslint/no-unused-vars */
6
5
  const devkit_1 = require("@nx/devkit");
7
6
  const manifest_yml_1 = require("../../utils/forge/manifest-yml");
8
7
  const manifest_1 = require("./utils/manifest");
9
- function update(host) {
10
- return tslib_1.__awaiter(this, void 0, void 0, function* () {
11
- var _a;
12
- const projects = (0, devkit_1.getProjects)(host);
13
- const isForgeProject = (config) => {
14
- return (config.projectType === 'application' &&
15
- host.exists((0, devkit_1.joinPathFragments)(config.root, 'manifest.yml')));
16
- };
17
- for (const [name, config] of projects.entries()) {
18
- if (config && isForgeProject(config)) {
19
- if (((_a = config.implicitDependencies) === null || _a === void 0 ? void 0 : _a.length) > 0) {
20
- const manifest = yield (0, manifest_1.readManifestYml)(host, (0, devkit_1.joinPathFragments)(config.root, 'manifest.yml'));
21
- const customUIProjectNames = (0, manifest_yml_1.extractUIResourceProjectNames)(manifest);
22
- config.implicitDependencies = config.implicitDependencies.filter((d) => !customUIProjectNames.includes(d));
23
- (0, devkit_1.updateProjectConfiguration)(host, name, config);
24
- }
8
+ async function update(host) {
9
+ var _a;
10
+ const projects = (0, devkit_1.getProjects)(host);
11
+ const isForgeProject = (config) => {
12
+ return (config.projectType === 'application' &&
13
+ host.exists((0, devkit_1.joinPathFragments)(config.root, 'manifest.yml')));
14
+ };
15
+ for (const [name, config] of projects.entries()) {
16
+ if (config && isForgeProject(config)) {
17
+ if (((_a = config.implicitDependencies) === null || _a === void 0 ? void 0 : _a.length) > 0) {
18
+ const manifest = await (0, manifest_1.readManifestYml)(host, (0, devkit_1.joinPathFragments)(config.root, 'manifest.yml'));
19
+ const customUIProjectNames = (0, manifest_yml_1.extractUIResourceProjectNames)(manifest);
20
+ config.implicitDependencies = config.implicitDependencies.filter((d) => !customUIProjectNames.includes(d));
21
+ (0, devkit_1.updateProjectConfiguration)(host, name, config);
25
22
  }
26
23
  }
27
- });
24
+ }
28
25
  }
29
26
  //# sourceMappingURL=remove-implicit-custom-ui-dependencies.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"remove-implicit-custom-ui-dependencies.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/migrations/update-2-3-0/remove-implicit-custom-ui-dependencies.ts"],"names":[],"mappings":";;AAWA,yBAyBC;;AApCD,sDAAsD;AACtD,uCAMoB;AACpB,iEAA+E;AAC/E,+CAAmD;AAEnD,SAA8B,MAAM,CAAC,IAAU;;;QAC7C,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAEnC,MAAM,cAAc,GAAG,CAAC,MAA4B,EAAW,EAAE;YAC/D,OAAO,CACL,MAAM,CAAC,WAAW,KAAK,aAAa;gBACpC,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,MAAM,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC,CAC5D,CAAC;QACJ,CAAC,CAAC;QAEF,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC;YAChD,IAAI,MAAM,IAAI,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC;gBACrC,IAAI,CAAA,MAAA,MAAM,CAAC,oBAAoB,0CAAE,MAAM,IAAG,CAAC,EAAE,CAAC;oBAC5C,MAAM,QAAQ,GAAG,MAAM,IAAA,0BAAe,EACpC,IAAI,EACJ,IAAA,0BAAiB,EAAC,MAAM,CAAC,IAAI,EAAE,cAAc,CAAC,CAC/C,CAAC;oBACF,MAAM,oBAAoB,GAAG,IAAA,4CAA6B,EAAC,QAAQ,CAAC,CAAC;oBACrE,MAAM,CAAC,oBAAoB,GAAG,MAAM,CAAC,oBAAoB,CAAC,MAAM,CAC9D,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC,CAAC,CACzC,CAAC;oBACF,IAAA,mCAA0B,EAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;gBACjD,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;CAAA"}
1
+ {"version":3,"file":"remove-implicit-custom-ui-dependencies.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/migrations/update-2-3-0/remove-implicit-custom-ui-dependencies.ts"],"names":[],"mappings":";;AAWA,yBAyBC;AApCD,sDAAsD;AACtD,uCAMoB;AACpB,iEAA+E;AAC/E,+CAAmD;AAEpC,KAAK,UAAU,MAAM,CAAC,IAAU;;IAC7C,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAEnC,MAAM,cAAc,GAAG,CAAC,MAA4B,EAAW,EAAE;QAC/D,OAAO,CACL,MAAM,CAAC,WAAW,KAAK,aAAa;YACpC,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,MAAM,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC,CAC5D,CAAC;IACJ,CAAC,CAAC;IAEF,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC;QAChD,IAAI,MAAM,IAAI,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC;YACrC,IAAI,CAAA,MAAA,MAAM,CAAC,oBAAoB,0CAAE,MAAM,IAAG,CAAC,EAAE,CAAC;gBAC5C,MAAM,QAAQ,GAAG,MAAM,IAAA,0BAAe,EACpC,IAAI,EACJ,IAAA,0BAAiB,EAAC,MAAM,CAAC,IAAI,EAAE,cAAc,CAAC,CAC/C,CAAC;gBACF,MAAM,oBAAoB,GAAG,IAAA,4CAA6B,EAAC,QAAQ,CAAC,CAAC;gBACrE,MAAM,CAAC,oBAAoB,GAAG,MAAM,CAAC,oBAAoB,CAAC,MAAM,CAC9D,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC,CAAC,CACzC,CAAC;gBACF,IAAA,mCAA0B,EAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;YACjD,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC"}
@@ -6,15 +6,15 @@ const yml_1 = require("./yml");
6
6
  const manifest_1 = require("@forge/manifest");
7
7
  const FULL_SCHEMA = tslib_1.__importStar(require("@forge/manifest/out/schema/manifest-schema.json"));
8
8
  const manifestSchemaValidator = new manifest_1.SchemaValidator(FULL_SCHEMA);
9
- const readManifestYml = (tree, path) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
10
- const result = yield manifestSchemaValidator.validate({
9
+ const readManifestYml = async (tree, path) => {
10
+ const result = await manifestSchemaValidator.validate({
11
11
  yamlContent: (0, yml_1.readYaml)(tree, path),
12
12
  });
13
13
  if (result.success) {
14
14
  return result.manifestObject.typedContent;
15
15
  }
16
16
  throw new Error(`Cannot validate manifest ${path}: ${result.errors}`);
17
- });
17
+ };
18
18
  exports.readManifestYml = readManifestYml;
19
19
  const writeManifestYml = (tree, path, value) => {
20
20
  (0, yml_1.writeYaml)(tree, path, value);
@@ -1 +1 @@
1
- {"version":3,"file":"manifest.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/migrations/update-2-3-0/utils/manifest.ts"],"names":[],"mappings":";;;;AACA,+BAA4C;AAC5C,8CAAkE;AAClE,qGAA+E;AAE/E,MAAM,uBAAuB,GAAG,IAAI,0BAAe,CACjD,WAAW,CACZ,CAAC;AAEK,MAAM,eAAe,GAAG,CAAO,IAAU,EAAE,IAAY,EAAE,EAAE;IAChE,MAAM,MAAM,GAAG,MAAM,uBAAuB,CAAC,QAAQ,CAAC;QACpD,WAAW,EAAE,IAAA,cAAQ,EAAC,IAAI,EAAE,IAAI,CAAC;KAClC,CAAC,CAAC;IAEH,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACnB,OAAO,MAAM,CAAC,cAAc,CAAC,YAAY,CAAC;IAC5C,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,4BAA4B,IAAI,KAAK,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;AACxE,CAAC,CAAA,CAAC;AAVW,QAAA,eAAe,mBAU1B;AAEK,MAAM,gBAAgB,GAAG,CAC9B,IAAU,EACV,IAAY,EACZ,KAAqB,EACrB,EAAE;IACF,IAAA,eAAS,EAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;AAC/B,CAAC,CAAC;AANW,QAAA,gBAAgB,oBAM3B"}
1
+ {"version":3,"file":"manifest.js","sourceRoot":"","sources":["../../../../../../../packages/nx-forge/src/migrations/update-2-3-0/utils/manifest.ts"],"names":[],"mappings":";;;;AACA,+BAA4C;AAC5C,8CAAkE;AAClE,qGAA+E;AAE/E,MAAM,uBAAuB,GAAG,IAAI,0BAAe,CACjD,WAAW,CACZ,CAAC;AAEK,MAAM,eAAe,GAAG,KAAK,EAAE,IAAU,EAAE,IAAY,EAAE,EAAE;IAChE,MAAM,MAAM,GAAG,MAAM,uBAAuB,CAAC,QAAQ,CAAC;QACpD,WAAW,EAAE,IAAA,cAAQ,EAAC,IAAI,EAAE,IAAI,CAAC;KAClC,CAAC,CAAC;IAEH,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACnB,OAAO,MAAM,CAAC,cAAc,CAAC,YAAY,CAAC;IAC5C,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,4BAA4B,IAAI,KAAK,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;AACxE,CAAC,CAAC;AAVW,QAAA,eAAe,mBAU1B;AAEK,MAAM,gBAAgB,GAAG,CAC9B,IAAU,EACV,IAAY,EACZ,KAAqB,EACrB,EAAE;IACF,IAAA,eAAS,EAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;AAC/B,CAAC,CAAC;AANW,QAAA,gBAAgB,oBAM3B"}
@@ -1,19 +1,17 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.default = default_1;
4
- const tslib_1 = require("tslib");
5
4
  const devkit_1 = require("@nx/devkit");
6
5
  const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
7
- function default_1(tree) {
8
- return tslib_1.__awaiter(this, void 0, void 0, function* () {
9
- const update = (options, projectName, targetName, configurationName) => {
10
- // There should not be any configurations, if there are skip the update - only handle the default config
11
- if (configurationName)
12
- return;
13
- const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, projectName);
14
- if (!options.webpackConfig) {
15
- options.webpackConfig = `${projectConfiguration.root}/webpack.config.js`;
16
- tree.write(options.webpackConfig, `
6
+ async function default_1(tree) {
7
+ const update = (options, projectName, targetName, configurationName) => {
8
+ // There should not be any configurations, if there are skip the update - only handle the default config
9
+ if (configurationName)
10
+ return;
11
+ const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, projectName);
12
+ if (!options.webpackConfig) {
13
+ options.webpackConfig = `${projectConfiguration.root}/webpack.config.js`;
14
+ tree.write(options.webpackConfig, `
17
15
  const { composePlugins, withNx } = require('@nx/webpack');
18
16
 
19
17
  // Nx plugins for webpack.
@@ -23,12 +21,11 @@ function default_1(tree) {
23
21
  return config;
24
22
  });
25
23
  `);
26
- projectConfiguration.targets[targetName].options = options;
27
- (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfiguration);
28
- }
29
- };
30
- (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@toolsplus/nx-forge:build', update);
31
- yield (0, devkit_1.formatFiles)(tree);
32
- });
24
+ projectConfiguration.targets[targetName].options = options;
25
+ (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfiguration);
26
+ }
27
+ };
28
+ (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@toolsplus/nx-forge:build', update);
29
+ await (0, devkit_1.formatFiles)(tree);
33
30
  }
34
31
  //# sourceMappingURL=update-3-0-0-webpack-config-setup.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"update-3-0-0-webpack-config-setup.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/migrations/update-3-0-0-webpack-config-setup/update-3-0-0-webpack-config-setup.ts"],"names":[],"mappings":";;AASA,4BAwCC;;AAjDD,uCAKoB;AACpB,6FAA0F;AAG1F,mBAA+B,IAAU;;QACvC,MAAM,MAAM,GAAG,CACb,OAA6B,EAC7B,WAAmB,EACnB,UAAkB,EAClB,iBAAyB,EACzB,EAAE;YACF,wGAAwG;YACxG,IAAI,iBAAiB;gBAAE,OAAO;YAE9B,MAAM,oBAAoB,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YAEzE,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;gBAC3B,OAAO,CAAC,aAAa,GAAG,GAAG,oBAAoB,CAAC,IAAI,oBAAoB,CAAC;gBACzE,IAAI,CAAC,KAAK,CACR,OAAO,CAAC,aAAa,EACrB;;;;;;;;;SASC,CACF,CAAC;gBAEF,oBAAoB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,GAAG,OAAO,CAAC;gBAC3D,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,oBAAoB,CAAC,CAAC;YACtE,CAAC;QACH,CAAC,CAAC;QAEF,IAAA,+CAAsB,EACpB,IAAI,EACJ,2BAA2B,EAC3B,MAAM,CACP,CAAC;QAEF,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA"}
1
+ {"version":3,"file":"update-3-0-0-webpack-config-setup.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/migrations/update-3-0-0-webpack-config-setup/update-3-0-0-webpack-config-setup.ts"],"names":[],"mappings":";;AASA,4BAwCC;AAjDD,uCAKoB;AACpB,6FAA0F;AAG3E,KAAK,oBAAW,IAAU;IACvC,MAAM,MAAM,GAAG,CACb,OAA6B,EAC7B,WAAmB,EACnB,UAAkB,EAClB,iBAAyB,EACzB,EAAE;QACF,wGAAwG;QACxG,IAAI,iBAAiB;YAAE,OAAO;QAE9B,MAAM,oBAAoB,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAEzE,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;YAC3B,OAAO,CAAC,aAAa,GAAG,GAAG,oBAAoB,CAAC,IAAI,oBAAoB,CAAC;YACzE,IAAI,CAAC,KAAK,CACR,OAAO,CAAC,aAAa,EACrB;;;;;;;;;SASC,CACF,CAAC;YAEF,oBAAoB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,GAAG,OAAO,CAAC;YAC3D,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,oBAAoB,CAAC,CAAC;QACtE,CAAC;IACH,CAAC,CAAC;IAEF,IAAA,+CAAsB,EACpB,IAAI,EACJ,2BAA2B,EAC3B,MAAM,CACP,CAAC;IAEF,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;AAC1B,CAAC"}