Skip to content

Commit 14aca03

Browse files
jacobmllr95jacobmllr95
committed
Merge remote-tracking branch 'origin/dev' into feat-code-size-improvements
2 parents e03b743 + d630ecb commit 14aca03

File tree

156 files changed

+6139
-4838
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

156 files changed

+6139
-4838
lines changed

‎.github/renovate.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
},
2121
{
2222
"packageNames": ["@vue/test-utils"],
23-
"allowedVersions": "<=1.0.0-beta.29"
23+
"allowedVersions": "<2.0.0"
2424
}
2525
]
2626
}

‎jest.config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ module.exports = {
66
'.*\\.(vue)$': 'vue-jest'
77
},
88
coverageDirectory: './coverage/',
9-
testEnvironment: 'jest-environment-jsdom-fourteen',
109
testEnvironmentOptions: {
1110
pretendToBeVisual: true
12-
}
11+
},
12+
setupFilesAfterEnv: ['./tests/setup.js']
1313
}

‎package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,14 +107,15 @@
107107
"@nuxtjs/pwa": "^3.0.0-beta.20",
108108
"@nuxtjs/robots": "^2.4.2",
109109
"@nuxtjs/sitemap": "^2.2.1",
110-
"@vue/test-utils": "1.0.0-beta.29",
110+
"@testing-library/jest-dom": "^5.7.0",
111+
"@vue/test-utils": "^1.0.2",
111112
"autoprefixer": "^9.7.6",
112113
"babel-core": "^7.0.0-bridge.0",
113114
"babel-eslint": "^10.1.0",
114115
"babel-jest": "^26.0.1",
115116
"babel-plugin-istanbul": "^6.0.0",
116117
"bootstrap-icons": "^1.0.0-alpha3",
117-
"bundlewatch": "^0.2.6",
118+
"bundlewatch": "^0.2.7",
118119
"clean-css-cli": "^4.3.0",
119120
"codemirror": "^5.53.2",
120121
"codesandbox": "^2.1.14",
@@ -139,7 +140,6 @@
139140
"husky": "^4.2.5",
140141
"improved-yarn-audit": "^2.0.0",
141142
"jest": "^26.0.1",
142-
"jest-environment-jsdom-fourteen": "^1.0.1",
143143
"lint-staged": "^10.2.2",
144144
"loader-utils": "^2.0.0",
145145
"lodash": "^4.17.15",
@@ -149,12 +149,12 @@
149149
"postcss-cli": "^7.1.1",
150150
"prettier": "1.14.3",
151151
"require-context": "^1.1.0",
152-
"rollup": "^2.8.0",
152+
"rollup": "^2.8.2",
153153
"rollup-plugin-babel": "^4.4.0",
154154
"rollup-plugin-commonjs": "^10.1.0",
155155
"rollup-plugin-node-resolve": "^5.2.0",
156156
"sass-loader": "^8.0.2",
157-
"standard-version": "^7.1.0",
157+
"standard-version": "^8.0.0",
158158
"terser": "^4.6.13",
159159
"vue": "^2.6.11",
160160
"vue-jest": "^3.0.5",

0 commit comments

Comments
 (0)