@o3r/application 10.0.0-prerelease.103 → 10.0.0-prerelease.104

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 (3) hide show
  1. package/package.json +6 -6
  2. package/schematics/ng-add/index.d.ts.map +1 -1
  3. package/schematics/ng-add/index.js +15 -10
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@o3r/application",
3
- "version": "10.0.0-prerelease.103",
3
+ "version": "10.0.0-prerelease.104",
4
4
  "publishConfig": {
5
5
  "access": "public"
6
6
  },
@@ -28,11 +28,11 @@
28
28
  "@angular-devkit/schematics": "~17.2.0",
29
29
  "@angular/common": "~17.2.0",
30
30
  "@angular/core": "~17.2.0",
31
- "@o3r/core": "^10.0.0-prerelease.103",
32
- "@o3r/logger": "^10.0.0-prerelease.103",
33
- "@o3r/routing": "^10.0.0-prerelease.103",
34
- "@o3r/schematics": "^10.0.0-prerelease.103",
35
- "@o3r/testing": "^10.0.0-prerelease.103",
31
+ "@o3r/core": "^10.0.0-prerelease.104",
32
+ "@o3r/logger": "^10.0.0-prerelease.104",
33
+ "@o3r/routing": "^10.0.0-prerelease.104",
34
+ "@o3r/schematics": "^10.0.0-prerelease.104",
35
+ "@o3r/testing": "^10.0.0-prerelease.104",
36
36
  "@schematics/angular": "~17.2.0",
37
37
  "rxjs": "^7.8.1",
38
38
  "typescript": "~5.2.2"
package/schematics/ng-add/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAI/E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AA6FtD;;;GAGG;AACH,eAAO,MAAM,KAAK,0CAAiD,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAI/E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAkGtD;;;GAGG;AACH,eAAO,MAAM,KAAK,0CAAiD,CAAC"}
package/schematics/ng-add/index.js CHANGED
@@ -14,12 +14,12 @@ function ngAddFn(options) {
14
14
  /* ng add rules */
15
15
  return async (tree, context) => {
16
16
  try {
17
- const { addImportToModuleFile, getAppModuleFilePath, getModuleIndex, getWorkspaceConfig, insertImportToModuleFile, ngAddPackages, getO3rPeerDeps, getProjectNewDependenciesType } = await Promise.resolve().then(() => require('@o3r/schematics'));
17
+ const { addImportToModuleFile, getAppModuleFilePath, getModuleIndex, getWorkspaceConfig, insertImportToModuleFile, setupDependencies, getO3rPeerDeps, getProjectNewDependenciesTypes } = await Promise.resolve().then(() => require('@o3r/schematics'));
18
18
  const { isImported } = await Promise.resolve().then(() => require('@schematics/angular/utility/ast-utils'));
19
19
  const ts = await Promise.resolve().then(() => require('typescript'));
20
- const depsInfo = getO3rPeerDeps(path.resolve(__dirname, '..', '..', 'package.json'));
20
+ const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
21
+ const depsInfo = getO3rPeerDeps(packageJsonPath);
21
22
  const workspaceProject = options.projectName ? getWorkspaceConfig(tree)?.projects[options.projectName] : undefined;
22
- const workingDirectory = workspaceProject?.root;
23
23
  const addAngularAnimationPreferences = () => {
24
24
  const moduleFilePath = getAppModuleFilePath(tree, context, options.projectName);
25
25
  if (!moduleFilePath) {
@@ -38,16 +38,21 @@ function ngAddFn(options) {
38
38
  tree.commitUpdate(recorder);
39
39
  return tree;
40
40
  };
41
- const dependencyType = getProjectNewDependenciesType(workspaceProject);
41
+ const dependencies = depsInfo.o3rPeerDeps.reduce((acc, dep) => {
42
+ acc[dep] = {
43
+ inManifest: [{
44
+ range: `^${depsInfo.packageVersion}`,
45
+ types: getProjectNewDependenciesTypes(workspaceProject)
46
+ }]
47
+ };
48
+ return acc;
49
+ }, (0, schematics_2.getPackageInstallConfig)(packageJsonPath, tree, options.projectName));
42
50
  const registerDevtoolRule = await (0, devtools_registration_1.registerDevtools)(options);
43
51
  return () => (0, schematics_1.chain)([
44
- ngAddPackages(depsInfo.o3rPeerDeps, {
45
- skipConfirmation: true,
46
- version: depsInfo.packageVersion,
47
- parentPackageInfo: depsInfo.packageName,
52
+ setupDependencies({
48
53
  projectName: options.projectName,
49
- dependencyType,
50
- workingDirectory
54
+ dependencies,
55
+ ngAddToRun: depsInfo.o3rPeerDeps
51
56
  }),
52
57
  addAngularAnimationPreferences,
53
58
  registerDevtoolRule,