Merge branch 'master' into vNext

IgniteUI · Feb 22, 2021 · 9646fb6 · 9646fb6
2 parents 400a05d + 871d95b
commit 9646fb6
Show file tree

Hide file tree

Showing 12 changed files with 122 additions and 93 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,23 @@
+# [7.1.0](https://github.com/IgniteUI/igniteui-cli/compare/v7.0.2...v7.1.0) (2021-02-22)
+
+🎉 This update includes Ignite UI for Angular version [11.1.0](https://github.com/IgniteUI/igniteui-angular/releases/tag/11.1.0) and Angular version [11.2.0](https://github.com/angular/angular/releases/tag/11.2.0).
+
+## igniteui/cli-core@7.1.0
+
+Note: Version bump only for package igniteui/cli-core
+
+## igniteui/angular-templates@11.1.710
+
+* Add support for Ignite UI for Angular v11.1.0 [#826](https://github.com/IgniteUI/igniteui-cli/pull/826) ([4f5fb7f](https://github.com/IgniteUI/igniteui-cli/commit/4f5fb7f))
+
+## igniteui/angular-schematics@11.1.710
+
+Note: Version bump only for package igniteui/angular-schematics
+
+## igniteui-cli@7.1.0
+
+* Add support for Ignite UI for Angular v11.1.0 [#826](https://github.com/IgniteUI/igniteui-cli/pull/826) ([4f5fb7f](https://github.com/IgniteUI/igniteui-cli/commit/4f5fb7f))
+
 # [7.0.2](https://github.com/IgniteUI/igniteui-cli/compare/v7.0.1...v7.0.2) (2021-01-18)
 
 🎉 This version includes Ignite UI for Angular DV components update to version 11.1.0:

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "igniteui-cli",
-  "version": "7.0.2",
+  "version": "7.1.0",
   "description": "CLI tool for creating Ignite UI projects",
   "keywords": [
     "CLI",
@@ -77,8 +77,8 @@
     "all": true
   },
   "dependencies": {
-    "@igniteui/angular-templates": "~11.0.702",
-    "@igniteui/cli-core": "~7.0.2",
+    "@igniteui/angular-templates": "~11.1.710",
+    "@igniteui/cli-core": "~7.1.0",
     "chalk": "^2.3.2",
     "fs-extra": "^3.0.1",
     "glob": "^7.1.2",

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@igniteui/cli-core",
-  "version": "7.0.2",
+  "version": "7.1.0",
   "description": "Base types and functionality for Ignite UI CLI",
   "main": "index.js",
   "typings": "index.d.ts",

diff --git a/...lates/igx-ts/custom-templates/crm-grid/files/src/app/__path__/__filePrefix__.component.ts b/...lates/igx-ts/custom-templates/crm-grid/files/src/app/__path__/__filePrefix__.component.ts
@@ -80,8 +80,8 @@ export class <%=ClassName%>Component implements OnInit, AfterViewInit {
             if (args.field === 'Deals') { args.cancel = true; }
         };
 
-        this.excelExporter.onColumnExport.subscribe(exporterCb);
-        this.csvExporter.onColumnExport.subscribe(exporterCb);
+        this.excelExporter.columnExporting.subscribe(exporterCb);
+        this.csvExporter.columnExporting.subscribe(exporterCb);
     }
 
     public ngOnInit() {

diff --git a/packages/igx-templates/igx-ts/projects/_base/files/karma.conf.js b/packages/igx-templates/igx-ts/projects/_base/files/karma.conf.js
@@ -13,15 +13,24 @@ module.exports = function (config) {
       require('@angular-devkit/build-angular/plugins/karma')
     ],
     client: {
+      jasmine: {
+        // you can add configuration options for Jasmine here
+        // the possible options are listed at https://jasmine.github.io/api/edge/Configuration.html
+        // for example, you can disable the random execution with `random: false`
+        // or set a specific seed with `seed: 4321`
+      },
       clearContext: false // leave Jasmine Spec Runner output visible in browser
     },
+    jasmineHtmlReporter: {
+      suppressAll: true // removes the duplicated traces
+    },
     coverageReporter: {
-        dir: require('path').join(__dirname, './coverage/test11'),
-        subdir: '.',
-        reporters: [
-          { type: 'html' },
-          { type: 'text-summary' }
-       ],
+      dir: require('path').join(__dirname, './coverage/ng112'),
+      subdir: '.',
+      reporters: [
+        { type: 'html' },
+        { type: 'text-summary' }
+      ]
     },
     reporters: ['progress', 'kjhtml'],
     port: 9876,

diff --git a/packages/igx-templates/igx-ts/projects/_base/files/package.json b/packages/igx-templates/igx-ts/projects/_base/files/package.json
@@ -11,42 +11,43 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "~11.0.0",
-    "@angular/common": "~11.0.0",
-    "@angular/compiler": "~11.0.0",
-    "@angular/core": "~11.0.0",
-    "@angular/forms": "~11.0.0",
-    "@angular/platform-browser": "~11.0.0",
-    "@angular/platform-browser-dynamic": "~11.0.0",
-    "@angular/router": "~11.0.0",
+    "@angular/animations": "~11.2.0",
+    "@angular/common": "~11.2.0",
+    "@angular/compiler": "~11.2.0",
+    "@angular/core": "~11.2.0",
+    "@angular/forms": "~11.2.0",
+    "@angular/platform-browser": "~11.2.0",
+    "@angular/platform-browser-dynamic": "~11.2.0",
+    "@angular/router": "~11.2.0",
     "hammerjs": "^2.0.8",
-    "igniteui-angular": "~11.0.0",
+    "igniteui-angular": "~11.1.0",
     "core-js": "^3.6.5",
     "jszip": "^3.5.0",
     "minireset.css": "~0.0.4",
-    "rxjs": "~6.5.5",
+    "rxjs": "~6.6.0",
     "tslib": "^2.0.0",
     "web-animations-js": "^2.3.2",
-    "zone.js": "~0.10.3"
+    "zone.js": "~0.11.3"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.1100.0",
-    "@angular/cli": "~11.0.0",
-    "@angular/compiler-cli": "~11.0.0",
+    "@angular-devkit/build-angular": "~0.1102.0",
+    "@angular/cli": "~11.2.0",
+    "@angular/compiler-cli": "~11.2.0",
     "@types/jasmine": "~3.6.0",
     "@types/node": "^12.11.1",
     "codelyzer": "^6.0.0",
     "igniteui-cli": "~<%=cliVersion%>",
     "jasmine-core": "~3.6.0",
     "jasmine-spec-reporter": "~5.0.0",
-    "karma": "~5.2.0",
+    "karma": "~6.1.0",
     "karma-chrome-launcher": "~3.1.0",
     "karma-coverage": "~2.0.3",
     "karma-jasmine": "~4.0.0",
     "karma-jasmine-html-reporter": "^1.5.0",
     "protractor": "~7.0.0",
     "ts-node": "~8.3.0",
     "tslint": "~6.1.0",
-    "typescript": "~4.0.2"
+    "typescript": "~4.1.2"
   }
 }
+
diff --git a/packages/igx-templates/igx-ts/projects/_base/files/src/polyfills.ts b/packages/igx-templates/igx-ts/projects/_base/files/src/polyfills.ts
@@ -18,7 +18,9 @@
  * BROWSER POLYFILLS
  */
 
-/** IE11 requires the following for NgClass support on SVG elements */
+/**
+ * IE11 requires the following for NgClass support on SVG elements
+ */
 // import 'classlist.js';  // Run `npm install --save classlist.js`.
 
 /**

diff --git a/packages/igx-templates/igx-ts/projects/_base/files/tsconfig.json b/packages/igx-templates/igx-ts/projects/_base/files/tsconfig.json
@@ -1,7 +1,7 @@
 /* To learn more about this file see: https://angular.io/config/tsconfig. */
 {
-    "compileOnSave": false,
-    "compilerOptions": {
+  "compileOnSave": false,
+  "compilerOptions": {
     "baseUrl": "./",
     "outDir": "./dist/out-tsc",
     "sourceMap": true,
@@ -13,8 +13,11 @@
     "target": "es2015",
     "module": "es2020",
     "lib": [
-  	"es2018",
-  	"dom"
+      "es2018",
+      "dom"
     ]
+  },
+  "angularCompilerOptions": {
+    "enableI18nLegacyMessageIdFormat": false
   }
 }
diff --git a/packages/igx-templates/igx-ts/projects/_base/files/tslint.json b/packages/igx-templates/igx-ts/projects/_base/files/tslint.json
@@ -1,52 +1,37 @@
 {
   "extends": "tslint:recommended",
+  "rulesDirectory": [
+    "codelyzer"
+  ],
   "rules": {
     "align": {
-        "options": [
-          "parameters",
-          "statements"
-        ]
-      },
+      "options": [
+        "parameters",
+        "statements"
+      ]
+    },
     "array-type": false,
-  "arrow-parens": false,
-  "arrow-return-shorthand": true,
+    "arrow-return-shorthand": true,
     "curly": true,
     "deprecation": {
       "severity": "warning"
     },
-    "component-class-suffix": true,
-    "contextual-lifecycle": true,
-    "directive-class-suffix": true,
-    "directive-selector": [
-      true,
-      "attribute",
-      "app",
-      "camelCase"
-    ],
-    "component-selector": [
-      true,
-      "element",
-      "app",
-      "kebab-case"
-    ],
     "eofline": true,
     "import-blacklist": [
       true,
       "rxjs/Rx"
     ],
     "import-spacing": true,
-      "indent": {
-        "options": [
-          "spaces"
-        ]
-      },
-    "interface-name": false,
+    "indent": {
+      "options": [
+        "spaces"
+      ]
+    },
     "max-classes-per-file": false,
     "max-line-length": [
       true,
       140
     ],
-    "member-access": false,
     "member-ordering": [
       true,
       {
@@ -58,7 +43,6 @@
         ]
       }
     ],
-    "no-consecutive-blank-lines": false,
     "no-console": [
       true,
       "debug",
@@ -80,8 +64,6 @@
       true,
       "as-needed"
     ],
-    "object-literal-sort-keys": false,
-    "ordered-imports": false,
     "quotemark": [
       true,
       "single"
@@ -135,7 +117,9 @@
         "check-typecast"
       ]
     },
-    "trailing-comma": false,
+    "component-class-suffix": true,
+    "contextual-lifecycle": true,
+    "directive-class-suffix": true,
     "no-conflicting-lifecycle": true,
     "no-host-metadata-property": true,
     "no-input-rename": true,
@@ -147,9 +131,19 @@
     "template-banana-in-box": true,
     "template-no-negated-async": true,
     "use-lifecycle-interface": true,
-    "use-pipe-transform-interface": true
-  },
-  "rulesDirectory": [
-    "codelyzer"
-  ]
-}
+    "use-pipe-transform-interface": true,
+    "directive-selector": [
+      true,
+      "attribute",
+      "app",
+      "camelCase"
+    ],
+    "component-selector": [
+      true,
+      "element",
+      "app",
+      "kebab-case"
+    ]
+  }
+}
+
diff --git a/packages/igx-templates/igx-ts/projects/side-nav-auth/files/package.json b/packages/igx-templates/igx-ts/projects/side-nav-auth/files/package.json
@@ -11,30 +11,30 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "~11.0.0",
-    "@angular/common": "~11.0.0",
-    "@angular/compiler": "~11.0.0",
-    "@angular/core": "~11.0.0",
-    "@angular/forms": "~11.0.0",
-    "@angular/platform-browser": "~11.0.0",
-    "@angular/platform-browser-dynamic": "~11.0.0",
-	"@angular/router": "~11.0.0",
+    "@angular/animations": "~11.2.0",
+    "@angular/common": "~11.2.0",
+    "@angular/compiler": "~11.2.0",
+    "@angular/core": "~11.2.0",
+    "@angular/forms": "~11.2.0",
+    "@angular/platform-browser": "~11.2.0",
+    "@angular/platform-browser-dynamic": "~11.2.0",
+	"@angular/router": "~11.2.0",
 	"angular-auth-oidc-client": "^9.0.3",
     "hammerjs": "^2.0.8",
