Skip to content

Commit 6b66af3

Browse files
committed
Merge branch 'feature/dynamic-modal' into feature/next-dynamic-modal
2 parents 750379d + 4683678 commit 6b66af3

File tree

10 files changed

+5002
-1660
lines changed

10 files changed

+5002
-1660
lines changed

.eslintrc.js

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,16 @@ module.exports = {
1515
rules: {
1616
'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
1717
'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off'
18-
}
18+
},
19+
overrides: [
20+
{
21+
files: [
22+
'**/__tests__/*.{j,t}s?(x)',
23+
'**/tests/unit/**/*.spec.{j,t}s?(x)'
24+
],
25+
env: {
26+
jest: true
27+
}
28+
}
29+
]
1930
}

.travis.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
language: node_js
2+
node_js:
3+
- '12'
4+
cache:
5+
directories:
6+
- node_modules
7+
script:
8+
- yarn coveralls

docs/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
"generate": "nuxt generate"
1010
},
1111
"dependencies": {
12-
"@nuxt/content-theme-docs": "^0.6.1",
13-
"nuxt": "^2.14.8",
14-
"vue-final-modal": "^0.21.3"
12+
"@nuxt/content-theme-docs": "^0.8.2",
13+
"nuxt": "^2.14.12",
14+
"vue-final-modal": "^0.21.5"
1515
},
1616
"devDependencies": {
1717
"@nuxtjs/google-analytics": "^2.4.0",

docs/yarn.lock

Lines changed: 2523 additions & 1596 deletions
Large diffs are not rendered by default.

jest.config.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
module.exports = {
2+
preset: '@vue/cli-plugin-unit-jest/presets/no-babel',
3+
collectCoverage: true,
4+
collectCoverageFrom: ['lib/**', '!lib/utils/**']
5+
}

package.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
"scripts": {
1919
"build": "rollup -c",
2020
"dev": "rollup -c -w",
21-
"lint": "vue-cli-service lint"
21+
"test": "vue-cli-service test:unit",
22+
"lint": "vue-cli-service lint",
23+
"coveralls": "vue-cli-service test:unit && cat ./coverage/lcov.info | coveralls"
2224
},
2325
"devDependencies": {
2426
"@atomico/rollup-plugin-sizes": "^1.1.4",
@@ -28,10 +30,13 @@
2830
"@rollup/plugin-commonjs": "^17.0.0",
2931
"@rollup/plugin-node-resolve": "^9.0.0",
3032
"@vue/cli-plugin-eslint": "^4.5.6",
33+
"@vue/cli-plugin-unit-jest": "^4.5.11",
3134
"@vue/cli-service": "^4.5.6",
3235
"@vue/compiler-sfc": "^3.0.5",
3336
"@vue/eslint-config-prettier": "^6.0.0",
37+
"@vue/test-utils": "^2.0.0-rc.1",
3438
"babel-eslint": "10.1.0",
39+
"coveralls": "^3.1.0",
3540
"eslint": "6.7.2",
3641
"eslint-config-airbnb-base": "^14.2.0",
3742
"eslint-plugin-import": "^2.22.0",
@@ -45,7 +50,8 @@
4550
"rollup-plugin-vue": "6.0.0"
4651
},
4752
"gitHooks": {
48-
"pre-commit": "lint-staged"
53+
"pre-commit": "lint-staged",
54+
"pre-push": "yarn test"
4955
},
5056
"lint-staged": {
5157
"*.{js,jsx,vue}": [

0 commit comments

Comments
 (0)