@ng-doc/add 15.0.0-beta.13 → 15.0.0-beta.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ng-doc/add",
-  "version": "15.0.0-beta.13",
+  "version": "15.0.0-beta.15",
   "type": "commonjs",
   "schematics": "./schematics/collection.json",
   "ng-add": {
@@ -10,8 +10,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@angular/cdk": ">=13.3.0",
-    "@angular-devkit/schematics": ">=13.0.0",
+    "@angular/cdk": ">=15.0.0",
+    "@angular-devkit/schematics": ">=15.0.0",
     "ng-morph": "^2.1.1"
   },
   "main": "./schematics/index.js",

package/schematics/ng-add/constants/assets.js

@@ -4,17 +4,17 @@ exports.NG_DOC_ASSETS = void 0;
 exports.NG_DOC_ASSETS = [
     {
         glob: '**/*',
-        input: './node_modules/@ng-doc/ui-kit/assets',
+        input: 'node_modules/@ng-doc/ui-kit/assets',
         output: 'assets',
     },
     {
         glob: '**/*',
-        input: './node_modules/@ng-doc/app/assets',
+        input: 'node_modules/@ng-doc/app/assets',
         output: 'assets',
     },
     {
         glob: '**/*',
-        input: './node_modules/@ng-doc/builder/generated/assets',
+        input: 'node_modules/@ng-doc/builder/generated/assets',
         output: 'assets',
     },
 ];

package/schematics/ng-add/constants/assets.js.map

@@ -1 +1 @@
-{"version":3,"file":"assets.js","sourceRoot":"","sources":["../../../../../../libs/add/schematics/ng-add/constants/assets.ts"],"names":[],"mappings":";;;AAAa,QAAA,aAAa,GAAyD;IAClF;QACC,IAAI,EAAE,MAAM;QACZ,KAAK,EAAE,sCAAsC;QAC7C,MAAM,EAAE,QAAQ;KAChB;IACD;QACC,IAAI,EAAE,MAAM;QACZ,KAAK,EAAE,mCAAmC;QAC1C,MAAM,EAAE,QAAQ;KAChB;IACD;QACC,IAAI,EAAE,MAAM;QACZ,KAAK,EAAE,iDAAiD;QACxD,MAAM,EAAE,QAAQ;KAChB;CACD,CAAC"}
+{"version":3,"file":"assets.js","sourceRoot":"","sources":["../../../../../../libs/add/schematics/ng-add/constants/assets.ts"],"names":[],"mappings":";;;AAAa,QAAA,aAAa,GAAyD;IAClF;QACC,IAAI,EAAE,MAAM;QACZ,KAAK,EAAE,oCAAoC;QAC3C,MAAM,EAAE,QAAQ;KAChB;IACD;QACC,IAAI,EAAE,MAAM;QACZ,KAAK,EAAE,iCAAiC;QACxC,MAAM,EAAE,QAAQ;KAChB;IACD;QACC,IAAI,EAAE,MAAM;QACZ,KAAK,EAAE,+CAA+C;QACtD,MAAM,EAAE,QAAQ;KAChB;CACD,CAAC"}

package/schematics/ng-add/constants/styles.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NG_DOC_STYLES = void 0;
-exports.NG_DOC_STYLES = ['./node_modules/@ng-doc/app/styles/global.css'];
+exports.NG_DOC_STYLES = ['node_modules/@ng-doc/app/styles/global.css'];
 //# sourceMappingURL=styles.js.map

package/schematics/ng-add/constants/styles.js.map

@@ -1 +1 @@
-{"version":3,"file":"styles.js","sourceRoot":"","sources":["../../../../../../libs/add/schematics/ng-add/constants/styles.ts"],"names":[],"mappings":";;;AAAa,QAAA,aAAa,GAAa,CAAC,8CAA8C,CAAC,CAAC"}
+{"version":3,"file":"styles.js","sourceRoot":"","sources":["../../../../../../libs/add/schematics/ng-add/constants/styles.ts"],"names":[],"mappings":";;;AAAa,QAAA,aAAa,GAAa,CAAC,4CAA4C,CAAC,CAAC"}

