Skip to content

Commit 439c1e3

Browse files
committed
feat(*): upgrade to angular 16
fix dependencies
1 parent 3aff1d3 commit 439c1e3

27 files changed

+21447
-39444
lines changed

.editorconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Editor configuration, see https://editorconfig.org
1+
# Editor configuration, see http://editorconfig.org
22
root = true
33

44
[*]

.eslintrc.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"root": true,
33
"ignorePatterns": [
4-
"projects/testing/*"
4+
"projects/**/*"
55
],
66
"overrides": [
77
{

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ node_modules
2626
!.vscode/extensions.json
2727

2828
# misc
29+
.angular
2930
/.angular/cache
3031
/.sass-cache
3132
/connect.lock

.lintstagedrc.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
module.exports = {
22
"src/**/*.ts": [
33
"prettier --write",
4-
files => `ng lint ngx-translate-plugins --fix ${files.map((file) => `--files ${file}`).join(' ')}`,
5-
"git add"
4+
files => `ng lint ngx-translate-plugins --fix`
65
],
76
"projects/testing/src/**/*.ts": [
87
"prettier --write",
9-
files => `ng lint testing --fix ${files.map((file) => `--files ${file}`).join(' ')}`,
10-
"git add"
8+
files => `ng lint testing --fix`
119
]
1210
}

angular.json

+2-22
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
"newProjectRoot": "projects",
55
"cli": {
66
"analytics": false,
7-
"packageManager": "yarn",
8-
"defaultCollection": "@angular-eslint/schematics"
7+
"packageManager": "yarn"
98
},
109
"projects": {
1110
"ngx-translate-plugins": {
@@ -88,24 +87,6 @@
8887
}
8988
}
9089
},
91-
"ngx-translate-plugins-e2e": {
92-
"root": "e2e/",
93-
"projectType": "application",
94-
"architect": {
95-
"e2e": {
96-
"builder": "@angular-devkit/build-angular:protractor",
97-
"options": {
98-
"protractorConfig": "e2e/protractor.conf.js",
99-
"devServerTarget": "ngx-translate-plugins:serve"
100-
},
101-
"configurations": {
102-
"production": {
103-
"devServerTarget": "ngx-translate-plugins:serve:production"
104-
}
105-
}
106-
}
107-
}
108-
},
10990
"testing": {
11091
"root": "projects/testing",
11192
"sourceRoot": "projects/testing/src",
@@ -145,6 +126,5 @@
145126
}
146127
}
147128
}
148-
},
149-
"defaultProject": "ngx-translate-plugins"
129+
}
150130
}

e2e/protractor.conf.js

-28
This file was deleted.

e2e/src/app.e2e-spec.ts

-14
This file was deleted.

e2e/src/app.po.ts

-11
This file was deleted.

e2e/tsconfig.e2e.json

-13
This file was deleted.

jest.config.js

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
const { pathsToModuleNameMapper } = require('ts-jest/utils');
1+
const { pathsToModuleNameMapper } = require('ts-jest');
22
const { compilerOptions } = require('./tsconfig.json');
33
module.exports = {
4-
globals: {
5-
'ts-jest': {
6-
tsconfig: './projects/testing/tsconfig.spec.json',
7-
stringifyContentPathRegex: '\\.html$',
8-
diagnostics: {
9-
ignoreCodes: [151001]
10-
}
11-
}
12-
},
134
transform: {
14-
'^.+\\.(ts|js|mjs|html|svg)$': 'jest-preset-angular'
5+
'^.+\\.(ts|js|mjs|html|svg)$': [
6+
'jest-preset-angular',
7+
{
8+
tsconfig: './projects/testing/tsconfig.spec.json',
9+
stringifyContentPathRegex: '\\.html$',
10+
diagnostics: {
11+
ignoreCodes: [151001]
12+
}
13+
}
14+
]
1515
},
1616
preset: 'jest-preset-angular',
1717
setupFilesAfterEnv: ['<rootDir>/setupJest.ts'],
1818
testMatch: ['**/+(*.)+(spec|test).+(ts|js)?(x)'],
19-
moduleFileExtensions: ['ts', 'js', 'html'],
19+
moduleFileExtensions: ['ts', 'html', 'js', 'json', 'mjs'],
2020
testPathIgnorePatterns: ['/node_modules/', '/dist/', 'contract.spec.ts$', 'comp.spec.ts$'],
2121
silent: true,
22-
moduleDirectories: ['node_modules', '.'],
22+
moduleDirectories: ['node_modules', '<rootDir>'],
2323
roots: ['<rootDir>/projects/testing/src'],
2424
collectCoverage: true,
2525
collectCoverageFrom: [

0 commit comments

Comments
 (0)