chore: rename to preserveLeadingTilde

diff --git a/packages/compiler-sfc/__tests__/__snapshots__/templateTransformAssetUrl.spec.ts.snap b/packages/compiler-sfc/__tests__/__snapshots__/templateTransformAssetUrl.spec.ts.snap
index 6d95091ddb2a0f23cd67ed402c5f9f6750aaae7d..8990aa5905f450cfbfb2da46e40a86b634e0effd 100644 (file)
--- a/packages/compiler-sfc/__tests__/__snapshots__/templateTransformAssetUrl.spec.ts.snap
+++ b/packages/compiler-sfc/__tests__/__snapshots__/templateTransformAssetUrl.spec.ts.snap
@@ -119,7 +119,7 @@ export function render(_ctx, _cache) {
 }"
 `;
 
-exports[`compiler sfc: transform asset url > with preserveTilde: true 1`] = `
+exports[`compiler sfc: transform asset url > with preserveLeadingTilde: true 1`] = `
 "import { createElementVNode as _createElementVNode, Fragment as _Fragment, openBlock as _openBlock, createElementBlock as _createElementBlock } from "vue"
 import _imports_0 from '~/app/bar.png'
 import _imports_1 from '~app/bar.png'

diff --git a/packages/compiler-sfc/__tests__/__snapshots__/templateTransformSrcset.spec.ts.snap b/packages/compiler-sfc/__tests__/__snapshots__/templateTransformSrcset.spec.ts.snap
index ade723deac69f00cf7fc28d3f683f73c78cf930d..05d5fa13bbc275758760cbb2c5d0c9bd65f91f12 100644 (file)
--- a/packages/compiler-sfc/__tests__/__snapshots__/templateTransformSrcset.spec.ts.snap
+++ b/packages/compiler-sfc/__tests__/__snapshots__/templateTransformSrcset.spec.ts.snap
@@ -16,7 +16,7 @@ export function render(_ctx, _cache) {
 }"
 `;
 
-exports[`compiler sfc: transform srcset > srcset w/ preserveTilde: true 1`] = `
+exports[`compiler sfc: transform srcset > srcset w/ preserveLeadingTilde: true 1`] = `
 "import { createElementVNode as _createElementVNode, Fragment as _Fragment, openBlock as _openBlock, createElementBlock as _createElementBlock } from "vue"
 import _imports_0 from '~/app/logo.png'
 import _imports_1 from '~app/logo.png'

diff --git a/packages/compiler-sfc/__tests__/templateTransformAssetUrl.spec.ts b/packages/compiler-sfc/__tests__/templateTransformAssetUrl.spec.ts
index cfedf13fd7a70d70583ab9cd63c80950015e6ff5..2dff25f26c51ea1df3cbd241b9f038eecbac5995 100644 (file)
--- a/packages/compiler-sfc/__tests__/templateTransformAssetUrl.spec.ts
+++ b/packages/compiler-sfc/__tests__/templateTransformAssetUrl.spec.ts
@@ -100,11 +100,11 @@ describe('compiler sfc: transform asset url', () => {
     expect(code).toMatchSnapshot()
   })
 
