Skip to content

Commit f32db2f

Browse files
committed
chore: bump deps
1 parent 8b2c646 commit f32db2f

File tree

6 files changed

+887
-1046
lines changed

6 files changed

+887
-1046
lines changed

jest.config.js

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
module.exports = {
22
testURL: 'http://localhost',
3-
moduleFileExtensions: ['ts', 'js', 'json'],
43
transform: {
5-
'^.+\\.jsx?$': 'babel-jest',
6-
'^.+\\.tsx?$': '<rootDir>/node_modules/ts-jest/preprocessor.js'
7-
},
8-
testMatch: ['**/?(*.)(spec|test).ts']
4+
'^.+\\.tsx?$': 'ts-jest'
5+
}
96
}

package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,16 @@
3939
"@types/jest": "^22.2.3",
4040
"@types/node": "^10.12.20",
4141
"conventional-changelog-cli": "^2.0.11",
42-
"jest": "^22.4.2",
42+
"jest": "^24.0.0",
4343
"less": "^3.9.0",
4444
"lint-staged": "^8.1.1",
4545
"node-sass": "^4.11.0",
4646
"pug": "^2.0.3",
4747
"stylus": "^0.54.5",
48-
"ts-jest": "^22.4.2",
49-
"typescript": "^2.7.2",
50-
"vue": "^2.5.22",
51-
"vue-template-compiler": "^2.5.22",
48+
"ts-jest": "^24.0.0",
49+
"typescript": "^3.3.0",
50+
"vue": "^2.6.6",
51+
"vue-template-compiler": "^2.6.6",
5252
"yorkie": "^2.0.0"
5353
},
5454
"dependencies": {
@@ -60,6 +60,6 @@
6060
"postcss-selector-parser": "^5.0.0",
6161
"prettier": "1.16.3",
6262
"source-map": "~0.6.1",
63-
"vue-template-es2015-compiler": "^1.8.2"
63+
"vue-template-es2015-compiler": "^1.9.0"
6464
}
6565
}

test/compileStyle.spec.ts

+11-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { parse } from '../lib/parse'
22
import { compileStyle, compileStyleAsync } from '../lib/compileStyle'
33
import * as compiler from 'vue-template-compiler'
4+
import { VueTemplateCompiler } from '../lib/types'
45

