Skip to content

Commit 4f86860

Browse files
committed
feat(package): migrate to ng12
1 parent 6329569 commit 4f86860

File tree

7 files changed

+5466
-3898
lines changed

7 files changed

+5466
-3898
lines changed

.circleci/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: 2
22
jobs:
33
build:
44
docker:
5-
- image: circleci/node:10-browsers
5+
- image: circleci/node:14-browsers
66
environment:
77
JOBS: 1
88
steps:

.husky/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
_

.husky/commit-msg

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/sh
2+
. "$(dirname "$0")/_/husky.sh"
3+
4+
npx --no-install commitlint --edit $1

.husky/pre-commit

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/sh
2+
. "$(dirname "$0")/_/husky.sh"
3+
4+
npx --no-install lint-staged

package.json

+39-39
Original file line numberDiff line numberDiff line change
@@ -27,63 +27,60 @@
2727
"ci:after": "greenkeeper-lockfile-upload",
2828
"test": "jest --runInBand --colors",
2929
"test:ci": "jest --ci --updateSnapshot --colors",
30-
"release": "standard-version"
30+
"release": "standard-version",
31+
"prepare": "husky install"
3132
},
3233
"devDependencies": {
33-
"@angular/common": "^9.1.0",
34-
"@angular/compiler": "^9.1.0",
35-
"@angular/compiler-cli": "^9.1.0",
36-
"@angular/core": "^9.1.0",
37-
"@angular/platform-browser": "^9.1.0",
38-
"@angular/platform-browser-dynamic": "^9.1.0",
39-
"@angular/router": "^9.1.0",
40-
"@commitlint/cli": "^8.3.5",
41-
"@commitlint/config-conventional": "^8.3.4",
42-
"@types/jest": "^23.3.14",
43-
"@types/lodash": "^4.14.150",
44-
"@types/node": "^10.0.0",
34+
"@angular/common": "^12.0.3",
35+
"@angular/compiler": "^12.0.3",
36+
"@angular/compiler-cli": "^12.0.3",
37+
"@angular/core": "^12.0.3",
38+
"@angular/platform-browser": "^12.0.3",
39+
"@angular/platform-browser-dynamic": "^12.0.3",
40+
"@angular/router": "^12.0.3",
41+
"@commitlint/cli": "^12.1.4",
42+
"@commitlint/config-conventional": "^12.1.4",
43+
"@types/jest": "^26.0.23",
44+
"@types/lodash": "^4.14.170",
45+
"@types/node": "^15.12.2",
4546
"angular-tslint-rules": "^1.20.4",
46-
"codelyzer": "^5.2.2",
47-
"cz-conventional-changelog": "^3.1.0",
48-
"husky": "^4.2.0",
49-
"jest": "^23.6.0",
47+
"codelyzer": "^6.0.2",
48+
"cz-conventional-changelog": "^3.3.0",
49+
"husky": "^6.0.0",
50+
"jest": "^27.0.4",
5051
"jest-junit-reporter": "^1.1.0",
51-
"jest-preset-angular": "8.1.2",
52-
"lerna": "^3.20.2",
53-
"lint-staged": "^10.0.0",
54-
"lodash": "^4.17.15",
55-
"ng-packagr": "^9.0.0",
56-
"prettier": "1.19.1",
52+
"jest-preset-angular": "9.0.3",
53+
"lerna": "^4.0.0",
54+
"lint-staged": "^11.0.0",
55+
"lodash": "^4.17.21",
56+
"ng-packagr": "^12.0.4",
57+
"prettier": "2.3.1",
5758
"prettier-tslint": "^0.4.2",
5859
"reflect-metadata": "^0.1.13",
5960
"request": "^2.88.2",
6061
"rimraf": "^3.0.2",
61-
"rxjs": "~6.5.4",
62-
"ts-node": "^8.9.0",
63-
"tsickle": "^0.38.0",
64-
"tslint": "^5.20.1",
62+
"rxjs": "~7.1.0",
63+
"ts-node": "^10.0.0",
64+
"tsickle": "^0.40.0",
65+
"tslint": "^6.1.3",
6566
"tslint-config-prettier": "^1.18.0",
66-
"typescript": "~3.8.3",
67-
"zone.js": "^0.10.2"
68-
},
69-
"husky": {
70-
"hooks": {
71-
"pre-commit": "lint-staged",
72-
"commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
73-
}
67+
"typescript": "~4.2.4",
68+
"zone.js": "^0.11.4"
7469
},
7570
"jest": {
7671
"preset": "jest-preset-angular",
77-
"setupTestFrameworkScriptFile": "./tools/test/jest.setup.ts",
72+
"setupFilesAfterEnv": [
73+
"./tools/test/jest.setup.ts"
74+
],
7875
"testResultsProcessor": "./node_modules/jest-junit-reporter",
7976
"testMatch": [
8077
"**/+(*.)+(spec|test).+(ts|js)?(x)"
8178
],
8279
"globals": {
8380
"ts-jest": {
84-
"tsConfigFile": "./tsconfig.json"
85-
},
86-
"__TRANSFORM_HTML__": true
81+
"stringifyContentPathRegex": "\\.html?$",
82+
"tsconfig": "./tsconfig.json"
83+
}
8784
},
8885
"moduleNameMapper": {
8986
"^@ngx-meta/core": "<rootDir>/packages/@ngx-meta/core/src/index.ts"
@@ -99,5 +96,8 @@
9996
"commitizen": {
10097
"path": "./node_modules/cz-conventional-changelog"
10198
}
99+
},
100+
"dependencies": {
101+
"@angular-devkit/core": "^12.0.3"
102102
}
103103
}

tools/test/jest.setup.ts

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
// tslint:disable
22
import 'jest-preset-angular';
3+
import 'zone.js';
4+
import 'zone.js/testing';
35

46
const mock = () => {
57
let storage = {};

0 commit comments

Comments
 (0)