breaking(bundle-utils): drop useClassComponent option (#367)

* breaking(bundle-utils): drop unneccesary `vueVersion` option * breaking(bundle-utils): drop `useClassComponent` option * fix
intlify · May 16, 2024 · 68f63aa · 68f63aa
1 parent cebdc1c
commit 68f63aa
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 390 deletions.
diff --git a/packages/bundle-utils/src/codegen.ts b/packages/bundle-utils/src/codegen.ts
@@ -56,7 +56,6 @@ export interface CodeGenOptions {
  locale?: string
  env?: DevEnv
  forceStringify?: boolean
- useClassComponent?: boolean
  allowDynamic?: boolean
  strictMessage?: boolean
  escapeHtml?: boolean

diff --git a/packages/bundle-utils/src/js.ts b/packages/bundle-utils/src/js.ts
@@ -39,7 +39,6 @@ export function generate(
  onError = undefined,
  strictMessage = true,
  escapeHtml = false,
- useClassComponent = false,
  allowDynamic = false,
  jit = false
  }: CodeGenOptions
@@ -62,7 +61,6 @@ export function generate(
  onError,
  strictMessage,
  escapeHtml,
- useClassComponent,
  jit
  } as CodeGenOptions
  const generator = createCodeGenerator(options)
@@ -158,7 +156,7 @@ function _generate(
  const skipStack = [] as boolean[]
  const { forceStringify } = generator.context()
  const codeMaps = new Map<string, RawSourceMap>()
- const { type, sourceMap, isGlobal, locale, useClassComponent, jit } = options
+ const { type, sourceMap, isGlobal, locale, jit } = options
 
  const codegenFn: CodeGenFunction = jit
  ? generateResourceAst
@@ -188,12 +186,10 @@ function _generate(
  const exportSyntax = 'export default'
  generator.push(`${exportSyntax} function (Component) {`)
  generator.indent()
- // prettier-ignore
- const componentVariable = useClassComponent
- ? `Component.__o || Component.__vccOpts || Component`
- : `Component`
- // prettier-ignore
- generator.pushline(`const ${componentNamespace} = ${componentVariable}`)
+ const componentVariable = `Component`
+ generator.pushline(
+ `const ${componentNamespace} = ${componentVariable}`
+ )
  generator.pushline(
  `${componentNamespace}.${variableName} = ${componentNamespace}.${variableName} || []`
  )

diff --git a/packages/bundle-utils/src/json.ts b/packages/bundle-utils/src/json.ts
@@ -40,7 +40,6 @@ export function generate(
  onError = undefined,
  strictMessage = true,
  escapeHtml = false,
- useClassComponent = false,
  jit = false
  }: CodeGenOptions
 ): CodeGenResult<JSONProgram> {
@@ -64,7 +63,6 @@ export function generate(
  onError,
  strictMessage,
  escapeHtml,
- useClassComponent,
  jit
  } as CodeGenOptions
  const generator = createCodeGenerator(options)
@@ -114,7 +112,7 @@ function _generate(
  const itemsCountStack = [] as number[]
  const { forceStringify } = generator.context()
  const codeMaps = new Map<string, RawSourceMap>()
- const { type, sourceMap, isGlobal, locale, useClassComponent, jit } = options
+ const { type, sourceMap, isGlobal, locale, jit } = options
 
  const codegenFn: CodeGenFunction = jit
  ? generateResourceAst
@@ -137,12 +135,10 @@ function _generate(
  const exportSyntax = 'export default'
  generator.push(`${exportSyntax} function (Component) {`)
  generator.indent()
- // prettier-ignore
- const componentVariable = useClassComponent
- ? `Component.__o || Component.__vccOpts || Component`
- : `Component`
- // prettier-ignore
- generator.pushline(`const ${componentNamespace} = ${componentVariable}`)
+ const componentVariable = `Component`
+ generator.pushline(
+ `const ${componentNamespace} = ${componentVariable}`
+ )
  generator.pushline(
  `${componentNamespace}.${variableName} = ${componentNamespace}.${variableName} || []`
  )

diff --git a/packages/bundle-utils/src/yaml.ts b/packages/bundle-utils/src/yaml.ts
@@ -33,7 +33,6 @@ export function generate(
  {
  type = 'plain',
  onlyLocales = [],
- useClassComponent = false,
  filename = 'vue-i18n-loader.yaml',
  inSourceMap = undefined,
  locale = '',
@@ -64,7 +63,6 @@ export function generate(
  onError,
  strictMessage,
  escapeHtml,
- useClassComponent,
  jit
  } as CodeGenOptions
  const generator = createCodeGenerator(options)
@@ -107,7 +105,7 @@ function _generate(
  const itemsCountStack = [] as number[]
  const { forceStringify } = generator.context()
  const codeMaps = new Map<string, RawSourceMap>()
- const { type, sourceMap, isGlobal, locale, useClassComponent, jit } = options
+ const { type, sourceMap, isGlobal, locale, jit } = options
 
  const codegenFn: CodeGenFunction = jit
  ? generateResourceAst
@@ -129,12 +127,10 @@ function _generate(
  const exportSyntax = 'export default'
  generator.push(`${exportSyntax} function (Component) {`)
  generator.indent()
- // prettier-ignore
- const componentVariable = useClassComponent
- ? `Component.__o || Component.__vccOpts || Component`
- : `Component`
- // prettier-ignore
- generator.pushline(`const ${componentNamespace} = ${componentVariable}`)
+ const componentVariable = `Component`
+ generator.pushline(
+ `const ${componentNamespace} = ${componentVariable}`
+ )
  generator.pushline(
  `${componentNamespace}.${variableName} = ${componentNamespace}.${variableName} || []`
  )

diff --git a/packages/bundle-utils/test/generator/__snapshots__/js.test.ts.snap b/packages/bundle-utils/test/generator/__snapshots__/js.test.ts.snap
@@ -574,54 +574,3 @@ exports[`unhandling > map 1`] = `
  "version": 3,
 }
 `;
-
-exports[`useClassComponent > code 1`] = `
-"export default function (Component) {
- const _Component = Component.__o || Component.__vccOpts || Component
- _Component.__i18n = _Component.__i18n || []
- _Component.__i18n.push({
- \\"locale\\": \\"\\",
- \\"resource\\": {
- \\"hi\\": (()=>{const fn=(ctx) => {const { normalize: _normalize } = ctx;return _normalize([\\"hi there!\\"])};fn.source=\\"hi there!\\";return fn;})(),
- \\"nested\\": {
- \\"hello\\": (()=>{const fn=(ctx) => {const { normalize: _normalize } = ctx;return _normalize([\\"hello world!\\"])};fn.source=\\"hello world!\\";return fn;})(),
- \\"more\\": {
- \\"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;})()
- },
- \\"list\\": (()=>{const fn=(ctx) => {const { normalize: _normalize, interpolate: _interpolate, list: _list } = ctx;return _normalize([\\"hi, \\", _interpolate(_list(0)), \\" !\\"])};fn.source=\\"hi, {0} !\\";return fn;})()
- },
- \\"template\\": (()=>{const fn=(ctx) => {const { normalize: _normalize } = ctx;return _normalize([\\"hello world!\\"])};fn.source=\\"hello world!\\";return fn;})(),
- \\"こんにちは\\": (()=>{const fn=(ctx) => {const { normalize: _normalize } = ctx;return _normalize([\\"こんにちは！\\"])};fn.source=\\"こんにちは！\\";return fn;})(),
- \\"single-quote\\": (()=>{const fn=(ctx) => {const { normalize: _normalize } = ctx;return _normalize([\\"I don't know!\\"])};fn.source=\\"I don't know!\\";return fn;})(),
- \\"emoji\\": (()=>{const fn=(ctx) => {const { normalize: _normalize } = ctx;return _normalize([\\"😺\\"])};fn.source=\\"😺\\";return fn;})(),
- \\"unicode\\": (()=>{const fn=(ctx) => {const { normalize: _normalize } = ctx;return _normalize([\\"A\\"])};fn.source=\\"A\\";return fn;})(),
- \\"unicode-escape\\": (()=>{const fn=(ctx) => {const { normalize: _normalize } = ctx;return _normalize([\\"\\\\\\\\u0041\\"])};fn.source=\\"\\\\\\\\u0041\\";return fn;})(),
- \\"backslash-single-quote\\": (()=>{const fn=(ctx) => {const { normalize: _normalize } = ctx;return _normalize([\\"\\\\\\\\'\\"])};fn.source=\\"\\\\\\\\'\\";return fn;})(),
- \\"backslash-backslash\\": (()=>{const fn=(ctx) => {const { normalize: _normalize } = ctx;return _normalize([\\"\\\\\\\\\\\\\\\\\\"])};fn.source=\\"\\\\\\\\\\\\\\\\\\";return fn;})(),
- \\"errors\\": [
- (()=>{const fn=(ctx) => {const { normalize: _normalize } = ctx;return _normalize([\\"ERROR1001\\"])};fn.source=\\"ERROR1001\\";return fn;})(),
- (()=>{const fn=(ctx) => {const { normalize: _normalize } = ctx;return _normalize([\\"ERROR1002\\"])};fn.source=\\"ERROR1002\\";return fn;})(),
- 
- ],
- \\"complex\\": {
- \\"warnings\\": [
- (()=>{const fn=(ctx) => {const { normalize: _normalize } = ctx;return _normalize([\\"NOTE: This is warning\\"])};fn.source=\\"NOTE: This is warning\\";return fn;})(),
- {
- \\"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;})()
- }
- ]
- }
- }
- })
-}
-"
-`;
-
-exports[`useClassComponent > map 1`] = `
-{
- "mappings": "",
- "names": [],
- "sources": [],
- "version": 3,
-}
-`;