@ng-doc/builder 17.6.7 → 17.6.9

package/application/schema.json

@@ -611,14 +611,14 @@
             },
             "output": {
               "type": "string",
+              "default": "",
               "description": "Absolute path within the output."
             }
           },
           "additionalProperties": false,
           "required": [
             "glob",
-            "input",
-            "output"
+            "input"
           ]
         },
         {

package/dev-server/index.js

@@ -5,7 +5,7 @@ const architect_1 = require("@angular-devkit/architect");
 const dev_server_1 = require("@angular-devkit/build-angular/src/builders/dev-server");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
-const build_ng_doc_1 = require("../engine/build-ng-doc");
+const engine_1 = require("../engine");
 const helpers_1 = require("../helpers");
 const patch_builder_context_1 = require("./patch-builder-context");
 /**
@@ -28,7 +28,7 @@ function runDevServer(options, context) {
     return options$.pipe((0, operators_1.switchMap)((targetOptions) => {
         var _a;
         const builderContext = (0, helpers_1.createBuilderContext)(targetOptions, context, (_a = options.ngDoc) === null || _a === void 0 ? void 0 : _a.config);
-        const buildNgDoc$ = (0, build_ng_doc_1.buildNgDoc)(builderContext).pipe((0, operators_1.shareReplay)(1));
+        const buildNgDoc$ = (0, engine_1.buildNgDoc)(builderContext).pipe((0, operators_1.shareReplay)(1));
         return buildNgDoc$.pipe((0, operators_1.first)(), (0, operators_1.switchMap)(() => (0, rxjs_1.combineLatest)([buildNgDoc$, (0, dev_server_1.executeDevServer)(options, contextWithPatch)]).pipe((0, operators_1.map)(([, devServerOutput]) => devServerOutput))));
     }));
 }

package/dev-server/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../libs/builder/dev-server/index.ts"],"names":[],"mappings":";;;AAAA,yDAAkG;AAElG,sFAAyF;AAEzF,+BAA2D;AAC3D,8CAAoE;AAEpE,yDAAoD;AACpD,wCAAkD;AAElD,mEAA8D;AAE9D;;;;GAIG;AACH,SAAgB,YAAY,CAC3B,OAAoB,EACpB,OAAuB;IAEvB,MAAM,gBAAgB,GAAG,IAAA,2CAAmB,EAAC,OAAO,EAAE;QACrD,IAAI,EAAE,CAAC,6BAA6B,EAAE,iCAAiC,CAAC;QACxE,IAAI,EAAE,2CAA2C;QACjD,gBAAgB,EAAE,CAAC,OAA6B,EAAE,EAAE;YACnD,OAAO,OAAO,CAAC,KAAK,CAAC;QACtB,CAAC;KACD,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,OAAO,CAAC,WAAW,IAAI,IAAA,kCAAsB,EAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAClF,MAAM,QAAQ,GAA2B,MAAM;QAC9C,CAAC,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;QACxC,CAAC,CAAC,IAAA,SAAE,EAAC,OAAgC,CAAC,CAAC;IAExC,OAAO,QAAQ,CAAC,IAAI,CACnB,IAAA,qBAAS,EAAC,CAAC,aAAa,EAAE,EAAE;;QAC3B,MAAM,cAAc,GAAG,IAAA,8BAAoB,EAAC,aAAa,EAAE,OAAO,EAAE,MAAA,OAAO,CAAC,KAAK,0CAAE,MAAM,CAAC,CAAC;QAC3F,MAAM,WAAW,GAAG,IAAA,yBAAU,EAAC,cAAc,CAAC,CAAC,IAAI,CAAC,IAAA,uBAAW,EAAC,CAAC,CAAC,CAAC,CAAC;QACpE,OAAO,WAAW,CAAC,IAAI,CACtB,IAAA,iBAAK,GAAE,EACP,IAAA,qBAAS,EAAC,GAAG,EAAE,CACd,IAAA,oBAAa,EAAC,CAAC,WAAW,EAAE,IAAA,6BAAgB,EAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,IAAI,CAC7E,IAAA,eAAG,EAAC,CAAC,CAAC,EAAE,eAAe,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,CAC7C,CACD,CACD,CAAC;IACH,CAAC,CAAC,CACF,CAAC;AACH,CAAC;AA/BD,oCA+BC;AAED,6DAA6D;AAC7D,aAAa;AACb,kBAAe,IAAA,yBAAa,EAAC,YAAY,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../libs/builder/dev-server/index.ts"],"names":[],"mappings":";;;AAAA,yDAAkG;AAElG,sFAAyF;AAEzF,+BAA2D;AAC3D,8CAAoE;AAEpE,sCAAuC;AACvC,wCAAkD;AAElD,mEAA8D;AAE9D;;;;GAIG;AACH,SAAgB,YAAY,CAC3B,OAAoB,EACpB,OAAuB;IAEvB,MAAM,gBAAgB,GAAG,IAAA,2CAAmB,EAAC,OAAO,EAAE;QACrD,IAAI,EAAE,CAAC,6BAA6B,EAAE,iCAAiC,CAAC;QACxE,IAAI,EAAE,2CAA2C;QACjD,gBAAgB,EAAE,CAAC,OAA6B,EAAE,EAAE;YACnD,OAAO,OAAO,CAAC,KAAK,CAAC;QACtB,CAAC;KACD,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,OAAO,CAAC,WAAW,IAAI,IAAA,kCAAsB,EAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAClF,MAAM,QAAQ,GAA2B,MAAM;QAC9C,CAAC,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;QACxC,CAAC,CAAC,IAAA,SAAE,EAAC,OAAgC,CAAC,CAAC;IAExC,OAAO,QAAQ,CAAC,IAAI,CACnB,IAAA,qBAAS,EAAC,CAAC,aAAa,EAAE,EAAE;;QAC3B,MAAM,cAAc,GAAG,IAAA,8BAAoB,EAAC,aAAa,EAAE,OAAO,EAAE,MAAA,OAAO,CAAC,KAAK,0CAAE,MAAM,CAAC,CAAC;QAC3F,MAAM,WAAW,GAAG,IAAA,mBAAU,EAAC,cAAc,CAAC,CAAC,IAAI,CAAC,IAAA,uBAAW,EAAC,CAAC,CAAC,CAAC,CAAC;QACpE,OAAO,WAAW,CAAC,IAAI,CACtB,IAAA,iBAAK,GAAE,EACP,IAAA,qBAAS,EAAC,GAAG,EAAE,CACd,IAAA,oBAAa,EAAC,CAAC,WAAW,EAAE,IAAA,6BAAgB,EAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,IAAI,CAC7E,IAAA,eAAG,EAAC,CAAC,CAAC,EAAE,eAAe,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,CAC7C,CACD,CACD,CAAC;IACH,CAAC,CAAC,CACF,CAAC;AACH,CAAC;AA/BD,oCA+BC;AAED,6DAA6D;AAC7D,aAAa;AACb,kBAAe,IAAA,yBAAa,EAAC,YAAY,CAAC,CAAC"}

package/dev-server/schema.json

@@ -4,12 +4,6 @@
   "description": "NgDocBuilder DevServer Schema",
   "type": "object",
   "properties": {
-    "browserTarget": {
-      "type": "string",
-      "description": "A browser builder target to serve in the format of `project:target[:configuration]`. You can also pass in more than one configuration name as a comma-separated list. Example: `project:target:production,staging`.",
-      "pattern": "^[^:\\s]+:[^:\\s]+(:[^\\s]+)?$",
-      "x-deprecated": "Use 'buildTarget' instead."
-    },
     "buildTarget": {
       "type": "string",
       "description": "A build builder target to serve in the format of `project:target[:configuration]`. You can also pass in more than one configuration name as a comma-separated list. Example: `project:target:production,staging`.",
@@ -67,27 +61,10 @@
       "description": "Whether to reload the page on change, using live-reload.",
       "default": true
     },
-    "publicHost": {
-      "type": "string",
-      "description": "The URL that the browser client (or live-reload client, if enabled) should use to connect to the development server. Use for a complex dev server setup, such as one with reverse proxies. This option has no effect when using the 'application' or other esbuild-based builders."
-    },
-    "allowedHosts": {
-      "type": "array",
-      "description": "List of hosts that are allowed to access the dev server. This option has no effect when using the 'application' or other esbuild-based builders.",
-      "default": [],
-      "items": {
-        "type": "string"
-      }
-    },
     "servePath": {
       "type": "string",
       "description": "The pathname where the application will be served."
     },
-    "disableHostCheck": {
-      "type": "boolean",
-      "description": "Don't verify connected clients are part of allowed hosts. This option has no effect when using the 'application' or other esbuild-based builders.",
-      "default": false
-    },
     "hmr": {
       "type": "boolean",
       "description": "Enable hot module replacement.",
@@ -102,13 +79,9 @@
       "type": "number",
       "description": "Enable and define the file watching poll time period in milliseconds."
     },
-    "forceEsbuild": {
-      "type": "boolean",
-      "description": "Force the development server to use the 'browser-esbuild' builder when building. This is a developer preview option for the esbuild-based build system.",
-      "default": false
-    },
     "prebundle": {
-      "description": "Enable and control the Vite-based development server's prebundling capabilities. To enable prebundling, the Angular CLI cache must also be enabled. This option has no effect when using the 'browser' or other Webpack-based builders.",
+      "description": "Enable and control the Vite-based development server's prebundling capabilities. To enable prebundling, the Angular CLI cache must also be enabled.",
+      "default": true,
       "oneOf": [
         {
           "type": "boolean"
@@ -142,16 +115,7 @@
     }
   },
   "additionalProperties": true,
-  "anyOf": [
-    {
-      "required": [
-        "buildTarget"
-      ]
-    },
-    {
-      "required": [
-        "browserTarget"
-      ]
-    }
+  "required": [
+    "buildTarget"
   ]
 }

package/engine/entities/category.entity.js

@@ -83,6 +83,7 @@ let NgDocCategoryEntity = (() => {
             const result = (0, nunjucks_1.renderTemplate)('./category.ts.nunj', {
                 context: {
                     category: this,
+                    outFolder: path.dirname(this.modulePath),
                 },
             });
             return (0, rxjs_1.of)({

package/engine/entities/category.entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"category.entity.js","sourceRoot":"","sources":["../../../../../libs/builder/engine/entities/category.entity.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"category.entity.js","sourceRoot":"","sources":["../../../../../libs/builder/engine/entities/category.entity.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ng-doc/builder",
-  "version": "17.6.7",
+  "version": "17.6.9",
   "type": "commonjs",
   "builders": "./builders.json",
   "schematics": "./schematics/collection.json",
@@ -11,8 +11,8 @@
     ]
   },
   "dependencies": {
-    "@ng-doc/core": "17.6.7",
-    "@ng-doc/utils": "17.6.7",
+    "@ng-doc/core": "17.6.9",
+    "@ng-doc/utils": "17.6.9",
     "@angular-devkit/architect": ">=0.1700.0",
     "@angular-devkit/build-angular": ">=17.0.0",
     "chokidar": "3.5.3",

package/templates/category.ts.nunj

@@ -12,7 +12,7 @@ const routes: Routes = [
             {%- for child in category.builtChildren %}
             {
                 path: '{{ child.route }}',
-                loadChildren: () => import('{{ child.moduleImport }}')
+                loadChildren: () => import('./{{ outFolder | createImportPath(child.moduleImport) }}')
             },
             {%- endfor %}
         ]