Merge pull request #1113 from SQ-UI/feature/bump-angular-version

Feature/bump angular version
SQ-UI · Jun 8, 2023 · d283bcf · d283bcf
2 parents 827d760 + a290b8f
commit d283bcf
Show file tree

Hide file tree

Showing 85 changed files with 25,180 additions and 27,654 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -29,7 +29,7 @@ jobs:
       - name: Install node.js
         uses: actions/setup-node@v2
         with:
-          node-version: '14'
+          node-version: '18'
           check-latest: true
 
       - name: Install dependencies
@@ -42,10 +42,4 @@ jobs:
         with:
          coverageCommand: npm run coverage
          coverageLocations: |
-            ${{github.workspace}}/coverage/ng-sq-common/lcov.info:lcov
-            ${{github.workspace}}/coverage/ng-datatable/lcov.info:lcov
-            ${{github.workspace}}/coverage/ng-datetime-picker/lcov.info:lcov
-            ${{github.workspace}}/coverage/ng-sq-ui/lcov.info:lcov
-            ${{github.workspace}}/coverage/ng-modal/lcov.info:lcov
-            ${{github.workspace}}/coverage/ng-form-elements/lcov.info:lcov
-            ${{github.workspace}}/coverage/ng-progress-bar/lcov.info:lcov
+            ${{github.workspace}}/coverage/lcov.info:lcov
diff --git a/.gitignore b/.gitignore
@@ -25,6 +25,7 @@
 !.vscode/extensions.json
 
 # misc
+/.angular/cache
 /.sass-cache
 /connect.lock
 /coverage

diff --git a/README.md b/README.md
@@ -35,6 +35,9 @@ Any types of public interfaces and services are also included.
 - [Live examples](http://bit.ly/ng-sq-ui-docs-live-examples)
 - [Troubleshooting](http://bit.ly/ng-sq-ui-docs-troubleshooting)
 
+## BREAKING CHANGES:
+The 2.0.1 relases of all packages are compatible with Angular 14+. If you need a backwards-compatible version, please refer to 1.x.y packages, as stated below.
+
 **Note:**<br>
 For projects that use the View Engine, instead Ivy (Angular 10 ~ Angular 12), please use the following version for each package:
 

diff --git a/angular.json b/angular.json
@@ -77,63 +77,10 @@
           }
         },
         "test": {
-          "builder": "@angular-devkit/build-angular:karma",
+          "builder": "@angular-builders/jest:run",
           "options": {
-            "main": "src/test.ts",
-            "polyfills": "src/polyfills.ts",
-            "tsConfig": "src/tsconfig.spec.json",
-            "karmaConfig": "src/karma.conf.js",
-            "codeCoverage": true,
-            "styles": [
-              "src/styles.scss"
-            ],
-            "scripts": [],
-            "assets": [
-              "src/favicon.ico",
-              "src/assets"
-            ]
-          }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "src/tsconfig.app.json",
-              "src/tsconfig.spec.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
-          }
-        }
-      }
-    },
-    "sq-ui-e2e": {
-      "root": "e2e/",
-      "projectType": "application",
-      "architect": {
-        "e2e": {
-          "builder": "@angular-devkit/build-angular:protractor",
-          "options": {
-            "protractorConfig": "e2e/protractor.conf.js"
-          },
-          "configurations": {
-            "production": {
-              "devServerTarget": "sq-ui:serve:production"
-            },
-            "development": {
-              "devServerTarget": "sq-ui:serve:development"
-            }
-          },
-          "defaultConfiguration": "development"
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": "e2e/tsconfig.e2e.json",
-            "exclude": [
-              "**/node_modules/**"
-            ]
+            "configPath": "../../jest.config.js",
+            "no-cache": true
           }
         }
       }
@@ -159,12 +106,10 @@
           "defaultConfiguration": "production"
         },
         "test": {
-          "builder": "@angular-devkit/build-angular:karma",
+          "builder": "@angular-builders/jest:run",
           "options": {
-            "codeCoverage": true,
-            "main": "projects/ng-sq-ui/src/test.ts",
-            "tsConfig": "projects/ng-sq-ui/tsconfig.spec.json",
-            "karmaConfig": "projects/ng-sq-ui/karma.conf.js"
+            "configPath": "../../jest.config.js",
+            "no-cache": true
           }
         },
         "lint": {
@@ -199,12 +144,10 @@
           "defaultConfiguration": "production"
         },
         "test": {
-          "builder": "@angular-devkit/build-angular:karma",
+          "builder": "@angular-builders/jest:run",
           "options": {
-            "codeCoverage": true,
-            "main": "projects/ng-datetime-picker/src/test.ts",
-            "tsConfig": "projects/ng-datetime-picker/tsconfig.spec.json",
-            "karmaConfig": "projects/ng-datetime-picker/karma.conf.js"
+            "configPath": "../../jest.config.js",
+            "no-cache": true
           }
         },
         "lint": {
@@ -239,12 +182,10 @@
           "defaultConfiguration": "production"
         },
         "test": {
-          "builder": "@angular-devkit/build-angular:karma",
+          "builder": "@angular-builders/jest:run",
           "options": {
-            "codeCoverage": true,
-            "main": "projects/ng-datatable/src/test.ts",
-            "tsConfig": "projects/ng-datatable/tsconfig.spec.json",
-            "karmaConfig": "projects/ng-datatable/karma.conf.js"
+            "configPath": "../../jest.config.js",
+            "no-cache": true
           }
         },
         "lint": {
@@ -279,12 +220,10 @@
           "defaultConfiguration": "production"
         },
         "test": {
-          "builder": "@angular-devkit/build-angular:karma",
+          "builder": "@angular-builders/jest:run",
           "options": {
-            "codeCoverage": true,
-            "main": "projects/ng-sq-common/src/test.ts",
-            "tsConfig": "projects/ng-sq-common/tsconfig.spec.json",
-            "karmaConfig": "projects/ng-sq-common/karma.conf.js"
+            "configPath": "../../jest.config.js",
+            "no-cache": true
           }
         },
         "lint": {
@@ -319,12 +258,10 @@
           "defaultConfiguration": "production"
         },
         "test": {
-          "builder": "@angular-devkit/build-angular:karma",
+          "builder": "@angular-builders/jest:run",
           "options": {
-            "codeCoverage": true,
-            "main": "projects/ng-modal/src/test.ts",
-            "tsConfig": "projects/ng-modal/tsconfig.spec.json",
-            "karmaConfig": "projects/ng-modal/karma.conf.js"
+            "configPath": "../../jest.config.js",
+            "no-cache": true
           }
         },
         "lint": {
@@ -360,11 +297,10 @@
           "defaultConfiguration": "production"
         },
         "test": {
-          "builder": "@angular-devkit/build-angular:karma",
+          "builder": "@angular-builders/jest:run",
           "options": {
-            "main": "projects/ng-form-elements/src/test.ts",
-            "tsConfig": "projects/ng-form-elements/tsconfig.spec.json",
-            "karmaConfig": "projects/ng-form-elements/karma.conf.js"
+            "configPath": "../../jest.config.js",
+            "no-cache": true
           }
         }
       }
