Skip to content

Commit 16fd6b5

Browse files
committed
chore: merge master
2 parents 999f889 + fb53685 commit 16fd6b5

2 files changed

Lines changed: 11 additions & 5 deletions

File tree

e2e/__helpers__/test-case/runtime.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,9 @@ export function prepareTest(name: string, template: string, options: RunTestOpti
228228

229229
// link the node_modules dir if the template has one
230230
if (existsSync(tmplModulesDir)) {
231-
symlinkSync(tmplModulesDir, caseModulesDir)
231+
// It's important to mark this symlink as 'dir' or tests fail
232+
// with permission issues on windows.
233+
symlinkSync(tmplModulesDir, caseModulesDir, 'dir')
232234
}
233235

234236
// copy files from the template to the case dir

package.json

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@
3232
"changelog": "node_modules/.bin/conventional-changelog -p angular -i CHANGELOG.md -s -r 0",
3333
"prepare": "npm run build",
3434
"prepublishOnly": "npm run test",
35-
"commitmsg": "node_modules/.bin/commitlint -E GIT_PARAMS",
36-
"precommit": "node_modules/.bin/lint-staged",
37-
"postcommit": "git reset",
3835
"preversion": "npm run test",
3936
"version": "npm run changelog && git add CHANGELOG.md"
4037
},
@@ -72,6 +69,13 @@
7269
"peerDependencies": {
7370
"jest": ">=24 <25"
7471
},
72+
"husky": {
73+
"hooks": {
74+
"pre-commit": "lint-staged",
75+
"commit-msg": "commitlint -E HUSKY_GIT_PARAMS",
76+
"post-commit": "git reset"
77+
}
78+
},
7579
"devDependencies": {
7680
"@commitlint/cli": "7.x",
7781
"@commitlint/config-conventional": "7.x",
@@ -95,7 +99,7 @@
9599
"eslint": "latest",
96100
"fs-extra": "latest",
97101
"glob-gitignore": "latest",
98-
"husky": "0.x",
102+
"husky": "1.x",
99103
"jest": "24.x",
100104
"js-yaml": "latest",
101105
"lint-staged": "latest",

0 commit comments

Comments
 (0)