package/schematics/ng-add/index.js

@@ -12,6 +12,7 @@ const add_ng_doc_modules_1 = require("./steps/add-ng-doc-modules");
 const add_styles_1 = require("./steps/add-styles");
 const add_tsconfig_paths_1 = require("./steps/add-tsconfig-paths");
 const replace_builders_1 = require("./steps/replace-builders");
+const update_app_ts_config_1 = require("./steps/update-app-ts-config");
 /**
  *
  * @param options
@@ -42,7 +43,8 @@ function ngAddSetupProject(options) {
         (0, add_ng_doc_modules_1.addNgDocModules)(options),
         (0, add_layout_1.addLayout)(options),
         (0, add_tsconfig_paths_1.addTsconfigPaths)(options),
-        (0, add_git_ignore_1.addGitIgnore)()
+        (0, update_app_ts_config_1.updateAppTsConfig)(options),
+        (0, add_git_ignore_1.addGitIgnore)(),
     ]);
 }
 exports.ngAddSetupProject = ngAddSetupProject;

package/schematics/ng-add/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../libs/add/schematics/ng-add/index.ts"],"names":[],"mappings":";;;AAAA,2DAA+E;AAC/E,4DAA0F;AAC1F,uCAAgH;AAEhH,iDAAmD;AAEnD,mDAA6C;AAC7C,2DAAoD;AACpD,mDAA6C;AAC7C,mEAA2D;AAC3D,mDAA6C;AAC7C,mEAA4D;AAC5D,+DAAyD;AAEzD;;;GAGG;AACH,SAAgB,KAAK,CAAC,OAAe;IACpC,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAChD,IAAA,2BAAgB,EAAC,IAAA,wBAAa,EAAC,IAAI,EAAE,GAAG,EAAE,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;QAErE,IAAA,mCAAwB,EAAC,IAAI,EAAE,EAAC,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,wBAAc,EAAC,CAAC,CAAC;QAC/E,IAAA,mCAAwB,EAAC,IAAI,EAAE,EAAC,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,wBAAc,EAAC,CAAC,CAAC;QACnF,IAAA,mCAAwB,EAAC,IAAI,EAAE,EAAC,IAAI,EAAE,gBAAgB,EAAE,OAAO,EAAE,wBAAc,EAAC,CAAC,CAAC;QAClF,IAAA,mCAAwB,EAAC,IAAI,EAAE,EAAC,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,wBAAc,EAAC,CAAC,CAAC;QAChF,IAAA,sCAA2B,EAAC,IAAI,EAAE,aAAa,CAAC,CAAC;QAEjD,OAAO,CAAC,OAAO,CAAC,IAAI,8BAAsB,EAAE,EAAE;YAC7C,OAAO,CAAC,OAAO,CAAC,IAAI,wBAAgB,CAAC,sBAAsB,EAAE,OAAO,CAAC,CAAC;SACtE,CAAC,CAAC;IACJ,CAAC,CAAC;AACH,CAAC;AAdD,sBAcC;AAED;;;GAGG;AACH,SAAgB,iBAAiB,CAAC,OAAe;IAChD,OAAO,IAAA,kBAAK,EAAC;QACZ,IAAA,kCAAe,EAAC,OAAO,CAAC;QACxB,IAAA,sBAAS,EAAC,OAAO,CAAC;QAClB,IAAA,sBAAS,EAAC,OAAO,CAAC;QAClB,IAAA,oCAAe,EAAC,OAAO,CAAC;QACxB,IAAA,sBAAS,EAAC,OAAO,CAAC;QAClB,IAAA,qCAAgB,EAAC,OAAO,CAAC;QACzB,IAAA,6BAAY,GAAE;KACd,CAAC,CAAC;AACJ,CAAC;AAVD,8CAUC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../libs/add/schematics/ng-add/index.ts"],"names":[],"mappings":";;;AAAA,2DAA+E;AAC/E,4DAA0F;AAC1F,uCAAgH;AAEhH,iDAAmD;AAEnD,mDAA6C;AAC7C,2DAAoD;AACpD,mDAA6C;AAC7C,mEAA2D;AAC3D,mDAA6C;AAC7C,mEAA4D;AAC5D,+DAAyD;AACzD,uEAA+D;AAE/D;;;GAGG;AACH,SAAgB,KAAK,CAAC,OAAe;IACpC,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAChD,IAAA,2BAAgB,EAAC,IAAA,wBAAa,EAAC,IAAI,EAAE,GAAG,EAAE,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;QAErE,IAAA,mCAAwB,EAAC,IAAI,EAAE,EAAC,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,wBAAc,EAAC,CAAC,CAAC;QAC/E,IAAA,mCAAwB,EAAC,IAAI,EAAE,EAAC,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,wBAAc,EAAC,CAAC,CAAC;QACnF,IAAA,mCAAwB,EAAC,IAAI,EAAE,EAAC,IAAI,EAAE,gBAAgB,EAAE,OAAO,EAAE,wBAAc,EAAC,CAAC,CAAC;QAClF,IAAA,mCAAwB,EAAC,IAAI,EAAE,EAAC,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,wBAAc,EAAC,CAAC,CAAC;QAChF,IAAA,sCAA2B,EAAC,IAAI,EAAE,aAAa,CAAC,CAAC;QAEjD,OAAO,CAAC,OAAO,CAAC,IAAI,8BAAsB,EAAE,EAAE;YAC7C,OAAO,CAAC,OAAO,CAAC,IAAI,wBAAgB,CAAC,sBAAsB,EAAE,OAAO,CAAC,CAAC;SACtE,CAAC,CAAC;IACJ,CAAC,CAAC;AACH,CAAC;AAdD,sBAcC;AAED;;;GAGG;AACH,SAAgB,iBAAiB,CAAC,OAAe;IAChD,OAAO,IAAA,kBAAK,EAAC;QACZ,IAAA,kCAAe,EAAC,OAAO,CAAC;QACxB,IAAA,sBAAS,EAAC,OAAO,CAAC;QAClB,IAAA,sBAAS,EAAC,OAAO,CAAC;QAClB,IAAA,oCAAe,EAAC,OAAO,CAAC;QACxB,IAAA,sBAAS,EAAC,OAAO,CAAC;QAClB,IAAA,qCAAgB,EAAC,OAAO,CAAC;QACzB,IAAA,wCAAiB,EAAC,OAAO,CAAC;QAC1B,IAAA,6BAAY,GAAE;KACd,CAAC,CAAC;AACJ,CAAC;AAXD,8CAWC"}

package/schematics/ng-add/steps/add-assets.js

@@ -21,11 +21,17 @@ function addAssets(options) {
             }
             const targetOptions = (0, schematics_1.getProjectTargetOptions)(project, 'build');
             const assets = targetOptions['assets'];
+            const jsDependencies = targetOptions['allowedCommonJsDependencies'];
             if (!assets) {
                 targetOptions['assets'] = assets_1.NG_DOC_ASSETS;
                 return;
             }
+            if (!jsDependencies) {
+                targetOptions['allowedCommonJsDependencies'] = ['@ng-doc/core'];
+                return;
+            }
             targetOptions['assets'] = Array.from(new Set([...assets_1.NG_DOC_ASSETS, ...assets]));
+            targetOptions['allowedCommonJsDependencies'] = Array.from(new Set([...jsDependencies, '@ng-doc/core']));
         });
     };
 }

package/schematics/ng-add/steps/add-assets.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-assets.js","sourceRoot":"","sources":["../../../../../../libs/add/schematics/ng-add/steps/add-assets.ts"],"names":[],"mappings":";;;AAAA,wDAAgE;AAGhE,qEAA8G;AAE9G,gDAAkD;AAElD,sDAAgD;AAEhD;;;;GAIG;AACH,SAAgB,SAAS,CAAC,OAAe;IACxC,OAAO,KAAK,EAAE,IAAU,EAAE,OAAyB,EAAE,EAAE;QACtD,OAAO,IAAA,2BAAe,EAAC,CAAC,SAA8B,EAAE,EAAE;YACzD,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;YAEvD,MAAM,OAAO,GAAkC,IAAA,wBAAU,EAAC,OAAO,EAAE,SAAS,CAAC,CAAC;YAE9E,IAAI,CAAC,OAAO,EAAE;gBACb,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;gBAC5D,OAAO;aACP;YAED,MAAM,aAAa,GAA8B,IAAA,oCAAuB,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAE3F,MAAM,MAAM,GAA0B,aAAa,CAAC,QAAQ,CAA0B,CAAC;YAEvF,IAAI,CAAC,MAAM,EAAE;gBACZ,aAAa,CAAC,QAAQ,CAAC,GAAG,sBAAa,CAAC;gBACxC,OAAO;aACP;YAED,aAAa,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,sBAAa,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QAC9E,CAAC,CAAC,CAAC;IACJ,CAAC,CAAA;AACF,CAAC;AAxBD,8BAwBC"}
+{"version":3,"file":"add-assets.js","sourceRoot":"","sources":["../../../../../../libs/add/schematics/ng-add/steps/add-assets.ts"],"names":[],"mappings":";;;AAAA,wDAAgE;AAGhE,qEAA8G;AAE9G,gDAAkD;AAElD,sDAAgD;AAEhD;;;;GAIG;AACH,SAAgB,SAAS,CAAC,OAAe;IACxC,OAAO,KAAK,EAAE,IAAU,EAAE,OAAyB,EAAE,EAAE;QACtD,OAAO,IAAA,2BAAe,EAAC,CAAC,SAA8B,EAAE,EAAE;YACzD,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;YAEvD,MAAM,OAAO,GAAkC,IAAA,wBAAU,EAAC,OAAO,EAAE,SAAS,CAAC,CAAC;YAE9E,IAAI,CAAC,OAAO,EAAE;gBACb,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;gBAC5D,OAAO;aACP;YAED,MAAM,aAAa,GAA8B,IAAA,oCAAuB,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAE3F,MAAM,MAAM,GAA0B,aAAa,CAAC,QAAQ,CAA0B,CAAC;YACvF,MAAM,cAAc,GAA0B,aAAa,CAAC,6BAA6B,CAA0B,CAAC;YAEpH,IAAI,CAAC,MAAM,EAAE;gBACZ,aAAa,CAAC,QAAQ,CAAC,GAAG,sBAAa,CAAC;gBACxC,OAAO;aACP;YAED,IAAI,CAAC,cAAc,EAAE;gBACpB,aAAa,CAAC,6BAA6B,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;gBAChE,OAAO;aACP;YAED,aAAa,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,sBAAa,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YAC7E,aAAa,CAAC,6BAA6B,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,cAAc,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC;QACzG,CAAC,CAAC,CAAC;IACJ,CAAC,CAAA;AACF,CAAC;AA/BD,8BA+BC"}

package/schematics/ng-add/steps/update-app-ts-config.d.ts

@@ -0,0 +1,7 @@
+import { Rule } from '@angular-devkit/schematics';
+import { Schema } from '../schema';
+/**
+ *
+ * @param options
+ */
+export declare function updateAppTsConfig(options: Schema): Rule;

