Fix (schematics): fixed dependency versions (#6210)

* fix(dchematics): fixed dependency versions

* fix(schematics): fixed dependency versions

Author: SvetlanaMuravlova

scripts/set-version.ts

@@ -4,13 +4,21 @@ import { sync as glob } from 'glob';
 const packagesGlob = './src/**/package.json';
 const mainPackage = './package.json';
 const docsVersion = './apps/ngx-bootstrap-docs/src/assets/json/current-version.json';
+const schematicDependencyVersion = './src/schematics/src/utils/current_dependency_versions.json';
 
 (async () => {
   const version = await readJson(mainPackage).then(json => json.version);
-  const packages = [docsVersion, ...glob(packagesGlob)]
+  const packages = [docsVersion, schematicDependencyVersion, ...glob(packagesGlob)]
     .map(async packagePath => {
       const packageJson = await readJson(packagePath);
-      packageJson.version = version;
+      if (packageJson.version) {
+        packageJson.version = version;
+      }
+
+      if (packageJson.NGX_BOOTSTRAP_VERSION) {
+        packageJson.NGX_BOOTSTRAP_VERSION = version;
+      }
+
       await writeJson(packagePath, packageJson, { spaces: 2 });
     });
 

src/schematics/src/utils/current_dependency_versions.json

@@ -0,0 +1,4 @@
+{
+  "NGX_BOOTSTRAP_VERSION": "7.0.0-rc.4",
+  "BOOTSTRAP_VERSION": "^4.5.0"
+}

src/schematics/src/utils/getVersions.ts

@@ -1,36 +1,20 @@
 import { normalize } from '@angular-devkit/core';
 import { Tree } from '@angular-devkit/schematics';
+import * as currentVersions from './current_dependency_versions.json';
+
+const NGX_BOOTSTRAP_VERSION = currentVersions.NGX_BOOTSTRAP_VERSION;
+const BOOTSTRAP_VERSION = currentVersions.BOOTSTRAP_VERSION;
 
-let NGX_BOOTSTRAP_VERSION = '7.0.0-rc.1';
-const BOOTSTRAP_VERSION = '^4.5.0';
-const dependencies = [
-  { name: 'bootstrap', version: BOOTSTRAP_VERSION},
-  { name: 'ngx-bootstrap', version: NGX_BOOTSTRAP_VERSION}
-];
 // Regular expression that matches all possible Angular CLI default style files
 const defaultStyleFileRegex = /styles\.(c|le|sc|sa)ss/;
 // Regular expression that matches all files that have a proper stylesheet extension
 const validStyleFileRegex = /\.(c|le|sc|sa)ss/;
 
 export function getDependencies(host: Tree): { name: string, version: string }[] {
-  if (host.exists('node_modules/ngx-bootstrap/schematics/package.json')) {
-    const sourceText = host.read('node_modules/ngx-bootstrap/schematics/package.json')?.toString('utf-8');
-    const json = JSON.parse(sourceText);
-    if (json.version) {
-      NGX_BOOTSTRAP_VERSION = json.version;
-      return updateVersionDependencies(json.version, 'ngx-bootstrap');
-    }
-  }
-  return dependencies;
-}
-
-function updateVersionDependencies(version: string, name: string): { name: string, version: string }[] {
-  dependencies.find(dep => {
-    if (dep.name === name) {
-      dep.version = version;
-    }
-  });
-  return  dependencies;
+  return [
+    { name: 'bootstrap', version: BOOTSTRAP_VERSION},
+    { name: 'ngx-bootstrap', version: NGX_BOOTSTRAP_VERSION}
+  ];
 }
 
 export function getProjectStyleFile(existingStyles: string[], extension?: string): string | null {

src/schematics/tsconfig.json

@@ -16,9 +16,8 @@
     "skipLibCheck": true,
     "strict": false,
     "target": "es2015",
-    "types": [
-      "node"
-    ],
+    "types": ["node", "jest"],
+    "resolveJsonModule": true,
     "lib": [
       "es2018",
       "dom"

src/schematics/tsconfig.lib.json

@@ -4,7 +4,9 @@
     "module": "commonjs",
     "outDir": "../../dist/out-tsc",
     "declaration": true,
-    "types": ["node", "jest"]
+    "target": "es2015",
+    "types": ["node", "jest"],
+    "resolveJsonModule": true
   },
   "exclude": ["**/*.spec.ts"],
   "include": ["**/*.ts"]