56
test('preprocess less', () => {
67
const style = parse({
@@ -9,7 +10,7 @@ test('preprocess less', () => {
910
'@red: rgb(255, 0, 0);\n' +
1011
'.color { color: @red; }\n' +
1112
'</style>\n',
12-
compiler,
13+
compiler: compiler as VueTemplateCompiler,
1314
filename: 'example.vue',
1415
needMap: true
1516
}).styles[0]
@@ -34,7 +35,7 @@ test('preprocess scss', () => {
3435
'$red: rgb(255, 0, 0);\n' +
3536
'.color { color: $red; }\n' +
3637
'</style>\n',
37-
compiler,
38+
compiler: compiler as VueTemplateCompiler,
3839
filename: 'example.vue',
3940
needMap: true
4041
}).styles[0]
@@ -60,7 +61,7 @@ test('preprocess sass', () => {
6061
'.color\n' +
6162
' color: $red\n' +
6263
'</style>\n',
63-
compiler,
64+
compiler: compiler as VueTemplateCompiler,
6465
filename: 'example.vue',
6566
needMap: true
6667
}).styles[0]
@@ -86,7 +87,7 @@ test('preprocess stylus', () => {
8687
'.color\n' +
8788
' color: red-color\n' +
8889
'</style>\n',
89-
compiler,
90+
compiler: compiler as VueTemplateCompiler,
9091
filename: 'example.vue',
9192
needMap: true
9293
}).styles[0]
@@ -137,7 +138,9 @@ test('async postcss plugin in sync mode', () => {
137138
source: '.foo { color: red }',
138139
scoped: false,
139140
postcssPlugins: [
140-
require('postcss').plugin('test-plugin', () => async result => result)
141+
require('postcss').plugin('test-plugin', () => async (result: any) =>
142+
result
143+
)
141144
]
142145
})
143146

@@ -151,7 +154,9 @@ test('async postcss plugin', async () => {
151154
source: '.foo { color: red }',
152155
scoped: false,
153156
postcssPlugins: [
154-
require('postcss').plugin('test-plugin', () => async result => result)
157+
require('postcss').plugin('test-plugin', () => async (result: any) =>
158+
result
159+
)
155160
]
156161
})
157162

test/compileTemplate.spec.ts

+15-14
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
import { parse } from '../lib/parse'
22
import { compileTemplate } from '../lib/compileTemplate'
33
import * as compiler from 'vue-template-compiler'
4-
54
import Vue from 'vue'
65

6+
import { VueTemplateCompiler } from '../lib/types'
7+
78
afterEach(() => jest.resetAllMocks().resetModules())
89

9-
function mockRender(code, options = {}) {
10+
function mockRender(code: string, options: any = {}) {
1011
eval(
1112
`${code}; options.render = render; options.staticRenderFns = staticRenderFns`
1213
)
1314
const vm = new Vue(Object.assign({}, options))
1415
vm.$mount()
15-
return vm._vnode
16+
return (vm as any)._vnode
1617
}
1718

1819
test('should work', () => {
@@ -21,7 +22,7 @@ test('should work', () => {
2122
const result = compileTemplate({
2223
filename: 'example.vue',
2324
source,
24-
compiler: compiler
25+
compiler: compiler as VueTemplateCompiler
2526
})
2627

2728
expect(result.errors.length).toBe(0)
@@ -44,16 +45,16 @@ test('preprocess pug', () => {
4445
' div.container\n' +
4546
' p Cool Pug example!\n' +
4647
'</template>\n',
47-
compiler,
48+
compiler: compiler as VueTemplateCompiler,
4849
filename: 'example.vue',
4950
needMap: true
50-
}).template
51+
}).template as compiler.SFCBlock
5152

5253
const result = compileTemplate({
5354
filename: 'example.vue',
5455
source: template.content,
5556
preprocessLang: template.lang,
56-
compiler: compiler
57+
compiler: compiler as VueTemplateCompiler
5758
})
5859

5960
expect(result.errors.length).toBe(0)
@@ -72,7 +73,7 @@ test('supports uri fragment in transformed require', () => {
7273
transformAssetUrls: {
7374
use: 'href'
7475
},
75-
compiler: compiler
76+
compiler: compiler as VueTemplateCompiler
7677
})
7778
expect(result.errors.length).toBe(0)
7879
expect(result.code).toMatch(
@@ -93,7 +94,7 @@ test('when too short uri then empty require', () => {
9394
transformAssetUrls: {
9495
use: 'href'
9596
},
96-
compiler: compiler
97+
compiler: compiler as VueTemplateCompiler
9798
})
9899
expect(result.errors.length).toBe(0)
99100
expect(result.code).toMatch(/href: require\(""\)/)
@@ -102,16 +103,16 @@ test('when too short uri then empty require', () => {
102103
test('warn missing preprocessor', () => {
103104
const template = parse({
104105
source: '<template lang="unknownLang">\n' + '</template>\n',
105-
compiler,
106+
compiler: compiler as VueTemplateCompiler,
106107
filename: 'example.vue',
107108
needMap: true
108-
}).template
109+
}).template as compiler.SFCBlock
109110

110111
const result = compileTemplate({
111112
filename: 'example.vue',
112113
source: template.content,
113114
preprocessLang: template.lang,
114-
compiler: compiler
115+
compiler: compiler as VueTemplateCompiler
115116
})
116117

117118
expect(result.errors.length).toBe(1)
@@ -126,7 +127,7 @@ test('transform assetUrls', () => {
126127
</div>
127128
`
128129
const result = compileTemplate({
129-
compiler: compiler,
130+
compiler: compiler as VueTemplateCompiler,
130131
filename: 'example.vue',
131132
source,
132133
transformAssetUrls: true
@@ -169,7 +170,7 @@ test('transform srcset', () => {
169170
</div>
170171
`
171172
const result = compileTemplate({
172-
compiler: compiler,
173+
compiler: compiler as VueTemplateCompiler,
173174
filename: 'example.vue',
174175
source,
175176
transformAssetUrls: true

tsconfig.json

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"target": "es2015",
77
"module": "commonjs",
88
"moduleResolution": "node",
9+
"esModuleInterop": true,
910
"declaration": true,
1011
"allowJs": false,
1112
"allowSyntheticDefaultImports": true,

0 commit comments

Comments
 (0)