package/schematics/ng-add/steps/update-app-ts-config.js

@@ -0,0 +1,51 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateAppTsConfig = void 0;
+const workspace_1 = require("@schematics/angular/utility/workspace");
+const ng_morph_1 = require("ng-morph");
+const get_project_1 = require("../utils/get-project");
+/**
+ *
+ * @param options
+ */
+function updateAppTsConfig(options) {
+    return async (tree, context) => {
+        return (0, workspace_1.updateWorkspace)((workspace) => {
+            context.logger.info(`[INFO]: Updating application tsconfig...`);
+            const project = (0, get_project_1.getProject)(options, workspace);
+            if (!project) {
+                context.logger.warn(`[WARNING]: Target project not found.`);
+                return;
+            }
+            const buildTarget = project.targets.get('build');
+            const serveTarget = project.targets.get('serve');
+            if (buildTarget) {
+                const tsConfigPath = buildTarget.options && buildTarget.options['tsConfig'];
+                tsConfigPath && updateTsConfig(tree, String(tsConfigPath));
+            }
+            else {
+                context.logger.warn(`[WARNING]: "build" target was not found.`);
+            }
+            if (serveTarget) {
+                const tsConfigPath = serveTarget.options && serveTarget.options['tsConfig'];
+                tsConfigPath && updateTsConfig(tree, String(tsConfigPath));
+            }
+            else {
+                context.logger.warn(`[WARNING]: "serve" target was not found.`);
+            }
+        });
+    };
+}
+exports.updateAppTsConfig = updateAppTsConfig;
+/**
+ *
+ * @param tree
+ * @param path
+ * @param filePath
+ * @param projectName
+ */
+function updateTsConfig(tree, filePath) {
+    const json = new ng_morph_1.JSONFile(tree, filePath);
+    json.modify(['compilerOptions', 'allowSyntheticDefaultImports'], true);
+}
+//# sourceMappingURL=update-app-ts-config.js.map

