feat: align with angular 15

manfredsteyer · Nov 17, 2022 · d519571 · d519571
1 parent 65165ee
commit d519571
Show file tree

Hide file tree

Showing 8 changed files with 83 additions and 53 deletions.
diff --git a/lib/README.md b/lib/README.md
@@ -17,13 +17,14 @@ Big thanks to [Rob Wormald](https://twitter.com/robwormald) and [David Herges](h
 ## Get the right version
 
 - Angular 6-7/ CLI 6-7: ngx-build-plus@^7
-- Angular 8/ CLI 8: ngx-build-plus^8.0.0
-- Angular 9/ CLI 9: ngx-build-plus^9.0.0
-- Angular 10/ CLI 10: ngx-build-plus^10.0.0
-- Angular 11/ CLI 11: ngx-build-plus^11.0.0
-- Angular 12/ CLI 12: ngx-build-plus^12.0.0
-- Angular 13/ CLI 13: ngx-build-plus^13.0.0
-- Angular 14/ CLI 14: ngx-build-plus^14.0.0
+- Angular 8/ CLI 8: ngx-build-plus@^8.0.0
+- Angular 9/ CLI 9: ngx-build-plus@^9.0.0
+- Angular 10/ CLI 10: ngx-build-plus@^10.0.0
+- Angular 11/ CLI 11: ngx-build-plus@^11.0.0
+- Angular 12/ CLI 12: ngx-build-plus@^12.0.0
+- Angular 13/ CLI 13: ngx-build-plus@^13.0.0
+- Angular 14/ CLI 14: ngx-build-plus@^14.0.0
+- Angular 15/ CLI 15: ngx-build-plus@^15.0.0
 
 ## Updating to Version 8
 

diff --git a/lib/package.json b/lib/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ngx-build-plus",
-  "version": "14.0.0",
+  "version": "15.0.0",
   "description": "Extends the Angular CLI's build process",
   "license": "MIT",
   "repository": {
@@ -21,12 +21,12 @@
     "build": "npm run tsc && npm run copy:sample && npm run copy:readme"
   },
   "dependencies": {
-    "@schematics/angular": ">=14.0.0",
-    "@angular-devkit/build-angular": ">=14.0.0",
+    "@schematics/angular": ">=15.0.0",
+    "@angular-devkit/build-angular": ">=15.0.0",
     "webpack-merge": "^5.0.0"
   },
   "peerDependencies": {
-    "@angular-devkit/build-angular": ">=12.0.0",
+    "@angular-devkit/build-angular": ">=15.0.0",
     "rxjs": ">= 6.0.0"
   },
   "devDependencies": {

diff --git a/lib/src/browser/schema.json b/lib/src/browser/schema.json
@@ -40,6 +40,7 @@
       "description": "Used conjunction with 'singleBundle' to explizitly bundle styles",
       "default": true
     },
+
     "assets": {
       "type": "array",
       "description": "List of static application assets.",
@@ -53,8 +54,22 @@
       "description": "The full path for the main entry point to the app, relative to the current workspace."
     },
     "polyfills": {
-      "type": "string",
-      "description": "The full path for the polyfills file, relative to the current workspace."
+      "description": "Polyfills to be included in the build.",
+      "oneOf": [
+        {
+          "type": "array",
+          "description": "A list of polyfills to include in the build. Can be a full path for a file, relative to the current workspace or module specifier. Example: 'zone.js'.",
+          "items": {
+            "type": "string",
+            "uniqueItems": true
+          },
+          "default": []
+        },
+        {
+          "type": "string",
+          "description": "The full path for the polyfills file, relative to the current workspace or a module specifier. Example: 'zone.js'."
+        }
+      ]
     },
     "tsConfig": {
       "type": "string",
@@ -108,7 +123,7 @@
               "input": {
                 "type": "string",
                 "description": "The file to include.",
-                "pattern": "\\.(?:css|scss|sass|less|styl)$"
+                "pattern": "\\.(?:css|scss|sass|less)$"
               },
               "bundleName": {
                 "type": "string",
@@ -127,7 +142,7 @@
           {
             "type": "string",
             "description": "The file to include.",
-            "pattern": "\\.(?:css|scss|sass|less|styl)$"
+            "pattern": "\\.(?:css|scss|sass|less)$"
           }
         ]
       }
@@ -155,8 +170,8 @@
     },
     "optimization": {
       "description": "Enables optimization of the build output. Including minification of scripts and styles, tree-shaking, dead-code elimination, inlining of critical CSS and fonts inlining. For more information, see https://angular.io/guide/workspace-config#optimization-configuration.",
-      "x-user-analytics": 16,
       "default": true,
+      "x-user-analytics": "ep.ng_optimization",
       "oneOf": [
         {
           "type": "object",
@@ -238,7 +253,7 @@
     "aot": {
       "type": "boolean",
       "description": "Build using Ahead of Time compilation.",
-      "x-user-analytics": 13,
+      "x-user-analytics": "ep.ng_aot",
       "default": true
     },
     "sourceMap": {
@@ -278,7 +293,7 @@
     },
     "vendorChunk": {
       "type": "boolean",
-      "description": "Generate a seperate bundle containing only vendor libraries. This option should only used for development.",
+      "description": "Generate a seperate bundle containing only vendor libraries. This option should only be used for development to reduce the incremental compilation time.",
       "default": false
     },
     "commonChunk": {

diff --git a/lib/src/extract-i18n/schema.json b/lib/src/extract-i18n/schema.json
@@ -4,7 +4,6 @@
   "description": "Extract i18n target options for Build Facade.",
   "type": "object",
   "properties": {
-
     "extraWebpackConfig": {
       "type": "string",
       "description": "Additional Webpack Config that gets merged with the default config."
@@ -42,7 +41,7 @@
       "description": "Used conjunction with 'singleBundle' to explizitly bundle styles",
       "default": true
     },
-
+    
     "browserTarget": {
       "type": "string",
       "description": "A browser builder target to extract i18n messages 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`.",

diff --git a/lib/src/karma/schema.json b/lib/src/karma/schema.json
@@ -4,7 +4,6 @@
   "description": "Karma target options for Build Facade.",
   "type": "object",
   "properties": {
-
     "extraWebpackConfig": {
       "type": "string",
       "description": "Additional Webpack Config that gets merged with the default config."
@@ -43,8 +42,22 @@
       "description": "The name of the Karma configuration file."
     },
     "polyfills": {
-      "type": "string",
-      "description": "The name of the polyfills file."
+      "description": "Polyfills to be included in the build.",
+      "oneOf": [
+        {
+          "type": "array",
+          "description": "A list of polyfills to include in the build. Can be a full path for a file, relative to the current workspace or module specifier. Example: 'zone.js'.",
+          "items": {
+            "type": "string",
+            "uniqueItems": true
+          },
+          "default": []
+        },
+        {
+          "type": "string",
+          "description": "The full path for the polyfills file, relative to the current workspace or a module specifier. Example: 'zone.js'."
+        }
+      ]
     },
     "assets": {
       "type": "array",
@@ -102,7 +115,7 @@
               "input": {
                 "type": "string",
                 "description": "The file to include.",
-                "pattern": "\\.(?:css|scss|sass|less|styl)$"
+                "pattern": "\\.(?:css|scss|sass|less)$"
               },
               "bundleName": {
                 "type": "string",
@@ -121,7 +134,7 @@
           {
             "type": "string",
             "description": "The file to include.",
-            "pattern": "\\.(?:css|scss|sass|less|styl)$"
+            "pattern": "\\.(?:css|scss|sass|less)$"
           }
         ]
       }
@@ -152,6 +165,7 @@
       "items": {
         "type": "string"
       },
+      "default": ["**/*.spec.ts"],
       "description": "Globs of files to include, relative to workspace or project root. \nThere are 2 special cases:\n - when a path to directory is provided, all spec files ending \".spec.@(ts|tsx)\" will be included\n - when a path to a file is provided, and a matching spec file exists it will be included instead."
     },
     "sourceMap": {
@@ -266,7 +280,7 @@
     }
   },
   "additionalProperties": false,
-  "required": ["main", "tsConfig", "karmaConfig"],
+  "required": ["tsConfig"],
   "definitions": {
     "assetPattern": {
       "oneOf": [

diff --git a/lib/src/plus-dev-server/schema.json b/lib/src/plus-dev-server/schema.json
@@ -23,21 +23,25 @@
       "description": "es module exporting a configHook function (default export).",
       "default": ""
     },
+
     "plugin": {
       "type": "string",
       "description": "es module exporting a Plugin object (default export). Just used for ng build; not for ng serve",
       "default": ""
     },
+
     "bundleStyles": {
       "type": "boolean",
       "description": "DEPRECATED: Use keepStyles instead",
       "default": true
     },
+
     "keepStyles": {
       "type": "boolean",
       "description": "Used conjunction with 'singleBundle' to explizitly bundle styles",
       "default": true
     },
+
     "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`.",

diff --git a/lib/src/server/schema.json b/lib/src/server/schema.json
@@ -4,7 +4,6 @@
   "title": "Universal Target",
   "type": "object",
   "properties": {
-
     "extraWebpackConfig": {
       "type": "string",
       "description": "Additional Webpack Config that gets merged with the default config."
@@ -42,8 +41,7 @@
       "description": "Used conjunction with 'singleBundle' to explizitly bundle styles",
       "default": true
     },
-
-
+
     "main": {
       "type": "string",
       "description": "The name of the main entry-point file."
@@ -76,8 +74,8 @@
     },
     "optimization": {
       "description": "Enables optimization of the build output. Including minification of scripts and styles, tree-shaking and dead-code elimination. For more information, see https://angular.io/guide/workspace-config#optimization-configuration.",
-      "x-user-analytics": 16,
       "default": true,
+      "x-user-analytics": "ep.ng_optimization",
       "oneOf": [
         {
           "type": "object",
@@ -114,8 +112,7 @@
     },
     "resourcesOutputPath": {
       "type": "string",
-      "description": "The path where style resources will be placed, relative to outputPath.",
-      "default": ""
+      "description": "The path where style resources will be placed, relative to outputPath."
     },
     "sourceMap": {
       "description": "Output source maps for scripts and styles. For more information, see https://angular.io/guide/workspace-config#source-map-configuration.",
@@ -154,7 +151,13 @@
     },
     "deployUrl": {
       "type": "string",
-      "description": "URL where files will be deployed."
+      "description": "URL where files will be deployed.",
+      "x-deprecated": "Use \"baseHref\" browser builder option, \"APP_BASE_HREF\" DI token or a combination of both instead. For more information, see https://angular.io/guide/deployment#the-deploy-url."
+    },
+    "vendorChunk": {
+      "type": "boolean",
+      "description": "Generate a seperate bundle containing only vendor libraries. This option should only be used for development to reduce the incremental compilation time.",
+      "default": false
     },
     "verbose": {
       "type": "boolean",
@@ -172,6 +175,12 @@
       "enum": ["warning", "error", "ignore"],
       "default": "warning"
     },
+    "i18nDuplicateTranslation": {
+      "type": "string",
+      "description": "How to handle duplicate translations for i18n.",
+      "enum": ["warning", "error", "ignore"],
+      "default": "warning"
+    },
     "localize": {
       "description": "Translate the bundles in one or more locales.",
       "oneOf": [
@@ -215,19 +224,6 @@
       "description": "Use file name for lazy loaded chunks.",
       "default": false
     },
-    "bundleDependencies": {
-      "description": "Which external dependencies to bundle into the bundle. By default, all of node_modules will be bundled.",
-      "default": true,
-      "oneOf": [
-        {
-          "type": "boolean"
-        },
-        {
-          "type": "string",
-          "enum": ["none", "all"]
-        }
-      ]
-    },
     "externalDependencies": {
       "description": "Exclude the listed external dependencies from being bundled into the bundle. Instead, the created bundle relies on these dependencies to be available during runtime.",
       "type": "array",

diff --git a/readme.md b/readme.md
@@ -17,13 +17,14 @@ Big thanks to [Rob Wormald](https://twitter.com/robwormald) and [David Herges](h
 ## Get the right version
 
 - Angular 6-7/ CLI 6-7: ngx-build-plus@^7
-- Angular 8/ CLI 8: ngx-build-plus^8.0.0
-- Angular 9/ CLI 9: ngx-build-plus^9.0.0
-- Angular 10/ CLI 10: ngx-build-plus^10.0.0
-- Angular 11/ CLI 11: ngx-build-plus^11.0.0
-- Angular 12/ CLI 12: ngx-build-plus^12.0.0
-- Angular 13/ CLI 13: ngx-build-plus^13.0.0
-- Angular 14/ CLI 14: ngx-build-plus^14.0.0
+- Angular 8/ CLI 8: ngx-build-plus@^8.0.0
+- Angular 9/ CLI 9: ngx-build-plus@^9.0.0
+- Angular 10/ CLI 10: ngx-build-plus@^10.0.0
+- Angular 11/ CLI 11: ngx-build-plus@^11.0.0
+- Angular 12/ CLI 12: ngx-build-plus@^12.0.0
+- Angular 13/ CLI 13: ngx-build-plus@^13.0.0
+- Angular 14/ CLI 14: ngx-build-plus@^14.0.0
+- Angular 15/ CLI 15: ngx-build-plus@^15.0.0
 
 ## Updating to Version 8