-  test('with preserveTilde: true', () => {
+  test('with preserveLeadingTilde: true', () => {
     const { code } = compileWithAssetUrls(
       `<img src="~/app/bar.png"/>` + `<img src="~app/bar.png"/>`,
       {
-        preserveTilde: true,
+        preserveLeadingTilde: true,
       },
     )
     expect(code).toMatchSnapshot()

diff --git a/packages/compiler-sfc/__tests__/templateTransformSrcset.spec.ts b/packages/compiler-sfc/__tests__/templateTransformSrcset.spec.ts
index 55342002101e7f84cffcd42b3cdbe9cde5323552..fd23c2b4290307d1ab0aae01486a4e598989589e 100644 (file)
--- a/packages/compiler-sfc/__tests__/templateTransformSrcset.spec.ts
+++ b/packages/compiler-sfc/__tests__/templateTransformSrcset.spec.ts
@@ -99,13 +99,13 @@ describe('compiler sfc: transform srcset', () => {
     expect(code).toMatchSnapshot()
   })
 
-  test('srcset w/ preserveTilde: true', () => {
+  test('srcset w/ preserveLeadingTilde: true', () => {
     const code = compileWithSrcset(
       `
       <img srcset="~/app/logo.png, ~app/logo.png 2x"/>
       <img srcset="~app/logo.png 1x, ~/app/logo.png 2x"/>
     `,
-      { preserveTilde: true },
+      { preserveLeadingTilde: true },
     ).code
     expect(code).toMatchSnapshot()
   })

diff --git a/packages/compiler-sfc/src/template/templateUtils.ts b/packages/compiler-sfc/src/template/templateUtils.ts
index 7ac5e87278005216d651a3f394e032cf21ab158e..12c89ca288a01d0b808721b23ca815bebdd53b94 100644 (file)
--- a/packages/compiler-sfc/src/template/templateUtils.ts
+++ b/packages/compiler-sfc/src/template/templateUtils.ts
@@ -21,10 +21,10 @@ export function isDataUrl(url: string): boolean {
  */
 export function parseUrl(
   url: string,
-  preserveTilde?: boolean,
+  preserveLeadingTilde?: boolean,
 ): UrlWithStringQuery {
   const firstChar = url.charAt(0)
-  if (firstChar === '~' && !preserveTilde) {
+  if (firstChar === '~' && !preserveLeadingTilde) {
     const secondChar = url.charAt(1)
     url = url.slice(secondChar === '/' ? 2 : 1)
   }

diff --git a/packages/compiler-sfc/src/template/transformAssetUrl.ts b/packages/compiler-sfc/src/template/transformAssetUrl.ts
index 1deb015cbae91ec2b18fc924864d9f051fe29990..cda022737b0ebb6ec9bb1908b1e0ce5e8c1243b8 100644 (file)
--- a/packages/compiler-sfc/src/template/transformAssetUrl.ts
+++ b/packages/compiler-sfc/src/template/transformAssetUrl.ts
@@ -37,13 +37,13 @@ export interface AssetURLOptions {
    * Nuxt uses ~ as alias for the /app directory.
    * see #13460
    */
-  preserveTilde?: boolean
+  preserveLeadingTilde?: boolean
 }
 
 export const defaultAssetUrlOptions: Required<AssetURLOptions> = {
   base: null,
   includeAbsolute: false,
-  preserveTilde: false,
+  preserveLeadingTilde: false,
   tags: {
     video: ['src', 'poster'],
     source: ['src'],
@@ -120,12 +120,12 @@ export const transformAssetUrl: NodeTransform = (
         return
       }
 
-      const url = parseUrl(attr.value.content, options.preserveTilde)
+      const url = parseUrl(attr.value.content, options.preserveLeadingTilde)
       if (options.base && attr.value.content[0] === '.') {
         // explicit base - directly rewrite relative urls into absolute url
         // to avoid generating extra imports
         // Allow for full hostnames provided in options.base
-        const base = parseUrl(options.base, options.preserveTilde)
+        const base = parseUrl(options.base, options.preserveLeadingTilde)
         const protocol = base.protocol || ''
         const host = base.host ? protocol + '//' + base.host : ''
         const basePath = base.path || '/'

diff --git a/packages/compiler-sfc/src/template/transformSrcset.ts b/packages/compiler-sfc/src/template/transformSrcset.ts
index aefc4895bc559d9ef75c8291854e5d8de1afa7e4..3c452cc604015a68adf9d8008a8c30ca3b1adf8c 100644 (file)
--- a/packages/compiler-sfc/src/template/transformSrcset.ts
+++ b/packages/compiler-sfc/src/template/transformSrcset.ts
@@ -108,7 +108,7 @@ export const transformSrcset: NodeTransform = (
           const compoundExpression = createCompoundExpression([], attr.loc)
           imageCandidates.forEach(({ url, descriptor }, index) => {
             if (shouldProcessUrl(url)) {
-              const { path } = parseUrl(url, options.preserveTilde)
+              const { path } = parseUrl(url, options.preserveLeadingTilde)
               let exp: SimpleExpressionNode
               if (path) {
                 const existingImportsIndex = context.imports.findIndex(