Skip to content

Commit 2c5d9a1

Browse files
haoqunjianghaoqunjiang
committed
style: format code with prettier 2
1 parent 7d3bc47 commit 2c5d9a1

File tree

6 files changed

+45
-45
lines changed

6 files changed

+45
-45
lines changed

‎src/index.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import {
2121
SFCTemplateCompileOptions,
2222
SFCScriptCompileOptions,
2323
SFCStyleBlock,
24-
SFCScriptBlock
24+
SFCScriptBlock,
2525
} from '@vue/compiler-sfc'
2626
import { selectBlock } from './select'
2727
import { genHotReloadCode } from './hotReload'
@@ -75,7 +75,7 @@ export default function loader(
7575
sourceMap,
7676
rootContext,
7777
resourcePath,
78-
resourceQuery
78+
resourceQuery,
7979
} = loaderContext
8080

8181
const rawQuery = resourceQuery.slice(1)
@@ -88,11 +88,11 @@ export default function loader(
8888

8989
const { descriptor, errors } = parse(source, {
9090
filename: resourcePath,
91-
sourceMap
91+
sourceMap,
9292
})
9393

9494
if (errors.length) {
95-
errors.forEach(err => {
95+
errors.forEach((err) => {
9696
formatError(err, source, resourcePath)
9797
loaderContext.emitError(err)
9898
})
@@ -119,7 +119,7 @@ export default function loader(
119119
const id = hash(isProduction ? shortFilePath + '\n' + source : shortFilePath)
120120

121121
// feature information
122-
const hasScoped = descriptor.styles.some(s => s.scoped)
122+
const hasScoped = descriptor.styles.some((s) => s.scoped)
123123
const needsHotReload =
124124
!isServer &&
125125
!isProduction &&
@@ -132,7 +132,7 @@ export default function loader(
132132
if (descriptor.script || descriptor.scriptSetup) {
133133
try {
134134
script = (descriptor as any).scriptCompiled = compileScript(descriptor, {
135-
babelParserPlugins: options.babelParserPlugins
135+
babelParserPlugins: options.babelParserPlugins,
136136
})
137137
} catch (e) {
138138
loaderContext.emitError(e)
@@ -201,7 +201,7 @@ export default function loader(
201201
templateImport,
202202
scriptImport,
203203
stylesCode,
204-
templateImport ? `script.${renderFnName} = ${renderFnName}` : ``
204+
templateImport ? `script.${renderFnName} = ${renderFnName}` : ``,
205205
]
206206
.filter(Boolean)
207207
.join('\n')

‎src/pitcher.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ const isCSSLoader = (l: Loader) => /(\/|\\|@)css-loader/.test(l.path)
2020
const isCacheLoader = (l: Loader) => /(\/|\\|@)cache-loader/.test(l.path)
2121
const isNotPitcher = (l: Loader) => l.path !== __filename
2222

23-
const pitcher: webpack.loader.Loader = code => code
23+
const pitcher: webpack.loader.Loader = (code) => code
2424

2525
// This pitching loader is responsible for intercepting all vue block requests
2626
// and transform it into appropriate requests.
27-
export const pitch = function() {
27+
export const pitch = function () {
2828
const context = this as webpack.loader.LoaderContext
2929
const rawLoaders = context.loaders.filter(isNotPitcher)
3030
let loaders = rawLoaders
@@ -47,7 +47,7 @@ export const pitch = function() {
4747
// and the cloned rule would match a source import request or a
4848
// resourceQuery-only rule that intends to target a custom block with no lang
4949
const seen = new Map()
50-
loaders = loaders.filter(loader => {
50+
loaders = loaders.filter((loader) => {
5151
const identifier =
5252
typeof loader === 'string'
5353
? loader
@@ -100,7 +100,7 @@ function genProxyModule(
100100
}
101101

102102
function genRequest(loaders: Loader[], context: webpack.loader.LoaderContext) {
103-
const loaderStrings = loaders.map(loader => {
103+
const loaderStrings = loaders.map((loader) => {
104104
return typeof loader === 'string' ? loader : loader.request
105105
})
106106
const resource = context.resourcePath + context.resourceQuery
@@ -111,7 +111,7 @@ function genRequest(loaders: Loader[], context: webpack.loader.LoaderContext) {
111111
}
112112

113113
function shouldIgnoreCustomBlock(loaders: Loader[]) {
114-
const actualLoaders = loaders.filter(loader => {
114+
const actualLoaders = loaders.filter((loader) => {
115115
// vue-loader
116116
if (loader.path === selfPath) {
117117
return false

‎src/pluginWebpack4.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class VueLoaderPlugin implements webpack.Plugin {
1212

1313
apply(compiler: webpack.Compiler) {
1414
// inject NS for plugin installation check in the main loader
15-
compiler.hooks.compilation.tap(id, compilation => {
15+
compiler.hooks.compilation.tap(id, (compilation) => {
1616
compilation.hooks.normalModuleLoader.tap(id, (loaderContext: any) => {
1717
loaderContext[NS] = true
1818
})
@@ -45,7 +45,7 @@ class VueLoaderPlugin implements webpack.Plugin {
4545
// get the normlized "use" for vue files
4646
const vueUse = vueRule.use as webpack.RuleSetLoader[]
4747
// get vue-loader options
48-
const vueLoaderUseIndex = vueUse.findIndex(u => {
48+
const vueLoaderUseIndex = vueUse.findIndex((u) => {
4949
return /^vue-loader|(\/|\\|@)vue-loader/.test(u.loader || '')
5050
})
5151

@@ -62,7 +62,7 @@ class VueLoaderPlugin implements webpack.Plugin {
6262

6363
// for each user rule (expect the vue rule), create a cloned rule
6464
// that targets the corresponding language blocks in *.vue files.
65-
const clonedRules = rules.filter(r => r !== vueRule).map(cloneRule)
65+
const clonedRules = rules.filter((r) => r !== vueRule).map(cloneRule)
6666

6767
// rule for template compiler
6868
const templateCompilerRule = {
@@ -71,7 +71,7 @@ class VueLoaderPlugin implements webpack.Plugin {
7171
const parsed = qs.parse(query.slice(1))
7272
return parsed.vue != null && parsed.type === 'template'
7373
},
74-
options: vueLoaderOptions
74+
options: vueLoaderOptions,
7575
}
7676

7777
// for each rule that matches plain .js files, also create a clone and
@@ -80,7 +80,7 @@ class VueLoaderPlugin implements webpack.Plugin {
8080
// (mostly babel)
8181
const matchesJS = createMatcher(`test.js`)
8282
const jsRulesForRenderFn = rules
83-
.filter(r => r !== vueRule && matchesJS(r))
83+
.filter((r) => r !== vueRule && matchesJS(r))
8484
.map(cloneRuleForRenderFn)
8585

8686
// pitcher for block requests (for injecting stylePostLoader and deduping
@@ -90,7 +90,7 @@ class VueLoaderPlugin implements webpack.Plugin {
9090
resourceQuery: (query: string) => {
9191
const parsed = qs.parse(query.slice(1))
9292
return parsed.vue != null
93-
}
93+
},
9494
}
9595

9696
// replace original rules
@@ -99,7 +99,7 @@ class VueLoaderPlugin implements webpack.Plugin {
9999
...jsRulesForRenderFn,
100100
templateCompilerRule,
101101
...clonedRules,
102-
...rules
102+
...rules,
103103
]
104104
}
105105
}
@@ -145,7 +145,7 @@ function cloneRule(rule: webpack.RuleSetRule) {
145145
return false
146146
}
147147
return true
148-
}
148+
},
149149
}
150150

151151
if (rule.rules) {
@@ -182,7 +182,7 @@ function cloneRuleForRenderFn(rule: webpack.RuleSetRule) {
182182
return false
183183
}
184184
return true
185-
}
185+
},
186186
}
187187

188188
if (rule.rules) {

‎src/pluginWebpack5.ts‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,15 @@ const ruleSetCompiler = new RuleSetCompiler([
7474
new BasicEffectRulePlugin('sideEffects'),
7575
new BasicEffectRulePlugin('parser'),
7676
new BasicEffectRulePlugin('resolve'),
77-
new UseEffectRulePlugin()
77+
new UseEffectRulePlugin(),
7878
])
7979

8080
class VueLoaderPlugin implements Plugin {
8181
static NS = NS
8282

8383
apply(compiler: Compiler) {
8484
// add NS marker so that the loader can detect and report missing plugin
85-
compiler.hooks.compilation.tap(id, compilation => {
85+
compiler.hooks.compilation.tap(id, (compilation) => {
8686
NormalModule.getCompilationHooks(compilation).loader.tap(
8787
id,
8888
(loaderContext: any) => {
@@ -123,11 +123,11 @@ class VueLoaderPlugin implements Plugin {
123123

124124
// get the normlized "use" for vue files
125125
const vueUse = vueRules
126-
.filter(rule => rule.type === 'use')
127-
.map(rule => rule.value)
126+
.filter((rule) => rule.type === 'use')
127+
.map((rule) => rule.value)
128128

129129
// get vue-loader options
130-
const vueLoaderUseIndex = vueUse.findIndex(u => {
130+
const vueLoaderUseIndex = vueUse.findIndex((u) => {
131131
return /^vue-loader|(\/|\\|@)vue-loader/.test(u.loader)
132132
})
133133

@@ -149,8 +149,8 @@ class VueLoaderPlugin implements Plugin {
149149
// that targets the corresponding language blocks in *.vue files.
150150
const refs = new Map()
151151
const clonedRules = rules
152-
.filter(r => r !== rawVueRule)
153-
.map(rawRule =>
152+
.filter((r) => r !== rawVueRule)
153+
.map((rawRule) =>
154154
cloneRule(rawRule, refs, langBlockRuleCheck, langBlockRuleResource)
155155
)
156156

@@ -166,16 +166,16 @@ class VueLoaderPlugin implements Plugin {
166166
const parsed = qs.parse(query.slice(1))
167167
return parsed.vue != null && parsed.type === 'template'
168168
},
169-
options: vueLoaderOptions
169+
options: vueLoaderOptions,
170170
}
171171

172172
// for each rule that matches plain .js files, also create a clone and
173173
// match it against the compiled template code inside *.vue files, so that
174174
// compiled vue render functions receive the same treatment as user code
175175
// (mostly babel)
176176
const jsRulesForRenderFn = rules
177-
.filter(r => r !== rawVueRule && match(r, 'test.js').length > 0)
178-
.map(rawRule => cloneRule(rawRule, refs, jsRuleCheck, jsRuleResource))
177+
.filter((r) => r !== rawVueRule && match(r, 'test.js').length > 0)
178+
.map((rawRule) => cloneRule(rawRule, refs, jsRuleCheck, jsRuleResource))
179179

180180
// global pitcher (responsible for injecting template compiler loader & CSS
181181
// post loader)
@@ -184,7 +184,7 @@ class VueLoaderPlugin implements Plugin {
184184
resourceQuery: (query: string) => {
185185
const parsed = qs.parse(query.slice(1))
186186
return parsed.vue != null
187-
}
187+
},
188188
}
189189

190190
// replace original rules
@@ -193,7 +193,7 @@ class VueLoaderPlugin implements Plugin {
193193
...jsRulesForRenderFn,
194194
templateCompilerRule,
195195
...clonedRules,
196-
...rules
196+
...rules,
197197
]
198198
}
199199
}
@@ -212,7 +212,7 @@ function match(rule: RawRule, fakeFile: string): Effect[] {
212212
}
213213

214214
return ruleSet.exec({
215-
resource: fakeFile
215+
resource: fakeFile,
216216
})
217217
}
218218

@@ -252,7 +252,7 @@ function cloneRule(
252252
// do not process rule with enforce
253253
if (!rawRule.enforce) {
254254
const ruleUse = compiledRule.effects
255-
.filter(effect => effect.type === 'use')
255+
.filter((effect) => effect.type === 'use')
256256
.map((effect: UseEffect) => effect.value)
257257
// fix conflict with config.loader and config.options when using config.use
258258
delete rawRule.loader
@@ -285,19 +285,19 @@ function cloneRule(
285285
}
286286
}
287287
return true
288-
}
288+
},
289289
}
290290

291291
delete res.test
292292

293293
if (rawRule.rules) {
294-
res.rules = rawRule.rules.map(rule =>
294+
res.rules = rawRule.rules.map((rule) =>
295295
cloneRule(rule, refs, ruleCheck, ruleResource)
296296
)
297297
}
298298

299299
if (rawRule.oneOf) {
300-
res.oneOf = rawRule.oneOf.map(rule =>
300+
res.oneOf = rawRule.oneOf.map((rule) =>
301301
cloneRule(rule, refs, ruleCheck, ruleResource)
302302
)
303303
}

‎src/stylePostLoader.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import webpack from 'webpack'
55
// This is a post loader that handles scoped CSS transforms.
66
// Injected right before css-loader by the global pitcher (../pitch.js)
77
// for any <style scoped> selection requests initiated from within vue files.
8-
const StylePostLoader: webpack.loader.Loader = function(source, inMap) {
8+
const StylePostLoader: webpack.loader.Loader = function (source, inMap) {
99
const query = qs.parse(this.resourceQuery.slice(1))
1010
const { code, map, errors } = compileStyle({
1111
source: source as string,
@@ -14,7 +14,7 @@ const StylePostLoader: webpack.loader.Loader = function(source, inMap) {
1414
map: inMap,
1515
scoped: !!query.scoped,
1616
vars: !!query.vars,
17-
trim: true
17+
trim: true,
1818
})
1919

2020
if (errors.length) {

‎src/templateLoader.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { compileTemplate, TemplateCompiler } from '@vue/compiler-sfc'
88
// Loader that compiles raw template into JavaScript functions.
99
// This is injected by the global pitcher (../pitch) for template
1010
// selection requests initiated from vue files.
11-
const TemplateLoader: webpack.loader.Loader = function(source, inMap) {
11+
const TemplateLoader: webpack.loader.Loader = function (source, inMap) {
1212
source = String(source)
1313
const loaderContext = this
1414

@@ -40,21 +40,21 @@ const TemplateLoader: webpack.loader.Loader = function(source, inMap) {
4040
...options.compilerOptions,
4141
scopeId,
4242
bindingMetadata:
43-
typeof query.bindings === 'string' ? JSON.parse(query.bindings) : {}
43+
typeof query.bindings === 'string' ? JSON.parse(query.bindings) : {},
4444
},
45-
transformAssetUrls: options.transformAssetUrls || true
45+
transformAssetUrls: options.transformAssetUrls || true,
4646
})
4747

4848
// tips
4949
if (compiled.tips.length) {
50-
compiled.tips.forEach(tip => {
50+
compiled.tips.forEach((tip) => {
5151
loaderContext.emitWarning(tip)
5252
})
5353
}
5454

5555
// errors
5656
if (compiled.errors && compiled.errors.length) {
57-
compiled.errors.forEach(err => {
57+
compiled.errors.forEach((err) => {
5858
if (typeof err === 'string') {
5959
loaderContext.emitError(err)
6060
} else {

0 commit comments

Comments
 (0)