Skip to content

Commit

Permalink
chore: merge master
Browse files Browse the repository at this point in the history
  • Loading branch information
kulshekhar committed Feb 16, 2019
2 parents 999f889 + fb53685 commit 16fd6b5
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
4 changes: 3 additions & 1 deletion e2e/__helpers__/test-case/runtime.ts
Expand Up @@ -228,7 +228,9 @@ export function prepareTest(name: string, template: string, options: RunTestOpti

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

// copy files from the template to the case dir
Expand Down
12 changes: 8 additions & 4 deletions package.json
Expand Up @@ -32,9 +32,6 @@
"changelog": "node_modules/.bin/conventional-changelog -p angular -i CHANGELOG.md -s -r 0",
"prepare": "npm run build",
"prepublishOnly": "npm run test",
"commitmsg": "node_modules/.bin/commitlint -E GIT_PARAMS",
"precommit": "node_modules/.bin/lint-staged",
"postcommit": "git reset",
"preversion": "npm run test",
"version": "npm run changelog && git add CHANGELOG.md"
},
Expand Down Expand Up @@ -72,6 +69,13 @@
"peerDependencies": {
"jest": ">=24 <25"
},
"husky": {
"hooks": {
"pre-commit": "lint-staged",
"commit-msg": "commitlint -E HUSKY_GIT_PARAMS",
"post-commit": "git reset"
}
},
"devDependencies": {
"@commitlint/cli": "7.x",
"@commitlint/config-conventional": "7.x",
Expand All @@ -95,7 +99,7 @@
"eslint": "latest",
"fs-extra": "latest",
"glob-gitignore": "latest",
"husky": "0.x",
"husky": "1.x",
"jest": "24.x",
"js-yaml": "latest",
"lint-staged": "latest",
Expand Down

0 comments on commit 16fd6b5

Please sign in to comment.