@rxap/plugin-library 19.3.2-dev.1 → 19.3.2-dev.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.
package/CHANGELOG.md CHANGED
@@ -3,6 +3,17 @@
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
+ ## [19.3.2-dev.2](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@19.3.2-dev.1...@rxap/plugin-library@19.3.2-dev.2) (2024-07-03)
7
+
8
+ ### Bug Fixes
9
+
10
+ - add force dependencies options ([cc188c2](https://gitlab.com/rxap/packages/commit/cc188c2b549642007d31582e021a6cfee0d05a47))
11
+ - allow non peer dependencies ([c67292c](https://gitlab.com/rxap/packages/commit/c67292c7f5d6839e3d587e9f98eddad597a307bd))
12
+ - ensure the secondary entry point is checked ([722cbc3](https://gitlab.com/rxap/packages/commit/722cbc39e2ecc1c429ecbc7c7a426c07e5a33d73))
13
+ - include executors ([a962d21](https://gitlab.com/rxap/packages/commit/a962d215411bbad404e5435ae11f64cba184b878))
14
+ - support migrations and generators ([a52ba38](https://gitlab.com/rxap/packages/commit/a52ba3808eb926b02309ff5301548a457ac3802b))
15
+ - update ng package json for angular projects ([a059bef](https://gitlab.com/rxap/packages/commit/a059bef26b1af1d5601ff41c63b16959bd940cdb))
16
+
6
17
  ## [19.3.2-dev.1](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@19.3.2-dev.0...@rxap/plugin-library@19.3.2-dev.1) (2024-07-02)
7
18
 
8
19
  **Note:** Version bump only for package @rxap/plugin-library
package/package.json CHANGED
@@ -1,17 +1,17 @@
1
1
  {
2
- "version": "19.3.2-dev.1",
2
+ "version": "19.3.2-dev.2",
3
3
  "name": "@rxap/plugin-library",
4
4
  "license": "GPL-3.0-or-later",
5
5
  "dependencies": {
6
- "@apidevtools/json-schema-ref-parser": "9.0.9",
6
+ "@apidevtools/json-schema-ref-parser": "^9.0.9",
7
7
  "@nx/devkit": "19.3.2",
8
8
  "@nx/plugin": "19.3.2",
9
- "@rxap/generator-ts-morph": "^1.0.11-dev.1",
10
9
  "@rxap/node-utilities": "^1.3.2",
11
- "@rxap/plugin-utilities": "^19.0.6-dev.1",
12
- "@rxap/ts-morph": "^1.4.3-dev.1",
13
- "@rxap/utilities": "^16.3.0-dev.0",
14
- "@rxap/workspace-utilities": "^19.4.0-dev.0",
10
+ "@rxap/plugin-utilities": "^19.0.6-dev.2",
11
+ "@rxap/ts-morph": "^1.4.3-dev.2",
12
+ "@rxap/utilities": "^16.3.0-dev.1",
13
+ "@rxap/workspace-ts-morph": "^19.1.3-dev.2",
14
+ "@rxap/workspace-utilities": "^19.4.0-dev.1",
15
15
  "colors": "1.4.0",
16
16
  "handlebars": "4.7.8",
17
17
  "nx": "19.3.2",
@@ -48,6 +48,6 @@
48
48
  },
49
49
  "schematics": "./generators.json",
50
50
  "type": "commonjs",
51
- "gitHead": "29fd8b26ef7da2c3f68df8a82994d5dbadae5b3f",
51
+ "gitHead": "c0de365720252857933d6cbc1d8185281bf1b06c",
52
52
  "main": "./src/index.js"
53
53
  }
@@ -2,6 +2,7 @@ import { Tree } from '@nx/devkit';
2
2
  import { ProjectPackageJson } from '@rxap/plugin-utilities';
3
3
  import { Dependency } from '@rxap/workspace-utilities';
4
4
  import { FixDependenciesGeneratorSchema } from './schema';
5
+ import 'colors';
5
6
  export declare function resolveLatestPackageVersion(packageName: string): Promise<string | null>;
6
7
  export declare function replaceLatestPackageVersionForProject(tree: Tree, projectName: string): Promise<void>;
7
8
  export declare function removePackageFromDependencies(packageName: string, dependencies: Dependency | undefined): void;
@@ -3,11 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.fixDependenciesGenerator = exports.removeSelfReferenceFromDependencies = exports.removePackageFromDependencies = exports.replaceLatestPackageVersionForProject = exports.resolveLatestPackageVersion = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  const devkit_1 = require("@nx/devkit");
6
- const generator_ts_morph_1 = require("@rxap/generator-ts-morph");
7
6
  const node_utilities_1 = require("@rxap/node-utilities");
8
7
  const ts_morph_1 = require("@rxap/ts-morph");
8
+ const utilities_1 = require("@rxap/utilities");
9
+ const workspace_ts_morph_1 = require("@rxap/workspace-ts-morph");
9
10
  const workspace_utilities_1 = require("@rxap/workspace-utilities");
10
11
  const path_1 = require("path");
12
+ require("colors");
11
13
  function resolveProjectDependencies(projectGraph, project, resolved = []) {
12
14
  if (resolved.includes(project)) {
13
15
  return [];
@@ -58,7 +60,7 @@ const TESTING_FILE_EXTENSIONS = [
58
60
  'test-setup.ts',
59
61
  '.cy.ts',
60
62
  ];
61
- const TESTING_FOLDERS = ['cypress', '.storybook'];
63
+ const TESTING_FOLDERS = ['cypress', '.storybook', 'compodoc', 'docs', '.nyc_output', 'coverage', '.angular'];
62
64
  const PACKAGE_REMOVE_BLACK_LIST = ['tslib'];
63
65
  const PACKAGE_ADD_BLACK_LIST = [
64
66
  /@firebase/,
@@ -151,18 +153,60 @@ function addDependedProjects(projectGraph, tree, packageName, projectRoot, depen
151
153
  for (const dependedProject of dependedProjectList) {
152
154
  const dependedPackageName = (0, workspace_utilities_1.ProjectNameToPackageName)(dependedProject);
153
155
  if (!dependencies[dependedPackageName]) {
154
- dependencies[dependedPackageName] = findBasePackageVersion(tree, dependedPackageName, projectRoot);
156
+ dependencies[dependedPackageName] = findBasePackageVersion(dependedPackageName, projectRoot);
155
157
  }
156
158
  }
157
159
  }
158
- function fixPeerDependenciesWithTsMorphProject(projectGraph, tree, projectRoot, packageJson) {
159
- var _a, _b, _c;
160
+ function getUsedPackagesFromSourceRoot(tree, projectSourceRoot) {
160
161
  const project = (0, ts_morph_1.CreateProject)();
161
- (0, generator_ts_morph_1.AddDir)(tree, projectRoot, project, (fileName, path) => !path.includes('node_modules') &&
162
+ (0, workspace_ts_morph_1.AddDir)(tree, projectSourceRoot, project, (fileName, path) => !path.includes('node_modules') &&
162
163
  fileName.endsWith('.ts') &&
163
- !TESTING_FOLDERS.map(folder => (0, path_1.join)(projectRoot, folder)).some(folder => path.includes(folder)) &&
164
+ !TESTING_FOLDERS.map(folder => (0, path_1.join)(projectSourceRoot, folder)).some(folder => path.includes(folder)) &&
164
165
  !TESTING_FILE_EXTENSIONS.some(ext => fileName.endsWith(ext)));
165
- const packageList = getPackageListFromSourceFiles(project);
166
+ return getPackageListFromSourceFiles(project);
167
+ }
168
+ function fixDependenciesWithTsMorphProject(project, tree, projectRoot, packageJson) {
169
+ var _a, _b, _c, _d;
170
+ let peerDependencyList = [];
171
+ let dependencyList = [];
172
+ if (tree.exists((0, path_1.join)(projectRoot, 'src'))) {
173
+ const projectSourceRoot = (0, path_1.join)(projectRoot, 'src');
174
+ if (tree.exists((0, path_1.join)(projectSourceRoot, 'lib'))) {
175
+ const packageList = getUsedPackagesFromSourceRoot(tree, (0, path_1.join)(projectSourceRoot, 'lib'));
176
+ peerDependencyList = peerDependencyList.concat(packageList);
177
+ }
178
+ if (tree.exists((0, path_1.join)(projectSourceRoot, 'generators'))) {
179
+ const packageList = getUsedPackagesFromSourceRoot(tree, (0, path_1.join)(projectSourceRoot, 'generators'));
180
+ dependencyList = dependencyList.concat(packageList);
181
+ }
182
+ if (tree.exists((0, path_1.join)(projectSourceRoot, 'migrations'))) {
183
+ const packageList = getUsedPackagesFromSourceRoot(tree, (0, path_1.join)(projectSourceRoot, 'migrations'));
184
+ dependencyList = dependencyList.concat(packageList);
185
+ }
186
+ if (tree.exists((0, path_1.join)(projectSourceRoot, 'schematics'))) {
187
+ const packageList = getUsedPackagesFromSourceRoot(tree, (0, path_1.join)(projectSourceRoot, 'schematics'));
188
+ dependencyList = dependencyList.concat(packageList);
189
+ }
190
+ if (tree.exists((0, path_1.join)(projectSourceRoot, 'executors'))) {
191
+ const packageList = getUsedPackagesFromSourceRoot(tree, (0, path_1.join)(projectSourceRoot, 'executors'));
192
+ dependencyList = dependencyList.concat(packageList);
193
+ }
194
+ }
195
+ console.log('Check secondary entry points'.cyan);
196
+ for (const ngPackageJsonFilePath of (0, workspace_utilities_1.ForEachSecondaryEntryPoint)(tree, projectRoot)) {
197
+ const path = (0, path_1.dirname)(ngPackageJsonFilePath);
198
+ console.log('Check secondary entry point: ' + path.blue);
199
+ if (tree.exists((0, path_1.join)(path, 'src'))) {
200
+ const entryPointSourceRoot = (0, path_1.join)(path, 'src');
201
+ if (tree.exists((0, path_1.join)(entryPointSourceRoot, 'lib'))) {
202
+ const packageList = getUsedPackagesFromSourceRoot(tree, (0, path_1.join)(entryPointSourceRoot, 'lib'));
203
+ peerDependencyList = peerDependencyList.concat(packageList);
204
+ }
205
+ }
206
+ }
207
+ peerDependencyList = peerDependencyList.filter(peerDependency => !dependencyList.includes(peerDependency));
208
+ peerDependencyList = peerDependencyList.filter((0, utilities_1.unique)());
209
+ dependencyList = dependencyList.filter((0, utilities_1.unique)());
166
210
  const addedPackageList = [];
167
211
  const changedPackageList = [];
168
212
  const removedPackageList = [];
@@ -171,42 +215,70 @@ function fixPeerDependenciesWithTsMorphProject(projectGraph, tree, projectRoot,
171
215
  (_b = packageJson.dependencies) !== null && _b !== void 0 ? _b : (packageJson.dependencies = {});
172
216
  const { dependencies, peerDependencies, } = packageJson;
173
217
  for (const packageName of Object.keys(peerDependencies)) {
174
- if (!packageList.includes(packageName) && !PACKAGE_REMOVE_BLACK_LIST.includes(packageName)) {
218
+ if (!peerDependencyList.includes(packageName) && !PACKAGE_REMOVE_BLACK_LIST.includes(packageName)) {
175
219
  removedPackageList.push(`${packageName}@${peerDependencies[packageName]} from peerDependencies`);
176
220
  delete peerDependencies[packageName];
177
221
  }
178
222
  }
179
223
  for (const packageName of Object.keys(dependencies)) {
180
- if (!packageList.includes(packageName) && !PACKAGE_REMOVE_BLACK_LIST.includes(packageName)) {
224
+ if (!dependencyList.includes(packageName) && !PACKAGE_REMOVE_BLACK_LIST.includes(packageName)) {
181
225
  removedPackageList.push(`${packageName}@${dependencies[packageName]} from dependencies`);
182
226
  delete dependencies[packageName];
183
227
  }
184
228
  }
185
- for (const packageName of packageList) {
229
+ for (const packageName of peerDependencyList) {
186
230
  if ((0, workspace_utilities_1.HasProjectWithPackageName)(packageName)) {
187
- if (!dependencies[packageName]) {
188
- peerDependencies[packageName] = (_c = peerDependencies[packageName]) !== null && _c !== void 0 ? _c : '*';
189
- }
231
+ peerDependencies[packageName] = (_c = peerDependencies[packageName]) !== null && _c !== void 0 ? _c : '*';
190
232
  }
191
233
  else {
192
- if (!dependencies[packageName]) {
193
- const version = findBasePackageVersion(tree, packageName, projectRoot);
194
- if (peerDependencies[packageName]) {
195
- if (peerDependencies[packageName] !== version) {
196
- changedPackageList.push(`${packageName}@${peerDependencies[packageName]} -> ${version}`);
197
- peerDependencies[packageName] = version;
198
- }
199
- }
200
- else {
201
- addedPackageList.push(`${packageName}@${version}`);
234
+ const version = findBasePackageVersion(packageName, projectRoot);
235
+ if (peerDependencies[packageName]) {
236
+ if (peerDependencies[packageName] !== version) {
237
+ changedPackageList.push(`${packageName}@${peerDependencies[packageName]} -> ${version}`);
202
238
  peerDependencies[packageName] = version;
203
239
  }
204
- if (version === 'latest') {
205
- unknownPackageList.push(packageName);
206
- }
240
+ }
241
+ else {
242
+ addedPackageList.push(`${packageName}@${version}`);
207
243
  peerDependencies[packageName] = version;
208
244
  }
245
+ if (version === 'latest') {
246
+ unknownPackageList.push(packageName);
247
+ }
248
+ peerDependencies[packageName] = version;
249
+ }
250
+ }
251
+ for (const packageName of dependencyList) {
252
+ if ((0, workspace_utilities_1.HasProjectWithPackageName)(packageName)) {
253
+ dependencies[packageName] = (_d = dependencies[packageName]) !== null && _d !== void 0 ? _d : '*';
254
+ }
255
+ else {
256
+ const version = findBasePackageVersion(packageName, projectRoot);
257
+ if (dependencies[packageName]) {
258
+ if (dependencies[packageName] !== version) {
259
+ changedPackageList.push(`${packageName}@${dependencies[packageName]} -> ${version}`);
260
+ dependencies[packageName] = version;
261
+ }
262
+ }
263
+ else {
264
+ addedPackageList.push(`${packageName}@${version}`);
265
+ dependencies[packageName] = version;
266
+ }
267
+ if (version === 'latest') {
268
+ unknownPackageList.push(packageName);
269
+ }
270
+ dependencies[packageName] = version;
271
+ }
272
+ }
273
+ if ((0, workspace_utilities_1.IsAngularProject)(project)) {
274
+ if (!tree.exists((0, path_1.join)(projectRoot, 'ng-package.json'))) {
275
+ throw new Error('The project is an angular project but does not have a ng-package.json file');
209
276
  }
277
+ (0, workspace_utilities_1.UpdateJsonFile)(tree, (ngPackageJson) => {
278
+ var _a;
279
+ (_a = ngPackageJson.allowedNonPeerDependencies) !== null && _a !== void 0 ? _a : (ngPackageJson.allowedNonPeerDependencies = []);
280
+ (0, utilities_1.CoerceArrayItems)(ngPackageJson.allowedNonPeerDependencies, dependencyList);
281
+ }, (0, path_1.join)(projectRoot, 'ng-package.json'));
210
282
  }
211
283
  return {
212
284
  addedPackageList,
@@ -218,7 +290,7 @@ function fixPeerDependenciesWithTsMorphProject(projectGraph, tree, projectRoot,
218
290
  function fixDevDependenciesWithTsMorphProject(projectGraph, tree, projectRoot, packageJson) {
219
291
  var _a;
220
292
  const project = (0, ts_morph_1.CreateProject)();
221
- (0, generator_ts_morph_1.AddDir)(tree, projectRoot, project, (fileName, path) => !path.includes('node_modules') &&
293
+ (0, workspace_ts_morph_1.AddDir)(tree, projectRoot, project, (fileName, path) => !path.includes('node_modules') &&
222
294
  fileName.endsWith('.ts') &&
223
295
  !TESTING_FOLDERS.map(folder => (0, path_1.join)(projectRoot, folder)).some(folder => path.includes(folder)) &&
224
296
  TESTING_FILE_EXTENSIONS.some(ext => fileName.endsWith(ext)));
@@ -245,7 +317,7 @@ function fixDevDependenciesWithTsMorphProject(projectGraph, tree, projectRoot, p
245
317
  }
246
318
  else {
247
319
  if (!(peerDependencies === null || peerDependencies === void 0 ? void 0 : peerDependencies[packageName]) && !(dependencies === null || dependencies === void 0 ? void 0 : dependencies[packageName])) {
248
- const version = findBasePackageVersion(tree, packageName, projectRoot);
320
+ const version = findBasePackageVersion(packageName, projectRoot);
249
321
  if (devDependencies === null || devDependencies === void 0 ? void 0 : devDependencies[packageName]) {
250
322
  if (devDependencies[packageName] !== version) {
251
323
  changedPackageList.push(`${packageName}@${devDependencies[packageName]} -> ${version}`);
@@ -332,7 +404,7 @@ function loadAvailablePackageVersion(tree, projectRoot) {
332
404
  pinVersionToMajorRelease(PACKAGE_VERSION_MAP[projectRoot]);
333
405
  });
334
406
  }
335
- function findBasePackageVersion(tree, packageName, projectRoot) {
407
+ function findBasePackageVersion(packageName, projectRoot) {
336
408
  if (!PACKAGE_VERSION_MAP[projectRoot]) {
337
409
  throw new Error('Package version map not loaded. Ensure the loadAvailablePackageVersion function is called before.');
338
410
  }
@@ -341,7 +413,9 @@ function findBasePackageVersion(tree, packageName, projectRoot) {
341
413
  }
342
414
  return 'latest';
343
415
  }
344
- function printReport({ addedPackageList, changedPackageList, removedPackageList, unknownPackageList, }) {
416
+ function printReport(projectName, { addedPackageList, changedPackageList, removedPackageList, unknownPackageList, }) {
417
+ console.log(`==================== Report for project ${projectName}`);
418
+ console.log('========== Peer dependencies:');
345
419
  if (addedPackageList.length) {
346
420
  console.log(`Added packages: ${addedPackageList.length}`);
347
421
  console.log(addedPackageList.join('\n'));
@@ -426,6 +500,77 @@ function removeSelfReferenceFromDependencies(projectName, { dependencies, peerDe
426
500
  removePackageFromDependencies(packageName, optionalDependencies);
427
501
  }
428
502
  exports.removeSelfReferenceFromDependencies = removeSelfReferenceFromDependencies;
503
+ function coerceTsLib(latestTsLibVersion, packageJson) {
504
+ var _a;
505
+ (_a = packageJson.dependencies) !== null && _a !== void 0 ? _a : (packageJson.dependencies = {});
506
+ if (latestTsLibVersion && !packageJson.dependencies['tslib']) {
507
+ packageJson.dependencies['tslib'] = latestTsLibVersion;
508
+ }
509
+ }
510
+ function preferPackageAsPeerDependency(packageJson) {
511
+ var _a, _b;
512
+ (_a = packageJson.dependencies) !== null && _a !== void 0 ? _a : (packageJson.dependencies = {});
513
+ (_b = packageJson.peerDependencies) !== null && _b !== void 0 ? _b : (packageJson.peerDependencies = {});
514
+ for (const [name] of Object.entries(packageJson.dependencies)) {
515
+ if (packageJson.peerDependencies[name]) {
516
+ delete packageJson.dependencies[name];
517
+ }
518
+ }
519
+ }
520
+ function removeBannedPeerDependencies(packageJson) {
521
+ var _a;
522
+ (_a = packageJson.peerDependencies) !== null && _a !== void 0 ? _a : (packageJson.peerDependencies = {});
523
+ for (const banned of PACKAGE_PEER_DEPENDENCIES_BLACK_LIST) {
524
+ if (packageJson.peerDependencies[banned]) {
525
+ delete packageJson.peerDependencies[banned];
526
+ }
527
+ }
528
+ }
529
+ function forceAllDependenciesAsDependencies(packageJson) {
530
+ packageJson.dependencies = Object.assign(Object.assign({}, packageJson.dependencies), packageJson.peerDependencies);
531
+ packageJson.peerDependencies = {};
532
+ }
533
+ function setDependencyVersionFromRootPackageJson(packageJson, rootPackageJson) {
534
+ var _a, _b, _c, _d, _e;
535
+ (_a = packageJson.dependencies) !== null && _a !== void 0 ? _a : (packageJson.dependencies = {});
536
+ for (const [packageName, version] of Object.entries(packageJson.dependencies)) {
537
+ packageJson.dependencies[packageName] = (_e = (_c = (_b = rootPackageJson.dependencies) === null || _b === void 0 ? void 0 : _b[packageName]) !== null && _c !== void 0 ? _c : (_d = rootPackageJson.devDependencies) === null || _d === void 0 ? void 0 : _d[packageName]) !== null && _e !== void 0 ? _e : version;
538
+ }
539
+ }
540
+ function forcePeerDependencies(packageJson) {
541
+ var _a, _b;
542
+ (_a = packageJson.peerDependencies) !== null && _a !== void 0 ? _a : (packageJson.peerDependencies = {});
543
+ (_b = packageJson.dependencies) !== null && _b !== void 0 ? _b : (packageJson.dependencies = {});
544
+ for (const forcedPeerDependency of PACKAGE_FORCED_PEER_DEPENDENCIES) {
545
+ for (const [packageName, version] of Object.entries(packageJson.dependencies)) {
546
+ if (forcedPeerDependency instanceof RegExp ? forcedPeerDependency.test(packageName) : forcedPeerDependency === packageName) {
547
+ packageJson.peerDependencies[packageName] = version;
548
+ delete packageJson.dependencies[packageName];
549
+ }
550
+ }
551
+ }
552
+ }
553
+ function forcePackagesAsDependencies(packageJson, packages, projectRoot) {
554
+ var _a, _b;
555
+ (_a = packageJson.dependencies) !== null && _a !== void 0 ? _a : (packageJson.dependencies = {});
556
+ (_b = packageJson.peerDependencies) !== null && _b !== void 0 ? _b : (packageJson.peerDependencies = {});
557
+ for (const packageName of Object.keys(packageJson.peerDependencies)) {
558
+ if (packages.includes(packageName)) {
559
+ packageJson.dependencies[packageName] = packageJson.peerDependencies[packageName];
560
+ delete packageJson.peerDependencies[packageName];
561
+ }
562
+ }
563
+ for (const packageName of packages) {
564
+ if (!packageJson.dependencies[packageName]) {
565
+ if ((0, workspace_utilities_1.HasProjectWithPackageName)(packageName)) {
566
+ packageJson.dependencies[packageName] = '*';
567
+ }
568
+ else {
569
+ packageJson.dependencies[packageName] = findBasePackageVersion(packageName, projectRoot);
570
+ }
571
+ }
572
+ }
573
+ }
429
574
  /**
430
575
  * This generator tries to fix the dependencies in the project.json of the project
431
576
  *
@@ -480,44 +625,25 @@ function fixDependenciesGenerator(tree, options) {
480
625
  console.log(`Fix dependencies for project ${projectName}`);
481
626
  yield loadAvailablePackageVersion(tree, projectRoot);
482
627
  (0, workspace_utilities_1.UpdatePackageJson)(tree, packageJson => {
483
- var _a, _b, _c, _d, _e, _f, _g, _h;
628
+ var _a, _b, _c, _d, _e;
484
629
  (_a = packageJson.dependencies) !== null && _a !== void 0 ? _a : (packageJson.dependencies = {});
485
630
  (_b = packageJson.peerDependencies) !== null && _b !== void 0 ? _b : (packageJson.peerDependencies = {});
486
631
  (_c = packageJson.devDependencies) !== null && _c !== void 0 ? _c : (packageJson.devDependencies = {});
487
632
  (_d = packageJson.optionalDependencies) !== null && _d !== void 0 ? _d : (packageJson.optionalDependencies = {});
488
- for (const [name] of Object.entries(packageJson.dependencies)) {
489
- if (packageJson.peerDependencies[name]) {
490
- delete packageJson.dependencies[name];
491
- }
492
- }
493
- if (latestTsLibVersion && !packageJson.dependencies['tslib']) {
494
- packageJson.dependencies['tslib'] = latestTsLibVersion;
495
- }
496
- const peerReport = fixPeerDependenciesWithTsMorphProject(projectGraph, tree, projectRoot, packageJson);
633
+ preferPackageAsPeerDependency(packageJson);
634
+ coerceTsLib(latestTsLibVersion, packageJson);
635
+ const peerReport = fixDependenciesWithTsMorphProject(project, tree, projectRoot, packageJson);
497
636
  removeSelfReferenceFromDependencies(projectName, packageJson);
498
- for (const banned of PACKAGE_PEER_DEPENDENCIES_BLACK_LIST) {
499
- if (packageJson.peerDependencies[banned]) {
500
- delete packageJson.peerDependencies[banned];
501
- }
502
- }
637
+ removeBannedPeerDependencies(packageJson);
503
638
  if (options.onlyDependencies) {
504
- packageJson.dependencies = Object.assign(Object.assign({}, packageJson.dependencies), packageJson.peerDependencies);
505
- packageJson.peerDependencies = {};
506
- }
507
- for (const [packageName, version] of Object.entries(packageJson.dependencies)) {
508
- packageJson.dependencies[packageName] = (_h = (_f = (_e = rootPackageJson.dependencies) === null || _e === void 0 ? void 0 : _e[packageName]) !== null && _f !== void 0 ? _f : (_g = rootPackageJson.devDependencies) === null || _g === void 0 ? void 0 : _g[packageName]) !== null && _h !== void 0 ? _h : version;
639
+ forceAllDependenciesAsDependencies(packageJson);
509
640
  }
510
- for (const forcedPeerDependency of PACKAGE_FORCED_PEER_DEPENDENCIES) {
511
- for (const [packageName, version] of Object.entries(packageJson.dependencies)) {
512
- if (forcedPeerDependency instanceof RegExp ? forcedPeerDependency.test(packageName) : forcedPeerDependency === packageName) {
513
- packageJson.peerDependencies[packageName] = version;
514
- delete packageJson.dependencies[packageName];
515
- }
516
- }
641
+ if ((_e = options.dependencies) === null || _e === void 0 ? void 0 : _e.length) {
642
+ forcePackagesAsDependencies(packageJson, options.dependencies, projectRoot);
517
643
  }
518
- console.log(`==================== Report for project ${projectName}`);
519
- console.log('========== Peer dependencies:');
520
- printReport(peerReport);
644
+ setDependencyVersionFromRootPackageJson(packageJson, rootPackageJson);
645
+ forcePeerDependencies(packageJson);
646
+ printReport(projectName, peerReport);
521
647
  unknownPackageMap[projectName] = peerReport.unknownPackageList.filter((packageName, index, self) => self.indexOf(packageName) === index);
522
648
  }, { basePath: projectRoot });
523
649
  }
@@ -1 +1 @@
1
- {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/fix-dependencies/generator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/fix-dependencies/generator.ts"],"names":[],"mappings":"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"}
@@ -6,4 +6,5 @@ export interface FixDependenciesGeneratorSchema {
6
6
  resolve?: boolean;
7
7
  strict?: boolean;
8
8
  onlyDependencies?: boolean;
9
+ dependencies?: string[];
9
10
  }
@@ -30,6 +30,13 @@
30
30
  "type": "boolean",
31
31
  "default": false,
32
32
  "description": "If true, will move all peer dependencies to dependencies"
33
+ },
34
+ "dependencies": {
35
+ "type": "array",
36
+ "items": {
37
+ "type": "string"
38
+ },
39
+ "description": "List of packages that should always be added as dependencies"
33
40
  }
34
41
  },
35
42
  "required": []
@@ -0,0 +1,2 @@
1
+ import { ProjectConfiguration, Tree } from '@nx/devkit';
2
+ export declare function coerceAssetsConfiguration(tree: Tree, projectName: string, project: ProjectConfiguration): void;
@@ -0,0 +1,50 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.coerceAssetsConfiguration = void 0;
4
+ const devkit_1 = require("@nx/devkit");
5
+ const workspace_utilities_1 = require("@rxap/workspace-utilities");
6
+ const path_1 = require("path");
7
+ function coerceAssets(assets, projectRoot) {
8
+ (0, workspace_utilities_1.CoerceAssets)(assets, [
9
+ {
10
+ input: `./${projectRoot}`,
11
+ glob: "migrations.json",
12
+ output: "."
13
+ },
14
+ {
15
+ input: `./${projectRoot}/src/migrations`,
16
+ glob: "**/!(*.ts|*.js|*.json)",
17
+ output: "./src/migrations"
18
+ }
19
+ ]);
20
+ }
21
+ function coerceAssetsInBuildTarget(tree, projectName, project) {
22
+ var _a;
23
+ const projectRoot = (0, workspace_utilities_1.GetProjectRoot)(tree, projectName);
24
+ const buildTarget = (0, workspace_utilities_1.GetTarget)(project, 'build');
25
+ const buildTargetOptions = (0, workspace_utilities_1.GetTargetOptions)(buildTarget);
26
+ (_a = buildTargetOptions.assets) !== null && _a !== void 0 ? _a : (buildTargetOptions.assets = []);
27
+ coerceAssets(buildTargetOptions.assets, projectRoot);
28
+ (0, devkit_1.updateProjectConfiguration)(tree, projectName, project);
29
+ }
30
+ function coerceAssetsInNgPackageJson(tree, projectName, project) {
31
+ const projectRoot = (0, workspace_utilities_1.GetProjectRoot)(tree, projectName);
32
+ if (!tree.exists((0, path_1.join)(projectRoot, 'ng-package.json'))) {
33
+ throw new Error(`The ng-package.json file does not exists in the project root: ${projectRoot}`);
34
+ }
35
+ (0, workspace_utilities_1.UpdateJsonFile)(tree, (ngPackageJson) => {
36
+ var _a;
37
+ (_a = ngPackageJson.assets) !== null && _a !== void 0 ? _a : (ngPackageJson.assets = []);
38
+ coerceAssets(ngPackageJson.assets, projectRoot);
39
+ }, (0, path_1.join)(projectRoot, 'ng-package.json'));
40
+ }
41
+ function coerceAssetsConfiguration(tree, projectName, project) {
42
+ if ((0, workspace_utilities_1.IsAngularProject)(project)) {
43
+ coerceAssetsInNgPackageJson(tree, projectName, project);
44
+ }
45
+ else {
46
+ coerceAssetsInBuildTarget(tree, projectName, project);
47
+ }
48
+ }
49
+ exports.coerceAssetsConfiguration = coerceAssetsConfiguration;
50
+ //# sourceMappingURL=coerce-assets-configuration.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"coerce-assets-configuration.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/init-with-migrations/coerce-assets-configuration.ts"],"names":[],"mappings":";;;AAAA,uCAIoB;AACpB,mEASmC;AACnC,+BAA4B;AAE5B,SAAS,YAAY,CAAC,MAAc,EAAE,WAAmB;IACvD,IAAA,kCAAY,EAAC,MAAM,EAAE;QACnB;YACE,KAAK,EAAE,KAAK,WAAW,EAAE;YACzB,IAAI,EAAE,iBAAiB;YACvB,MAAM,EAAE,GAAG;SACZ;QACD;YACE,KAAK,EAAE,KAAK,WAAW,iBAAiB;YACxC,IAAI,EAAE,wBAAwB;YAC9B,MAAM,EAAE,kBAAkB;SAC3B;KACF,CAAC,CAAC;AACL,CAAC;AAED,SAAS,yBAAyB,CAAC,IAAU,EAAE,WAAmB,EAAE,OAA6B;;IAE/F,MAAM,WAAW,GAAG,IAAA,oCAAc,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IAEtD,MAAM,WAAW,GAAG,IAAA,+BAAS,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAChD,MAAM,kBAAkB,GAAwB,IAAA,sCAAgB,EAAC,WAAW,CAAC,CAAC;IAC9E,MAAA,kBAAkB,CAAC,MAAM,oCAAzB,kBAAkB,CAAC,MAAM,GAAK,EAAE,EAAC;IACjC,YAAY,CAAC,kBAAkB,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IACrD,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;AACzD,CAAC;AAED,SAAS,2BAA2B,CAAC,IAAU,EAAE,WAAmB,EAAE,OAA6B;IACjG,MAAM,WAAW,GAAG,IAAA,oCAAc,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IAEtD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAA,WAAI,EAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC,EAAE,CAAC;QACvD,MAAM,IAAI,KAAK,CAAC,iEAAiE,WAAW,EAAE,CAAC,CAAC;IAClG,CAAC;IAED,IAAA,oCAAc,EAAC,IAAI,EAAE,CAAC,aAA4B,EAAE,EAAE;;QACpD,MAAA,aAAa,CAAC,MAAM,oCAApB,aAAa,CAAC,MAAM,GAAK,EAAE,EAAC;QAC5B,YAAY,CAAC,aAAa,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAClD,CAAC,EAAE,IAAA,WAAI,EAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC,CAAC;AAE3C,CAAC;AAED,SAAgB,yBAAyB,CAAC,IAAU,EAAE,WAAmB,EAAE,OAA6B;IAEtG,IAAI,IAAA,sCAAgB,EAAC,OAAO,CAAC,EAAE,CAAC;QAC9B,2BAA2B,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IAC1D,CAAC;SAAM,CAAC;QACN,yBAAyB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IACxD,CAAC;AAEH,CAAC;AARD,8DAQC"}
@@ -4,7 +4,7 @@ exports.initProject = void 0;
4
4
  const workspace_utilities_1 = require("@rxap/workspace-utilities");
5
5
  const path_1 = require("path");
6
6
  const update_package_json_1 = require("./update-package-json");
7
- const update_project_targets_1 = require("./update-project-targets");
7
+ const coerce_assets_configuration_1 = require("./coerce-assets-configuration");
8
8
  function initProject(tree, projectName, project, options) {
9
9
  console.log(`init library with migration project: ${projectName}`);
10
10
  const projectRoot = (0, workspace_utilities_1.GetProjectRoot)(tree, projectName);
@@ -13,7 +13,7 @@ function initProject(tree, projectName, project, options) {
13
13
  var _a;
14
14
  (_a = migrations.generators) !== null && _a !== void 0 ? _a : (migrations.generators = {});
15
15
  }, (0, path_1.join)(projectRoot, 'migrations.json'), { create: true });
16
- (0, update_project_targets_1.updateProjectTargets)(tree, projectName, project);
16
+ (0, coerce_assets_configuration_1.coerceAssetsConfiguration)(tree, projectName, project);
17
17
  (0, update_package_json_1.updatePackageJson)(tree, projectName, project);
18
18
  }
19
19
  exports.initProject = initProject;
@@ -1 +1 @@
1
- {"version":3,"file":"init-project.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/init-with-migrations/init-project.ts"],"names":[],"mappings":";;;AAIA,mEAGmC;AACnC,+BAA4B;AAE5B,+DAA0D;AAC1D,qEAAgE;AAEhE,SAAgB,WAAW,CAAC,IAAU,EAAE,WAAmB,EAAE,OAA6B,EAAE,OAA0C;IACpI,OAAO,CAAC,GAAG,CAAC,wCAAyC,WAAY,EAAE,CAAC,CAAC;IAErE,MAAM,WAAW,GAAG,IAAA,oCAAc,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IAEtD,qEAAqE;IACrE,IAAA,oCAAc,EAAC,IAAI,EAAE,UAAU,CAAC,EAAE;;QAChC,MAAA,UAAU,CAAC,UAAU,oCAArB,UAAU,CAAC,UAAU,GAAK,EAAE,EAAC;IAC/B,CAAC,EAAE,IAAA,WAAI,EAAC,WAAW,EAAE,iBAAiB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;IAE3D,IAAA,6CAAoB,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IAEjD,IAAA,uCAAiB,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;AAEhD,CAAC;AAdD,kCAcC"}
1
+ {"version":3,"file":"init-project.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/init-with-migrations/init-project.ts"],"names":[],"mappings":";;;AAIA,mEAImC;AACnC,+BAA4B;AAE5B,+DAA0D;AAC1D,+EAA0E;AAE1E,SAAgB,WAAW,CAAC,IAAU,EAAE,WAAmB,EAAE,OAA6B,EAAE,OAA0C;IACpI,OAAO,CAAC,GAAG,CAAC,wCAAyC,WAAY,EAAE,CAAC,CAAC;IAErE,MAAM,WAAW,GAAG,IAAA,oCAAc,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IAEtD,qEAAqE;IACrE,IAAA,oCAAc,EAAC,IAAI,EAAE,UAAU,CAAC,EAAE;;QAChC,MAAA,UAAU,CAAC,UAAU,oCAArB,UAAU,CAAC,UAAU,GAAK,EAAE,EAAC;IAC/B,CAAC,EAAE,IAAA,WAAI,EAAC,WAAW,EAAE,iBAAiB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;IAE3D,IAAA,uDAAyB,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IAEtD,IAAA,uCAAiB,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;AAEhD,CAAC;AAdD,kCAcC"}
@@ -1,2 +0,0 @@
1
- import { ProjectConfiguration, Tree } from '@nx/devkit';
2
- export declare function updateProjectTargets(tree: Tree, projectName: string, project: ProjectConfiguration): void;
@@ -1,27 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.updateProjectTargets = void 0;
4
- const devkit_1 = require("@nx/devkit");
5
- const workspace_utilities_1 = require("@rxap/workspace-utilities");
6
- function updateProjectTargets(tree, projectName, project) {
7
- var _a;
8
- const projectRoot = (0, workspace_utilities_1.GetProjectRoot)(tree, projectName);
9
- const buildTarget = (0, workspace_utilities_1.GetTarget)(project, 'build');
10
- const buildTargetOptions = (0, workspace_utilities_1.GetTargetOptions)(buildTarget);
11
- (_a = buildTargetOptions.assets) !== null && _a !== void 0 ? _a : (buildTargetOptions.assets = []);
12
- (0, workspace_utilities_1.CoerceAssets)(buildTargetOptions.assets, [
13
- {
14
- input: `./${projectRoot}`,
15
- glob: "migrations.json",
16
- output: "."
17
- },
18
- {
19
- input: `./${projectRoot}/src/migrations`,
20
- glob: "**/!(*.ts|*.js|*.json)",
21
- output: "./src/migrations"
22
- }
23
- ]);
24
- (0, devkit_1.updateProjectConfiguration)(tree, projectName, project);
25
- }
26
- exports.updateProjectTargets = updateProjectTargets;
27
- //# sourceMappingURL=update-project-targets.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"update-project-targets.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/init-with-migrations/update-project-targets.ts"],"names":[],"mappings":";;;AAAA,uCAIoB;AACpB,mEAMmC;AAEnC,SAAgB,oBAAoB,CAAC,IAAU,EAAE,WAAmB,EAAE,OAA6B;;IAEjG,MAAM,WAAW,GAAG,IAAA,oCAAc,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IAEtD,MAAM,WAAW,GAAG,IAAA,+BAAS,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAChD,MAAM,kBAAkB,GAAwB,IAAA,sCAAgB,EAAC,WAAW,CAAC,CAAC;IAC9E,MAAA,kBAAkB,CAAC,MAAM,oCAAzB,kBAAkB,CAAC,MAAM,GAAK,EAAE,EAAC;IACjC,IAAA,kCAAY,EAAC,kBAAkB,CAAC,MAAM,EAAE;QACtC;YACE,KAAK,EAAE,KAAK,WAAW,EAAE;YACzB,IAAI,EAAE,iBAAiB;YACvB,MAAM,EAAE,GAAG;SACZ;QACD;YACE,KAAK,EAAE,KAAK,WAAW,iBAAiB;YACxC,IAAI,EAAE,wBAAwB;YAC9B,MAAM,EAAE,kBAAkB;SAC3B;KACF,CAAC,CAAC;IACH,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;AAEzD,CAAC;AArBD,oDAqBC"}