feat: RFC 436 Leaves Experimental (#2545)

vuejs · Mar 25, 2023 · 836043a · 836043a
1 parent 8a7d552
commit 836043a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/packages/vue-language-core/schemas/vue-tsconfig.deprecated.schema.json b/packages/vue-language-core/schemas/vue-tsconfig.deprecated.schema.json
@@ -53,6 +53,12 @@
  },
  "bypassDefineComponentToExposePropsAndEmitsForJsScriptSetupComponents": {
  "deprecated": true
+ },
+ "experimentalRfc436": {
+ "deprecated": true,
+ "type": "boolean",
+ "default": false,
+ "markdownDescription": "This flag is no longer needed after v1.4.0.\n\n[RFC](https://github.com/vuejs/rfcs/discussions/436)"
  }
  }
  }

diff --git a/packages/vue-language-core/schemas/vue-tsconfig.schema.json b/packages/vue-language-core/schemas/vue-tsconfig.schema.json
@@ -93,11 +93,6 @@
  ],
  "markdownDescription": "https://github.com/johnsoncodehk/volar/issues/1038, https://github.com/johnsoncodehk/volar/issues/1121"
  },
- "experimentalRfc436": {
- "type": "boolean",
- "default": false,
- "markdownDescription": "https://github.com/vuejs/rfcs/discussions/436"
- },
  "experimentalUseElementAccessInTemplate": {
  "type": "boolean",
  "default": false,

diff --git a/packages/vue-language-core/src/generators/script.ts b/packages/vue-language-core/src/generators/script.ts
@@ -76,7 +76,7 @@ export function generate(
  ConstructorOverloads: false,
  WithTemplateSlots: false,
  };
- const generateFunctionType = !!vueCompilerOptions.experimentalRfc436 && !!sfc.scriptSetup?.generic;
+ const generateFunctionType = !!sfc.scriptSetup?.generic;
 
  writeScriptSrc();
  writeScriptSetupImportsSegment();
@@ -309,6 +309,9 @@ export function generate(
  sfc.scriptSetup.genericOffset,
  FileRangeCapabilities.full,
  ]);
+ if (!sfc.scriptSetup.generic.endsWith(',')) {
+ codeGen.push(`,`);
+ }
  codeGen.push(`>`);
  }
  codeGen.push('(');

diff --git a/packages/vue-language-core/src/types.ts b/packages/vue-language-core/src/types.ts
@@ -33,7 +33,6 @@ export interface VueCompilerOptions {
 
  // experimental
  experimentalResolveStyleCssClasses: 'scoped' | 'always' | 'never';
- experimentalRfc436: boolean;
  experimentalModelPropName: Record<string, Record<string, boolean | Record<string, string> | Record<string, string>[]>>;
  experimentalUseElementAccessInTemplate: boolean;
  experimentalAdditionalLanguageModules: string[];

diff --git a/packages/vue-language-core/src/utils/ts.ts b/packages/vue-language-core/src/utils/ts.ts
@@ -209,7 +209,6 @@ export function resolveVueCompilerOptions(vueOptions: Partial<VueCompilerOptions
  // experimental
  experimentalAdditionalLanguageModules: vueOptions.experimentalAdditionalLanguageModules ?? [],
  experimentalResolveStyleCssClasses: vueOptions.experimentalResolveStyleCssClasses ?? 'scoped',
- experimentalRfc436: vueOptions.experimentalRfc436 ?? false,
  // https://github.com/vuejs/vue-next/blob/master/packages/compiler-dom/src/transforms/vModel.ts#L49-L51
  // https://vuejs.org/guide/essentials/forms.html#form-input-bindings
  experimentalModelPropName: vueOptions.experimentalModelPropName ?? {