Skip to content

Commit 68f63aa

Browse files
kazuponkazupon
authored
breaking(bundle-utils): drop useClassComponent option (#367)
* breaking(bundle-utils): drop unneccesary `vueVersion` option * breaking(bundle-utils): drop `useClassComponent` option * fix
1 parent cebdc1c commit 68f63aa

File tree

10 files changed

+17
-390
lines changed

10 files changed

+17
-390
lines changed

‎packages/bundle-utils/src/codegen.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ export interface CodeGenOptions {
5656
locale?: string
5757
env?: DevEnv
5858
forceStringify?: boolean
59-
useClassComponent?: boolean
6059
allowDynamic?: boolean
6160
strictMessage?: boolean
6261
escapeHtml?: boolean

‎packages/bundle-utils/src/js.ts

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ export function generate(
3939
onError = undefined,
4040
strictMessage = true,
4141
escapeHtml = false,
42-
useClassComponent = false,
4342
allowDynamic = false,
4443
jit = false
4544
}: CodeGenOptions
@@ -62,7 +61,6 @@ export function generate(
6261
onError,
6362
strictMessage,
6463
escapeHtml,
65-
useClassComponent,
6664
jit
6765
} as CodeGenOptions
6866
const generator = createCodeGenerator(options)
@@ -158,7 +156,7 @@ function _generate(
158156
const skipStack = [] as boolean[]
159157
const { forceStringify } = generator.context()
160158
const codeMaps = new Map<string, RawSourceMap>()
161-
const { type, sourceMap, isGlobal, locale, useClassComponent, jit } = options
159+
const { type, sourceMap, isGlobal, locale, jit } = options
162160

163161
const codegenFn: CodeGenFunction = jit
164162
? generateResourceAst
@@ -188,12 +186,10 @@ function _generate(
188186
const exportSyntax = 'export default'
189187
generator.push(`${exportSyntax} function (Component) {`)
190188
generator.indent()
191-
// prettier-ignore
192-
const componentVariable = useClassComponent
193-
? `Component.__o || Component.__vccOpts || Component`
194-
: `Component`
195-
// prettier-ignore
196-
generator.pushline(`const ${componentNamespace} = ${componentVariable}`)
189+
const componentVariable = `Component`
190+
generator.pushline(
191+
`const ${componentNamespace} = ${componentVariable}`
192+
)
197193
generator.pushline(
198194
`${componentNamespace}.${variableName} = ${componentNamespace}.${variableName} || []`
199195
)

‎packages/bundle-utils/src/json.ts

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ export function generate(
4040
onError = undefined,
4141
strictMessage = true,
4242
escapeHtml = false,
43-
useClassComponent = false,
4443
jit = false
4544
}: CodeGenOptions
4645
): CodeGenResult<JSONProgram> {
@@ -64,7 +63,6 @@ export function generate(
6463
onError,
6564
strictMessage,
6665
escapeHtml,
67-
useClassComponent,
6866
jit
6967
} as CodeGenOptions
7068
const generator = createCodeGenerator(options)
@@ -114,7 +112,7 @@ function _generate(
114112
const itemsCountStack = [] as number[]
115113
const { forceStringify } = generator.context()
116114
const codeMaps = new Map<string, RawSourceMap>()
117-
const { type, sourceMap, isGlobal, locale, useClassComponent, jit } = options
115+
const { type, sourceMap, isGlobal, locale, jit } = options
118116

119117
const codegenFn: CodeGenFunction = jit
120118
? generateResourceAst
@@ -137,12 +135,10 @@ function _generate(
137135
const exportSyntax = 'export default'
138136
generator.push(`${exportSyntax} function (Component) {`)
139137
generator.indent()
140-
// prettier-ignore
141-
const componentVariable = useClassComponent
142-
? `Component.__o || Component.__vccOpts || Component`
143-
: `Component`
144-
// prettier-ignore
145-
generator.pushline(`const ${componentNamespace} = ${componentVariable}`)
138+
const componentVariable = `Component`
139+
generator.pushline(
140+
`const ${componentNamespace} = ${componentVariable}`
141+
)
146142
generator.pushline(
147143
`${componentNamespace}.${variableName} = ${componentNamespace}.${variableName} || []`
148144
)

‎packages/bundle-utils/src/yaml.ts

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ export function generate(
3333
{
3434
type = 'plain',
3535
onlyLocales = [],
36-
useClassComponent = false,
3736
filename = 'vue-i18n-loader.yaml',
3837
inSourceMap = undefined,
3938
locale = '',
@@ -64,7 +63,6 @@ export function generate(
6463
onError,
6564
strictMessage,
6665
escapeHtml,
67-
useClassComponent,
6866
jit
6967
} as CodeGenOptions
7068
const generator = createCodeGenerator(options)
@@ -107,7 +105,7 @@ function _generate(
107105
const itemsCountStack = [] as number[]
108106
const { forceStringify } = generator.context()
109107
const codeMaps = new Map<string, RawSourceMap>()
110-
const { type, sourceMap, isGlobal, locale, useClassComponent, jit } = options
108+
const { type, sourceMap, isGlobal, locale, jit } = options
111109

112110
const codegenFn: CodeGenFunction = jit
113111
? generateResourceAst
@@ -129,12 +127,10 @@ function _generate(
129127
const exportSyntax = 'export default'
130128
generator.push(`${exportSyntax} function (Component) {`)
131129
generator.indent()
132-
// prettier-ignore
133-
const componentVariable = useClassComponent
134-
? `Component.__o || Component.__vccOpts || Component`
135-
: `Component`
136-
// prettier-ignore
137-
generator.pushline(`const ${componentNamespace} = ${componentVariable}`)
130+
const componentVariable = `Component`
131+
generator.pushline(
132+
`const ${componentNamespace} = ${componentVariable}`
133+
)
138134
generator.pushline(
139135
`${componentNamespace}.${variableName} = ${componentNamespace}.${variableName} || []`
140136
)

‎packages/bundle-utils/test/generator/__snapshots__/js.test.ts.snap

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -574,54 +574,3 @@ exports[`unhandling > map 1`] = `
574574
"version": 3,
575575
}
576576
`;
577-
578-
exports[`useClassComponent > code 1`] = `
579-
"export default function (Component) {
580-
const _Component = Component.__o || Component.__vccOpts || Component
581-
_Component.__i18n = _Component.__i18n || []
582-
_Component.__i18n.push({
583-
\\"locale\\": \\"\\",
584-
\\"resource\\": {
585-
\\"hi\\": (()=>{const fn=(ctx) => {const { normalize: _normalize } = ctx;return _normalize([\\"hi there!\\"])};fn.source=\\"hi there!\\";return fn;})(),
586-
\\"nested\\": {
587-
\\"hello\\": (()=>{const fn=(ctx) => {const { normalize: _normalize } = ctx;return _normalize([\\"hello world!\\"])};fn.source=\\"hello world!\\";return fn;})(),
588-
\\"more\\": {
589-
\\"plural\\": (()=>{const fn=(ctx) => {const { normalize: _normalize, linked: _linked, type: _type, interpolate: _interpolate, list: _list, named: _named, plural: _plural } = ctx;return _plural([_normalize([_linked(\\"no apples\\", \\"caml\\", _type)]), _normalize([_interpolate(_list(0)), \\" apple\\"]), _normalize([_interpolate(_named(\\"n\\")), \\" apples\\"])])};fn.source=\\"@.caml:{'no apples'} | {0} apple | {n} apples\\";return fn;})()
590-
},
591-
\\"list\\": (()=>{const fn=(ctx) => {const { normalize: _normalize, interpolate: _interpolate, list: _list } = ctx;return _normalize([\\"hi, \\", _interpolate(_list(0)), \\" !\\"])};fn.source=\\"hi, {0} !\\";return fn;})()
592-
},
593-
\\"template\\": (()=>{const fn=(ctx) => {const { normalize: _normalize } = ctx;return _normalize([\\"hello world!\\"])};fn.source=\\"hello world!\\";return fn;})(),
594-
\\"こんにちは\\": (()=>{const fn=(ctx) => {const { normalize: _normalize } = ctx;return _normalize([\\"こんにちは！\\"])};fn.source=\\"こんにちは！\\";return fn;})(),
595-
\\"single-quote\\": (()=>{const fn=(ctx) => {const { normalize: _normalize } = ctx;return _normalize([\\"I don't know!\\"])};fn.source=\\"I don't know!\\";return fn;})(),
596-
\\"emoji\\": (()=>{const fn=(ctx) => {const { normalize: _normalize } = ctx;return _normalize([\\"😺\\"])};fn.source=\\"😺\\";return fn;})(),
597-
\\"unicode\\": (()=>{const fn=(ctx) => {const { normalize: _normalize } = ctx;return _normalize([\\"A\\"])};fn.source=\\"A\\";return fn;})(),
598-
\\"unicode-escape\\": (()=>{const fn=(ctx) => {const { normalize: _normalize } = ctx;return _normalize([\\"\\\\\\\\u0041\\"])};fn.source=\\"\\\\\\\\u0041\\";return fn;})(),
599-
\\"backslash-single-quote\\": (()=>{const fn=(ctx) => {const { normalize: _normalize } = ctx;return _normalize([\\"\\\\\\\\'\\"])};fn.source=\\"\\\\\\\\'\\";return fn;})(),
600-
\\"backslash-backslash\\": (()=>{const fn=(ctx) => {const { normalize: _normalize } = ctx;return _normalize([\\"\\\\\\\\\\\\\\\\\\"])};fn.source=\\"\\\\\\\\\\\\\\\\\\";return fn;})(),
601-
\\"errors\\": [
602-
(()=>{const fn=(ctx) => {const { normalize: _normalize } = ctx;return _normalize([\\"ERROR1001\\"])};fn.source=\\"ERROR1001\\";return fn;})(),
603-
(()=>{const fn=(ctx) => {const { normalize: _normalize } = ctx;return _normalize([\\"ERROR1002\\"])};fn.source=\\"ERROR1002\\";return fn;})(),
604-
605-
],
606-
\\"complex\\": {
607-
\\"warnings\\": [
608-
(()=>{const fn=(ctx) => {const { normalize: _normalize } = ctx;return _normalize([\\"NOTE: This is warning\\"])};fn.source=\\"NOTE: This is warning\\";return fn;})(),
609-
{
610-
\\"named-waring\\": (()=>{const fn=(ctx) => {const { normalize: _normalize, interpolate: _interpolate, named: _named } = ctx;return _normalize([\\"this is \\", _interpolate(_named(\\"type\\")), \\" warining\\"])};fn.source=\\"this is {type} warining\\";return fn;})()
611-
}
612-
]
613-
}
614-
}
615-
})
616-
}
617-
"
618-
`;
619-
620-
exports[`useClassComponent > map 1`] = `
621-
{
622-
"mappings": "",
623-
"names": [],
624-
"sources": [],
625-
"version": 3,
626-
}
627-
`;

0 commit comments

Comments
 (0)