Ng11 (#536)

* ng11 update

angular.json

@@ -145,7 +145,7 @@
       },
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-ng-packagr:build",
+          "builder": "@angular-devkit/build-angular:ng-packagr",
           "options": {
             "tsConfig": "projects/swimlane/ngx-ui/tsconfig.lib.json",
             "project": "projects/swimlane/ngx-ui/ng-package.json"

package.json

@@ -35,16 +35,16 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "~10.1.0",
+    "@angular/animations": "~11.0.5",
     "@angular/cdk": "~9.2.1",
-    "@angular/common": "~10.1.0",
-    "@angular/compiler": "~10.1.0",
-    "@angular/core": "~10.1.0",
+    "@angular/common": "~11.0.5",
+    "@angular/compiler": "~11.0.5",
+    "@angular/core": "~11.0.5",
     "@angular/flex-layout": "9.0.0-beta.29",
-    "@angular/forms": "~10.1.0",
-    "@angular/platform-browser": "~10.1.0",
-    "@angular/router": "~10.1.0",
-    "@swimlane/ng2-file-upload": "^1.0.1",
+    "@angular/forms": "~11.0.5",
+    "@angular/platform-browser": "~11.0.5",
+    "@angular/router": "~11.0.5",
+    "@swimlane/ng2-file-upload": "1.1.0",
     "@types/json-schema": "^7.0.4",
     "ajv": "^6.5.5",
     "codemirror": "^5.49.2",
@@ -58,19 +58,18 @@
     "tslib": "^2.0.0"
   },
   "devDependencies": {
-    "@angular-builders/custom-webpack": "^10.0.1",
-    "@angular-devkit/build-angular": "~0.1001.0",
-    "@angular-devkit/build-ng-packagr": "~0.1001.0",
-    "@angular/cli": "~10.1.0",
-    "@angular/compiler-cli": "^10.1.0",
-    "@angular/language-service": "~10.1.0",
-    "@angular/platform-browser-dynamic": "^10.1.0",
+    "@angular-builders/custom-webpack": "^11.0.0",
+    "@angular-devkit/build-angular": "~0.1100.5",
+    "@angular/cli": "~11.0.5",
+    "@angular/compiler-cli": "^11.0.5",
+    "@angular/language-service": "~11.0.5",
+    "@angular/platform-browser-dynamic": "^11.0.5",
     "@ngneat/spectator": "^5.13.3",
     "@open-wc/semantic-dom-diff": "^0.19.3",
     "@swimlane/prettier-config-swimlane": "^3.0.2",
     "@types/codemirror": "0.0.80",
     "@types/faker": "^4.1.11",
-    "@types/jasmine": "^3.5.10",
+    "@types/jasmine": "~3.6.0",
     "@types/jasminewd2": "^2.0.8",
     "@types/moment-timezone": "^0.5.13",
     "@types/mousetrap": "^1.6.3",
@@ -79,27 +78,26 @@
     "angular-cli-ghpages": "^0.6.2",
     "autoprefixer": "^9.3.1",
     "clean-css": "^4.2.3",
-    "codelyzer": "^5.1.2",
+    "codelyzer": "^6.0.0",
     "core-js": "^2.6.11",
     "cpx": "^1.5.0",
     "cross-env": "^7.0.2",
     "cypress": "^5.2.0",
     "faker": "^5.1.0",
     "gh-pages": "^2.2.0",
     "husky": "^4.2.4",
-    "jasmine-core": "~3.5.0",
+    "jasmine-core": "~3.6.0",
     "jasmine-spec-reporter": "~5.0.0",
-    "karma": "~5.0.0",
+    "karma": "~5.1.1",
     "karma-chrome-launcher": "~3.1.0",
-    "karma-coverage-istanbul-reporter": "~3.0.2",
+    "karma-coverage": "^2.0.3",
     "karma-jasmine": "~4.0.0",
     "karma-jasmine-html-reporter": "^1.5.0",
     "moment": "^2.22.2",
     "moment-locales-webpack-plugin": "^1.2.0",
     "moment-timezone-data-webpack-plugin": "^1.3.0",
-    "ng-packagr": "^10.1.0",
+    "ng-packagr": "^11.0.3",
     "ngx-moment": "^3.5.0",
-    "node-sass": "^4.14.1",
     "npm-run-all": "^4.1.5",
     "postcss": "^7.0.27",
     "postcss-url": "^8.0.0",
@@ -113,6 +111,7 @@
     "tslint-config-security": "^1.16.0",
     "tslint-config-swimlane": "^5.0.0",
     "typescript": "^4.0.2",
+    "webpack": "^4.44.2",
     "webpack-bundle-analyzer": "^3.9.0",
     "zone.js": "~0.10.3"
   },

