Skip to content

Commit 8afdfa5

Browse files
samuil4samuil4
authored
Merge pull request #1107 from SQ-UI/feature/bump-angular-version
Bump Angular version to 16
2 parents f3921e7 + 81f0caf commit 8afdfa5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+25166
-17866
lines changed

‎.github/workflows/main.yml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Install node.js
3030
uses: actions/setup-node@v2
3131
with:
32-
node-version: '14'
32+
node-version: '18'
3333
check-latest: true
3434

3535
- name: Install dependencies
@@ -42,10 +42,4 @@ jobs:
4242
with:
4343
coverageCommand: npm run coverage
4444
coverageLocations: |
45-
${{github.workspace}}/coverage/ng-sq-common/lcov.info:lcov
46-
${{github.workspace}}/coverage/ng-datatable/lcov.info:lcov
47-
${{github.workspace}}/coverage/ng-datetime-picker/lcov.info:lcov
48-
${{github.workspace}}/coverage/ng-sq-ui/lcov.info:lcov
49-
${{github.workspace}}/coverage/ng-modal/lcov.info:lcov
50-
${{github.workspace}}/coverage/ng-form-elements/lcov.info:lcov
51-
${{github.workspace}}/coverage/ng-progress-bar/lcov.info:lcov
45+
${{github.workspace}}/coverage/lcov.info:lcov

‎angular.json‎

Lines changed: 30 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -77,46 +77,14 @@
7777
}
7878
},
7979
"test": {
80-
"builder": "@angular-devkit/build-angular:karma",
80+
"builder": "@angular-builders/jest:run",
8181
"options": {
82-
"main": "src/test.ts",
83-
"polyfills": "src/polyfills.ts",
84-
"tsConfig": "src/tsconfig.spec.json",
85-
"karmaConfig": "src/karma.conf.js",
86-
"codeCoverage": true,
87-
"styles": [
88-
"src/styles.scss"
89-
],
90-
"scripts": [],
91-
"assets": [
92-
"src/favicon.ico",
93-
"src/assets"
94-
]
82+
"configPath": "../../jest.config.js",
83+
"no-cache": true
9584
}
9685
}
9786
}
9887
},
99-
"sq-ui-e2e": {
100-
"root": "e2e/",
101-
"projectType": "application",
102-
"architect": {
103-
"e2e": {
104-
"builder": "@angular-devkit/build-angular:protractor",
105-
"options": {
106-
"protractorConfig": "e2e/protractor.conf.js"
107-
},
108-
"configurations": {
109-
"production": {
110-
"devServerTarget": "sq-ui:serve:production"
111-
},
112-
"development": {
113-
"devServerTarget": "sq-ui:serve:development"
114-
}
115-
},
116-
"defaultConfiguration": "development"
117-
}
118-
}
119-
},
12088
"ng-sq-ui": {
12189
"root": "projects/ng-sq-ui",
12290
"sourceRoot": "projects/ng-sq-ui/src",
@@ -138,12 +106,10 @@
138106
"defaultConfiguration": "production"
139107
},
140108
"test": {
141-
"builder": "@angular-devkit/build-angular:karma",
109+
"builder": "@angular-builders/jest:run",
142110
"options": {
143-
"codeCoverage": true,
144-
"main": "projects/ng-sq-ui/src/test.ts",
145-
"tsConfig": "projects/ng-sq-ui/tsconfig.spec.json",
146-
"karmaConfig": "projects/ng-sq-ui/karma.conf.js"
111+
"configPath": "../../jest.config.js",
112+
"no-cache": true
147113
}
148114
},
149115
"lint": {
@@ -178,12 +144,10 @@
178144
"defaultConfiguration": "production"
179145
},
180146
"test": {
181-
"builder": "@angular-devkit/build-angular:karma",
147+
"builder": "@angular-builders/jest:run",
182148
"options": {
183-
"codeCoverage": true,
184-
"main": "projects/ng-datetime-picker/src/test.ts",
185-
"tsConfig": "projects/ng-datetime-picker/tsconfig.spec.json",
186-
"karmaConfig": "projects/ng-datetime-picker/karma.conf.js"
149+
"configPath": "../../jest.config.js",
150+
"no-cache": true
187151
}
188152
},
189153
"lint": {
@@ -218,12 +182,10 @@
218182
"defaultConfiguration": "production"
219183
},
220184
"test": {
221-
"builder": "@angular-devkit/build-angular:karma",
185+
"builder": "@angular-builders/jest:run",
222186
"options": {
223-
"codeCoverage": true,
224-
"main": "projects/ng-datatable/src/test.ts",
225-
"tsConfig": "projects/ng-datatable/tsconfig.spec.json",
226-
"karmaConfig": "projects/ng-datatable/karma.conf.js"
187+
"configPath": "../../jest.config.js",
188+
"no-cache": true
227189
}
228190
},
229191
"lint": {
@@ -258,12 +220,10 @@
258220
"defaultConfiguration": "production"
259221
},
260222
"test": {
261-
"builder": "@angular-devkit/build-angular:karma",
223+
"builder": "@angular-builders/jest:run",
262224
"options": {
263-
"codeCoverage": true,
264-
"main": "projects/ng-sq-common/src/test.ts",
265-
"tsConfig": "projects/ng-sq-common/tsconfig.spec.json",
266-
"karmaConfig": "projects/ng-sq-common/karma.conf.js"
225+
"configPath": "../../jest.config.js",
226+
"no-cache": true
267227
}
268228
},
269229
"lint": {
@@ -298,12 +258,10 @@
298258
"defaultConfiguration": "production"
299259
},
300260
"test": {
301-
"builder": "@angular-devkit/build-angular:karma",
261+
"builder": "@angular-builders/jest:run",
302262
"options": {
303-
"codeCoverage": true,
304-
"main": "projects/ng-modal/src/test.ts",
305-
"tsConfig": "projects/ng-modal/tsconfig.spec.json",
306-
"karmaConfig": "projects/ng-modal/karma.conf.js"
263+
"configPath": "../../jest.config.js",
264+
"no-cache": true
307265
}
308266
},
309267
"lint": {
@@ -339,11 +297,10 @@
339297
"defaultConfiguration": "production"
340298
},
341299
"test": {
342-
"builder": "@angular-devkit/build-angular:karma",
300+
"builder": "@angular-builders/jest:run",
343301
"options": {
344-
"main": "projects/ng-form-elements/src/test.ts",
345-
"tsConfig": "projects/ng-form-elements/tsconfig.spec.json",
346-
"karmaConfig": "projects/ng-form-elements/karma.conf.js"
302+
"configPath": "../../jest.config.js",
303+
"no-cache": true
347304
}
348305
}
349306
}
@@ -370,11 +327,10 @@
370327
"defaultConfiguration": "production"
371328
},
372329
"test": {
373-
"builder": "@angular-devkit/build-angular:karma",
330+
"builder": "@angular-builders/jest:run",
374331
"options": {
375-
"main": "projects/ng-progress-bar/src/test.ts",
376-
"tsConfig": "projects/ng-progress-bar/tsconfig.spec.json",
377-
"karmaConfig": "projects/ng-progress-bar/karma.conf.js"
332+
"configPath": "../../jest.config.js",
333+
"no-cache": true
378334
}
379335
}
380336
}
@@ -387,6 +343,12 @@
387343
},
388344
"@schematics/angular:directive": {
389345
"prefix": "sq"
346+
},
347+
"@angular-eslint/schematics:application": {
348+
"setParserOptionsProject": true
349+
},
350+
"@angular-eslint/schematics:library": {
351+
"setParserOptionsProject": true
390352
}
391353
}
392354
}