@@ -391,24 +327,28 @@
           "defaultConfiguration": "production"
         },
         "test": {
-          "builder": "@angular-devkit/build-angular:karma",
+          "builder": "@angular-builders/jest:run",
           "options": {
-            "main": "projects/ng-progress-bar/src/test.ts",
-            "tsConfig": "projects/ng-progress-bar/tsconfig.spec.json",
-            "karmaConfig": "projects/ng-progress-bar/karma.conf.js"
+            "configPath": "../../jest.config.js",
+            "no-cache": true
           }
         }
       }
     }
   },
-  "defaultProject": "sq-ui",
   "schematics": {
     "@schematics/angular:component": {
       "prefix": "sq",
       "style": "scss"
     },
     "@schematics/angular:directive": {
       "prefix": "sq"
+    },
+    "@angular-eslint/schematics:application": {
+      "setParserOptionsProject": true
+    },
+    "@angular-eslint/schematics:library": {
+      "setParserOptionsProject": true
     }
   }
 }
diff --git a/docs/common-module.md b/docs/common-module.md
@@ -41,9 +41,9 @@ import { AfterViewInit } from '@angular/core';
 export class ExampleComponent implements AfterViewInit {
 
     listenForOutsideClick: boolean = false;
-    
+
     ngAfterViewInit() {
-        listenForOutsideClick = true;
+        this.listenForOutsideClick = true;
     }
 
     onClickOutsideComponent() {
@@ -54,7 +54,7 @@ export class ExampleComponent implements AfterViewInit {
 ```
 
 
-## Services 
+## Services
 ### OSDetectorService
 
 - **getDeviceOS():** [`DeviceOS`](enums.md??id=deviceos).

diff --git a/e2e/protractor.conf.js b/e2e/protractor.conf.js
diff --git a/e2e/src/app.e2e-spec.ts b/e2e/src/app.e2e-spec.ts
diff --git a/e2e/src/app.po.ts b/e2e/src/app.po.ts
diff --git a/e2e/tsconfig.e2e.json b/e2e/tsconfig.e2e.json
diff --git a/jest.config.js b/jest.config.js
@@ -0,0 +1,32 @@
+// weird issue with Jest after updating to Angular ver 14:
+// https://github.com/nrwl/nx/issues/7844#issuecomment-1139427677
+const esModules = ['@angular', 'tslib', 'rxjs'].join('|');
+
+module.exports = {
+  preset: 'jest-preset-angular',
+  // verbose: true,
+  roots: ['projects'],
+  restoreMocks: true,
+  rootDir: './',
+  modulePaths: ['<rootDir>'],
+  modulePathIgnorePatterns: ['^.+\\.js$'],
+  testEnvironment: 'jsdom',
+  testMatch: ['**/?(*.)+(spec).ts?(x)'],
+  transform: {
+    '^.+\\.(ts|js|html)$': ['jest-preset-angular', {
+      tsconfig: '<rootDir>/tsconfig.spec.json',
+      allowSyntheticDefaultImports: true,
+      diagnostics: { warnOnly: true },
+      stringifyContentPathRegex: '\\.html$',
+    }],
+  },
+  moduleNameMapper: {
+    '^@sq-ui/ng-sq-common/(.*)$': '<rootDir>/projects/ng-sq-common/src/$1',
+    '@sq-ui/ng-sq-common': '<rootDir>/projects/ng-sq-common/src/index.ts',
+  },
+  moduleFileExtensions: ['ts', 'js', 'html'],
+  coverageReporters: ['html'],
+  setupFilesAfterEnv: ['<rootDir>/setup-jest.ts'],
+  transformIgnorePatterns: [`<rootDir>/node_modules/(?!.*\\.mjs$|${esModules})`],
+  coverageReporters: ["lcov", "text"],
+};