projects/swimlane/ngx-ui/karma.conf.js

@@ -9,27 +9,16 @@ module.exports = function (config) {
       require('karma-jasmine'),
       require('karma-chrome-launcher'),
       require('karma-jasmine-html-reporter'),
-      require('karma-coverage-istanbul-reporter'),
+      require('karma-coverage'),
       require('@angular-devkit/build-angular/plugins/karma')
     ],
     client: {
       clearContext: false // leave Jasmine Spec Runner output visible in browser
     },
-    coverageIstanbulReporter: {
-      dir: require('path').join(__dirname, '../../../coverage'),
-      reports: ['html', 'lcovonly'],
-      fixWebpackSourcePaths: true,
-      skipFilesWithNoCoverage: true
-      // thresholds: {
-      //   each: {
-      //     statements: 80,
-      //     lines: 80,
-      //     branches: 80,
-      //     functions: 80
-      //   }
-      // }
+    reporters: ['progress', 'coverage'],
+    preprocessors: {
+      'src/**/*.js': ['coverage']
     },
-    reporters: ['progress', 'kjhtml'],
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,
@@ -41,6 +30,10 @@ module.exports = function (config) {
         flags: ['--no-sandbox', '--disable-gpu']
       }
     },
-    singleRun: true
+    singleRun: true,
+    coverageReporter: {
+      type: 'html',
+      dir: require('path').join(__dirname, '../../../coverage')
+    }
   });
 };

projects/swimlane/ngx-ui/package.json

@@ -46,7 +46,7 @@
   },
   "dependencies": {
     "mousetrap": "^1.6.2",
-    "@swimlane/ng2-file-upload": "^1.0.1",
+    "@swimlane/ng2-file-upload": "1.1.0",
     "normalize.css": "^5.0.0",
     "tslib": "^2.0.0"
   },

projects/swimlane/ngx-ui/tsconfig.lib.json

@@ -3,6 +3,7 @@
   "compilerOptions": {
     "outDir": "../../../out-tsc/lib",
     "target": "es2015",
+    "declarationMap": true,
     "module": "es2015",
     "moduleResolution": "node",
     "declaration": true,

projects/swimlane/ngx-ui/tsconfig.lib.prod.json

@@ -1,5 +1,8 @@
 {
   "extends": "./tsconfig.lib.json",
+  "compilerOptions": {
+    "declarationMap": false
+  },
   "angularCompilerOptions": {
     "enableIvy": false
   }

scripts/prep-global-styles.js

@@ -2,7 +2,7 @@
 
 const fs = require('fs');
 const path = require('path');
-const sass = require('node-sass');
+const sass = require('sass');
 const CleanCss = require('clean-css');
 const cpx = require('cpx');
 const postcss = require('postcss');

src/app/app.routing.module.ts

@@ -143,7 +143,7 @@ const routes: Routes = [
 ];
 
 @NgModule({
-  imports: [RouterModule.forRoot(routes)],
+  imports: [RouterModule.forRoot(routes, { relativeLinkResolution: 'legacy' })],
   exports: [RouterModule]
 })
 export class AppRoutingModule {}

src/karma.conf.js

@@ -9,23 +9,25 @@ module.exports = function (config) {
       require('karma-jasmine'),
       require('karma-chrome-launcher'),
       require('karma-jasmine-html-reporter'),
-      require('karma-coverage-istanbul-reporter'),
+      require('karma-coverage'),
       require('@angular-devkit/build-angular/plugins/karma')
     ],
     client: {
       clearContext: false // leave Jasmine Spec Runner output visible in browser
     },
-    coverageIstanbulReporter: {
-      dir: require('path').join(__dirname, '../coverage'),
-      reports: ['html', 'lcovonly'],
-      fixWebpackSourcePaths: true
-    },
-    reporters: ['progress', 'kjhtml'],
+    reporters: ['progress', 'coverage'],
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,
     autoWatch: true,
     browsers: ['Chrome'],
-    singleRun: false
+    singleRun: false,
+    preprocessors: {
+      'src/**/*.js': ['coverage']
+    },
+    coverageReporter: {
+      type: 'html',
+      dir: 'coverage/'
+    }
   });
 };