‎e2e/protractor.conf.js‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎e2e/src/app.e2e-spec.ts‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎e2e/src/app.po.ts‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎e2e/tsconfig.e2e.json‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎jest.config.js‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
// weird issue with Jest after updating to Angular ver 14:
2+
// https://github.com/nrwl/nx/issues/7844#issuecomment-1139427677
3+
const esModules = ['@angular', 'tslib', 'rxjs'].join('|');
4+
5+
module.exports = {
6+
preset: 'jest-preset-angular',
7+
// verbose: true,
8+
roots: ['projects'],
9+
restoreMocks: true,
10+
rootDir: './',
11+
modulePaths: ['<rootDir>'],
12+
modulePathIgnorePatterns: ['^.+\\.js$'],
13+
testEnvironment: 'jsdom',
14+
testMatch: ['**/?(*.)+(spec).ts?(x)'],
15+
transform: {
16+
'^.+\\.(ts|js|html)$': ['jest-preset-angular', {
17+
tsconfig: '<rootDir>/tsconfig.spec.json',
18+
allowSyntheticDefaultImports: true,
19+
diagnostics: { warnOnly: true },
20+
stringifyContentPathRegex: '\\.html$',
21+
}],
22+
},
23+
moduleNameMapper: {
24+
'^@sq-ui/ng-sq-common/(.*)$': '<rootDir>/projects/ng-sq-common/src/$1',
25+
'@sq-ui/ng-sq-common': '<rootDir>/projects/ng-sq-common/src/index.ts',
26+
},
27+
moduleFileExtensions: ['ts', 'js', 'html'],
28+
coverageReporters: ['html'],
29+
setupFilesAfterEnv: ['<rootDir>/setup-jest.ts'],
30+
transformIgnorePatterns: [`<rootDir>/node_modules/(?!.*\\.mjs$|${esModules})`],
31+
coverageReporters: ["lcov", "text"],
32+
};

0 commit comments

Comments
 (0)