package/schematics/ng-add/steps/update-app-ts-config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-app-ts-config.js","sourceRoot":"","sources":["../../../../../../libs/add/schematics/ng-add/steps/update-app-ts-config.ts"],"names":[],"mappings":";;;AACA,qEAK+C;AAC/C,uCAAkC;AAGlC,sDAAgD;AAEhD;;;GAGG;AACH,SAAgB,iBAAiB,CAAC,OAAe;IAChD,OAAO,KAAK,EAAE,IAAU,EAAE,OAAyB,EAAE,EAAE;QACtD,OAAO,IAAA,2BAAe,EAAC,CAAC,SAA8B,EAAE,EAAE;YACzD,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,0CAA0C,CAAC,CAAC;YAEhE,MAAM,OAAO,GAAkC,IAAA,wBAAU,EAAC,OAAO,EAAE,SAAS,CAAC,CAAC;YAE9E,IAAI,CAAC,OAAO,EAAE;gBACb,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;gBAC5D,OAAO;aACP;YAED,MAAM,WAAW,GAAiC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC/E,MAAM,WAAW,GAAiC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAE/E,IAAI,WAAW,EAAE;gBAChB,MAAM,YAAY,GACjB,WAAW,CAAC,OAAO,IAAK,WAAW,CAAC,OAAO,CAAC,UAAU,CAAY,CAAC;gBAEpE,YAAY,IAAI,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC;aAC3D;iBAAM;gBACN,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,0CAA0C,CAAC,CAAC;aAChE;YAED,IAAI,WAAW,EAAE;gBAChB,MAAM,YAAY,GACjB,WAAW,CAAC,OAAO,IAAK,WAAW,CAAC,OAAO,CAAC,UAAU,CAAY,CAAC;gBAEpE,YAAY,IAAI,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC;aAC3D;iBAAM;gBACN,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,0CAA0C,CAAC,CAAC;aAChE;QACF,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC;AACH,CAAC;AAlCD,8CAkCC;AAED;;;;;;GAMG;AACH,SAAS,cAAc,CAAC,IAAU,EAAE,QAAgB;IACnD,MAAM,IAAI,GAAa,IAAI,mBAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAEpD,IAAI,CAAC,MAAM,CAAC,CAAC,iBAAiB,EAAE,8BAA8B,CAAC,EAAE,IAAI,CAAC,CAAC;AACxE,CAAC"}