-    "igniteui-angular": "~11.0.0",
+    "igniteui-angular": "~11.1.0",
     "core-js": "^3.6.5",
     "jszip": "^3.5.0",
     "minireset.css": "~0.0.4",
-    "rxjs": "~6.5.5",
+    "rxjs": "~6.6.0",
     "tslib": "^2.0.0",
     "web-animations-js": "^2.3.2",
     "zone.js": "~0.10.3"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "~0.1100.0",
-    "@angular/cli": "~11.0.0",
-    "@angular/compiler-cli": "~11.0.0",
-    "@angular/language-service": "~11.0.0",
+    "@angular/cli": "~11.2.0",
+    "@angular/compiler-cli": "~11.2.0",
+    "@angular/language-service": "~11.2.0",
     "@types/facebook-js-sdk": "^2.8.6",
     "@types/hammerjs": "^2.0.35",
     "@types/jasmine": "~3.6.0",
@@ -44,14 +44,14 @@
     "igniteui-cli": "~<%=cliVersion%>",
     "jasmine-core": "~3.6.0",
     "jasmine-spec-reporter": "~5.0.0",
-    "karma": "~5.2.0",
+    "karma": "~6.1.0",
     "karma-chrome-launcher": "~3.1.0",
     "karma-coverage": "~2.0.3",
     "karma-jasmine": "~4.0.0",
     "karma-jasmine-html-reporter": "^1.5.0",
     "protractor": "~7.0.0",
     "ts-node": "~8.3.0",
     "tslint": "~6.1.0",
-    "typescript": "~4.0.2"
+    "typescript": "~4.1.2"
   }
-}
+}
diff --git a/packages/igx-templates/package.json b/packages/igx-templates/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@igniteui/angular-templates",
-  "version": "11.0.702",
+  "version": "11.1.710",
   "description": "Templates for Ignite UI for Angular projects and components",
   "main": "index.js",
   "typings": "index.d.ts",
   "author": "Infragistics",
   "license": "MIT",
   "dependencies": {
-    "@igniteui/cli-core": "~7.0.2",
+    "@igniteui/cli-core": "~7.1.0",
     "typescript": "^3.7.5"
   }
 }