Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(*): upgrade to angular 16 #10

Merged
merged 1 commit into from
Jun 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Editor configuration, see https://editorconfig.org
# Editor configuration, see http://editorconfig.org
root = true

[*]
Expand Down
2 changes: 1 addition & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"root": true,
"ignorePatterns": [
"projects/testing/*"
"projects/**/*"
],
"overrides": [
{
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ node_modules
!.vscode/extensions.json

# misc
.angular
/.angular/cache
/.sass-cache
/connect.lock
Expand Down
6 changes: 2 additions & 4 deletions .lintstagedrc.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
module.exports = {
"src/**/*.ts": [
"prettier --write",
files => `ng lint ngx-translate-plugins --fix ${files.map((file) => `--files ${file}`).join(' ')}`,
"git add"
files => `ng lint ngx-translate-plugins --fix`
],
"projects/testing/src/**/*.ts": [
"prettier --write",
files => `ng lint testing --fix ${files.map((file) => `--files ${file}`).join(' ')}`,
"git add"
files => `ng lint testing --fix`
]
}
24 changes: 2 additions & 22 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
"newProjectRoot": "projects",
"cli": {
"analytics": false,
"packageManager": "yarn",
"defaultCollection": "@angular-eslint/schematics"
"packageManager": "yarn"
},
"projects": {
"ngx-translate-plugins": {
Expand Down Expand Up @@ -88,24 +87,6 @@
}
}
},
"ngx-translate-plugins-e2e": {
"root": "e2e/",
"projectType": "application",
"architect": {
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "e2e/protractor.conf.js",
"devServerTarget": "ngx-translate-plugins:serve"
},
"configurations": {
"production": {
"devServerTarget": "ngx-translate-plugins:serve:production"
}
}
}
}
},
"testing": {
"root": "projects/testing",
"sourceRoot": "projects/testing/src",
Expand Down Expand Up @@ -145,6 +126,5 @@
}
}
}
},
"defaultProject": "ngx-translate-plugins"
}
}
28 changes: 0 additions & 28 deletions e2e/protractor.conf.js

This file was deleted.

14 changes: 0 additions & 14 deletions e2e/src/app.e2e-spec.ts

This file was deleted.

11 changes: 0 additions & 11 deletions e2e/src/app.po.ts

This file was deleted.

13 changes: 0 additions & 13 deletions e2e/tsconfig.e2e.json

This file was deleted.

26 changes: 13 additions & 13 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
const { pathsToModuleNameMapper } = require('ts-jest/utils');
const { pathsToModuleNameMapper } = require('ts-jest');
const { compilerOptions } = require('./tsconfig.json');
module.exports = {
globals: {
'ts-jest': {
tsconfig: './projects/testing/tsconfig.spec.json',
stringifyContentPathRegex: '\\.html$',
diagnostics: {
ignoreCodes: [151001]
}
}
},
transform: {
'^.+\\.(ts|js|mjs|html|svg)$': 'jest-preset-angular'
'^.+\\.(ts|js|mjs|html|svg)$': [
'jest-preset-angular',
{
tsconfig: './projects/testing/tsconfig.spec.json',
stringifyContentPathRegex: '\\.html$',
diagnostics: {
ignoreCodes: [151001]
}
}
]
},
preset: 'jest-preset-angular',
setupFilesAfterEnv: ['<rootDir>/setupJest.ts'],
testMatch: ['**/+(*.)+(spec|test).+(ts|js)?(x)'],
moduleFileExtensions: ['ts', 'js', 'html'],
moduleFileExtensions: ['ts', 'html', 'js', 'json', 'mjs'],
testPathIgnorePatterns: ['/node_modules/', '/dist/', 'contract.spec.ts$', 'comp.spec.ts$'],
silent: true,
moduleDirectories: ['node_modules', '.'],
moduleDirectories: ['node_modules', '<rootDir>'],
roots: ['<rootDir>/projects/testing/src'],
collectCoverage: true,
collectCoverageFrom: [
Expand Down
Loading