Skip to content
This repository was archived by the owner on Oct 31, 2022. It is now read-only.

Commit 03acc9a

Browse files
Fe 231 actualizar a angular 10 (#125)
1 parent 34d703e commit 03acc9a

34 files changed

+6412
-34389
lines changed

Diff for: .circleci/config.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ var_1: &cache_key yarn-cache-{{ checksum "yarn.lock" }}
55
jobs:
66
lint:
77
docker:
8-
- image: circleci/node:10.16.1
8+
- image: circleci/node:12.16.2
99
steps:
1010
- checkout
1111
- restore_cache:
@@ -14,7 +14,8 @@ jobs:
1414
- run: yarn prettier-ts:show --list-different
1515
- run: yarn prettier-md:show --list-different
1616
- run: yarn prettier-scss:show --list-different
17-
- run: yarn run ng lint
17+
# Descomentar en la tarea FE-263
18+
# - run: yarn run ng lint
1819
- save_cache:
1920
key: *cache_key
2021
paths:
@@ -23,7 +24,7 @@ jobs:
2324

2425
test:
2526
docker:
26-
- image: circleci/node:10.16.1
27+
- image: circleci/node:12.16.2
2728
steps:
2829
- checkout
2930
- restore_cache:

Diff for: CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## 0.23.0
4+
5+
### Changed
6+
7+
- Angular version upgraded to 10
8+
39
## 0.22.71
410

511
### Added

Diff for: angular.json

+11-3
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"build": {
1414
"builder": "@angular-devkit/build-angular:browser",
1515
"options": {
16+
"aot": true,
1617
"outputPath": "dist/ngx-jsonapi-material-app",
1718
"index": "src/index.html",
1819
"main": "src/main.ts",
@@ -29,6 +30,12 @@
2930
},
3031
"configurations": {
3132
"production": {
33+
"budgets": [
34+
{
35+
"type": "anyComponentStyle",
36+
"maximumWarning": "6kb"
37+
}
38+
],
3239
"fileReplacements": [
3340
{
3441
"replace": "src/environments/environment.ts",
@@ -137,7 +144,8 @@
137144
"configurations": {
138145
"production": {
139146
"project": "projects/ngx-jsonapi-material/ng-package.prod.json"
140-
}
147+
, "tsConfig": "projects/ngx-jsonapi-material/tsconfig.lib.prod.json"
148+
}
141149
}
142150
},
143151
"test": {
@@ -169,9 +177,9 @@
169177
"inlineStyle": true,
170178
"inlineTemplate": true,
171179
"flat": true,
172-
"spec": false,
180+
"skipTests": true,
173181
"prefix": "bc",
174-
"styleext": "scss"
182+
"style": "scss"
175183
},
176184
"@schematics/angular:directive": {
177185
"prefix": "bc"

Diff for: jest.base.config.js

+14-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
11
module.exports = {
2-
preset: 'jest-preset-angular',
3-
setupTestFrameworkScriptFile: '<rootDir>/setup-jest.ts',
2+
preset: 'jest-preset-angular',
3+
globals: {
4+
'ts-jest': {
5+
tsConfig: '<rootDir>/src/tsconfig.spec.json'
6+
},
7+
'__TRANSFORM_HTML__': true
8+
},
9+
transform: {
10+
'^.+\\.(ts|js|html)$': 'ts-jest'
11+
},
12+
setupFilesAfterEnv: ['<rootDir>/setup-jest.ts'],
13+
testMatch: [
14+
"<rootDir>/**/*.spec.ts"
15+
],
416
};

0 commit comments

Comments
 (0)