Skip to content

Commit 5f02e16

Browse files
fulls1z3fulls1z3
committed
chore: update deps
1 parent 6329569 commit 5f02e16

24 files changed

+3267
-2295
lines changed

‎.husky/commit-msg‎

Lines changed: 4 additions & 0 deletions
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‎

Lines changed: 4 additions & 0 deletions
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

‎.prettierignore‎

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,4 @@
11
# Add files here to ignore them from prettier formatting
22

3-
# compiled output
43
/dist
5-
/docs
6-
/tmp
7-
/out-tsc
8-
9-
# dependencies
10-
/node_modules
11-
12-
# IDEs and editors
13-
/.idea
14-
.project
15-
.classpath
16-
.c9/
17-
*.launch
18-
.settings/
19-
*.sublime-workspace
20-
21-
# IDE - VSCode
22-
.vscode/*
23-
!.vscode/settings.json
24-
!.vscode/tasks.json
25-
!.vscode/launch.json
26-
!.vscode/extensions.json
27-
28-
# misc
29-
/.sass-cache
30-
/connect.lock
314
/coverage
32-
/libpeerconnection.log
33-
npm-debug.log
34-
yarn-error.log
35-
testem.log
36-
test-report.xml
37-
/typings
38-
39-
# System Files
40-
.DS_Store
41-
Thumbs.db
42-
43-
# others
44-
/tools
45-
angular.json
46-
yarn.lock

‎.prettierrc‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,20 @@
11
{
2-
"printWidth": 140,
3-
"singleQuote": true
2+
"printWidth": 120,
3+
"singleQuote": true,
4+
"trailingComma": "none",
5+
"arrowParens": "avoid",
6+
"overrides": [
7+
{
8+
"files": "*.component.html",
9+
"options": {
10+
"parser": "angular"
11+
}
12+
},
13+
{
14+
"files": "*.html",
15+
"options": {
16+
"parser": "html"
17+
}
18+
}
19+
]
420
}

‎CONTRIBUTING.md‎

Lines changed: 24 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -116,38 +116,41 @@ After your pull request is merged, you can safely delete your branch and pull th
116116
To ensure consistency throughout the source code, keep these rules in mind as you are working:
117117
* All features or bug fixes **must be tested** by one or more specs (unit-tests).
118118
* All public API methods **must be documented**. (Details TBC).
119-
* We follow [fulls1z3's Angular TSLint rules][angular-tslint-rules].
119+
- We follow [eslint:recommended][eslint].
120120
121121
## <a name="commit"></a> Commit message guidelines
122122
We have very precise rules over how our git commit messages can be formatted. This leads to **more readable messages** that
123123
are easy to follow when looking through the **project history**. But also, we use the git commit messages to **generate
124124
the `ngx-meta` change log**.
125125
126126
### Commit Message Format
127-
Each commit message consists of a **header**, a **body** and a **footer**. The header has a special format that includes
128-
a **type**, a **scope** (*when applicable*) and a **subject**:
127+
Each commit message consists of a **header**, a **body** and a **footer**. The header has a special format that includes
128+
a **type** and a **subject**:
129+
129130
```
130-
<type>(<scope>): <subject>
131+
<type>: <subject>
131132
<BLANK LINE>
132133
<body>
133134
<BLANK LINE>
134135
<footer>
135136
```
136137
137-
The **header** is mandatory and the **scope** of the header is optional.
138+
The **header** is mandatory.
138139
139140
Any line of the commit message cannot be longer 100 characters. This allows the message to be easier to read on GitHub as
140141
well as in various git tools.
141142
142143
Footer should contain a [closing reference to an issue](https://help.github.com/articles/closing-issues-via-commit-messages/)
143144
if any.
144145
145-
Samples: (even more [samples](https://github.com/fulls1z3/ngx-meta/commits/master))
146+
Samples: (even more [samples](https://github.com/fulls1z3/universal/commits/master))
147+
146148
```
147-
docs(changelog): update change log to alpha.4
149+
docs: update change log to alpha.4
148150
```
151+
149152
```
150-
fix(release): need to depend on latest rxjs and zone.js
153+
fix: need to depend on latest rxjs and zone.js
151154
152155
The version in our package.json gets copied to the one we publish, and users need the latest of these.
153156
```
@@ -157,27 +160,20 @@ If the commit reverts a previous commit, it should begin with `revert: `, follow
157160
In the body it should say: `This reverts commit <hash>.`, where the hash is the SHA of the commit being reverted.
158161
159162
### Type
160-
Must be one of the following:
161-
* **build**: Changes that affect the build system or external dependencies (example scopes: gulp, npm, webpack)
162-
* **ci**: Changes to our CI configuration files and scripts (example scopes: Travis, Circle, etc)
163-
* **docs**: Documentation only changes
164-
* **feat**: A new feature
165-
* **fix**: A bug fix
166-
* **perf**: A code change that improves performance
167-
* **refactor**: A code change that neither fixes a bug nor adds a feature
168-
* **style**: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc)
169-
* **test**: Adding missing tests or correcting existing tests
170163
171-
### Scope
172-
The scope should be the name of the project affected.
173-
174-
The following is the list of supported scopes:
175-
* **core**
176-
177-
There are currently a few exceptions to the "use project name" rule:
164+
Must be one of the following:
178165
179-
* **packaging**: used for changes that change the package layout (*e.g. package.json, bundles, path changes, etc.*)
180-
* **changelog**: used for updating the release notes in CHANGELOG.md
166+
- **feat**: A new feature
167+
- **fix**: A bug fix
168+
- **docs**: Documentation only changes
169+
- **style**: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc)
170+
- **refactor**: A code change that neither fixes a bug nor adds a feature
171+
- **perf**: A code change that improves performance
172+
- **test**: Adding missing tests or correcting existing tests
173+
- **build**: Changes that affect the build system or external dependencies (example scopes: gulp, broccoli, npm)
174+
- **ci**: Changes to our CI configuration files and scripts (example scopes: Travis, Circle, BrowserStack, SauceLabs)
175+
- **chore**: Other changes that don't modify src or test files
176+
- **revert**: Reverts a previous commit
181177

182178
### Subject
183179
The subject contains succinct description of the change:
@@ -198,4 +194,4 @@ message is then used for this.
198194
199195
[coc]: https://github.com/fulls1z3/ngx-meta/blob/master/CODE_OF_CONDUCT.md
200196
[github]: https://github.com/fulls1z3/ngx-meta
201-
[angular-tslint-rules]: https://github.com/fulls1z3/angular-tslint-rules
197+
[eslint]: https://github.com/eslint/eslint

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2019 Burak Tasci
3+
Copyright (c) 2021 Burak Tasci
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ configuration.
2828

2929
### Examples
3030

31-
- [ng-seed/universal] and [fulls1z3/example-app] are officially maintained projects, showcasing common patterns and best
31+
- [fulls1z3/universal] and [fulls1z3/example-app] are officially maintained projects, showcasing common patterns and best
3232
practices for **`ngx-meta`**.
3333

3434
## Contributing
@@ -48,10 +48,10 @@ If you want to file a bug, contribute some code, or improve documentation, pleas
4848

4949
The MIT License (MIT)
5050

51-
Copyright (c) 2019 [Burak Tasci]
51+
Copyright (c) 2021 [Burak Tasci]
5252

5353
[@ngx-translate/core]: https://github.com/ngx-translate/core
54-
[ng-seed/universal]: https://github.com/ng-seed/universal
54+
[fulls1z3/universal]: https://github.com/fulls1z3/universal
5555
[fulls1z3/example-app]: https://github.com/fulls1z3/example-app
5656
[jetbrains]: https://www.jetbrains.com/community/opensource
5757
[webstorm]: https://www.jetbrains.com/webstorm

‎commitlint.config.js‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
module.exports = {
2-
extends: ['@commitlint/config-conventional'],
3-
rules: {
4-
'scope-enum': [2, 'always', ['core', 'package', 'npm', 'circle', 'lint', 'packaging', 'changelog']]
5-
}
2+
extends: ['@commitlint/config-conventional']
63
};

‎jest.config.js‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
module.exports = {
2+
displayName: 'ngx-meta',
3+
preset: 'jest-preset-angular',
4+
setupFilesAfterEnv: ['<rootDir>/tools/test/jest.setup.ts'],
5+
testResultsProcessor: './node_modules/jest-junit-reporter',
6+
globals: {
7+
'ts-jest': {
8+
tsConfig: '<rootDir>/tsconfig.spec.json',
9+
stringifyContentPathRegex: '\\.(html|svg)$',
10+
astTransformers: {
11+
before: ['jest-preset-angular/build/InlineFilesTransformer', 'jest-preset-angular/build/StripStylesTransformer']
12+
}
13+
}
14+
},
15+
moduleNameMapper: {
16+
'^@ngx-meta/core': '<rootDir>/packages/@ngx-meta/core/src/index.ts'
17+
},
18+
cache: false,
19+
silent: true,
20+
collectCoverage: true,
21+
collectCoverageFrom: [
22+
"packages/@ngx-meta/core/src/**.ts"
23+
],
24+
snapshotSerializers: [
25+
'jest-preset-angular/build/AngularNoNgAttributesSnapshotSerializer.js',
26+
'jest-preset-angular/build/AngularSnapshotSerializer.js',
27+
'jest-preset-angular/build/HTMLCommentSerializer.js'
28+
]
29+
};

‎package.json‎

Lines changed: 26 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"homepage": "https://github.com/fulls1z3/ngx-meta#readme",
1919
"scripts": {
2020
"clean": "rimraf dist",
21-
"build:core": "ts-node tools/build/packager.ts core",
21+
"build:core": "ng-packagr -p packages/@ngx-meta/core/package.json",
2222
"build": "npm run build:core",
2323
"lint": "tslint -p ./tsconfig.lint.json --force",
2424
"lint:check": "tslint-config-prettier-check ./tslint.lint.json",
@@ -27,74 +27,45 @@
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": "^10.1.0",
35+
"@angular/compiler": "^10.1.0",
36+
"@angular/compiler-cli": "^10.1.0",
37+
"@angular/core": "^10.1.0",
38+
"@angular/platform-browser": "^10.1.0",
39+
"@angular/platform-browser-dynamic": "^10.1.0",
40+
"@angular/router": "^10.1.0",
41+
"@commitlint/cli": "^12.1.4",
42+
"@commitlint/config-conventional": "^12.1.4",
43+
"@types/jest": "26.0.8",
44+
"@types/lodash": "^4.14.171",
45+
"@types/node": "~8.9.4",
4546
"angular-tslint-rules": "^1.20.4",
4647
"codelyzer": "^5.2.2",
47-
"cz-conventional-changelog": "^3.1.0",
48-
"husky": "^4.2.0",
49-
"jest": "^23.6.0",
48+
"cz-conventional-changelog": "^3.3.0",
49+
"husky": "^7.0.1",
50+
"jest": "26.2.2",
5051
"jest-junit-reporter": "^1.1.0",
51-
"jest-preset-angular": "8.1.2",
52+
"jest-preset-angular": "8.3.1",
5253
"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",
54+
"lint-staged": "~11.0.0",
55+
"lodash": "^4.17.21",
56+
"ng-packagr": "^10.1.2",
57+
"prettier": "2.3.2",
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",
62+
"rxjs": "~6.5.5",
63+
"tsickle": "^0.43.0",
6464
"tslint": "^5.20.1",
6565
"tslint-config-prettier": "^1.18.0",
66-
"typescript": "~3.8.3",
66+
"typescript": "~4.0.8",
6767
"zone.js": "^0.10.2"
6868
},
69-
"husky": {
70-
"hooks": {
71-
"pre-commit": "lint-staged",
72-
"commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
73-
}
74-
},
75-
"jest": {
76-
"preset": "jest-preset-angular",
77-
"setupTestFrameworkScriptFile": "./tools/test/jest.setup.ts",
78-
"testResultsProcessor": "./node_modules/jest-junit-reporter",
79-
"testMatch": [
80-
"**/+(*.)+(spec|test).+(ts|js)?(x)"
81-
],
82-
"globals": {
83-
"ts-jest": {
84-
"tsConfigFile": "./tsconfig.json"
85-
},
86-
"__TRANSFORM_HTML__": true
87-
},
88-
"moduleNameMapper": {
89-
"^@ngx-meta/core": "<rootDir>/packages/@ngx-meta/core/src/index.ts"
90-
},
91-
"cache": false,
92-
"silent": true,
93-
"collectCoverage": true,
94-
"collectCoverageFrom": [
95-
"packages/@ngx-meta/core/src/**.ts"
96-
]
97-
},
9869
"config": {
9970
"commitizen": {
10071
"path": "./node_modules/cz-conventional-changelog"

0 commit comments

Comments
 (0)