From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Wed, 13 Nov 2024 08:12:10 +0000 (+0800)
Subject: Merge branch 'main' into feat-package-json-imports
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1173044353a4d6905bb505eb857a05f79899734;p=thirdparty%2Fvuejs%2Fcreate-vue.git

Merge branch 'main' into feat-package-json-imports
---

d1173044353a4d6905bb505eb857a05f79899734
diff --cc template/base/vite.config.js.ejs
index a04ed073,3851c427..c5cd9d2f
--- a/template/base/vite.config.js.ejs
+++ b/template/base/vite.config.js.ejs
@@@ -14,8 -14,7 +14,8 @@@ export default defineConfig(
    ],
    resolve: {
      alias: {
 +      // Deprecated, use `#src` instead (configured in `package.json` `imports` field)
        '@': fileURLToPath(new URL('./src', import.meta.url))
-     }
-   }
+     },
+   },
  })
diff --cc template/tsconfig/base/tsconfig.app.json
index 59419d6d,93f952f1..cbbfd1cf
--- a/template/tsconfig/base/tsconfig.app.json
+++ b/template/tsconfig/base/tsconfig.app.json
@@@ -6,11 -6,7 +6,10 @@@
      "composite": true,
      "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
  
-     "baseUrl": ".",
      "paths": {
 +      // TODO: no longer needed after TS 5.4
 +      "#src/*": ["./src/*"],
 +      // Deprecated, use `#src` instead (configured in `package.json` `imports` field)
        "@/*": ["./src/*"]
      }
    }
diff --cc template/tsconfig/nightwatch-ct/tsconfig.app.json
index 59419d6d,93f952f1..cbbfd1cf
--- a/template/tsconfig/nightwatch-ct/tsconfig.app.json
+++ b/template/tsconfig/nightwatch-ct/tsconfig.app.json
@@@ -6,11 -6,7 +6,10 @@@
      "composite": true,
      "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
  
-     "baseUrl": ".",
      "paths": {
 +      // TODO: no longer needed after TS 5.4
 +      "#src/*": ["./src/*"],
 +      // Deprecated, use `#src` instead (configured in `package.json` `imports` field)
        "@/*": ["./src/*"]
      }
    }