From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Wed, 13 Nov 2024 08:15:32 +0000 (+0800)
Subject: Revert "feat!: use `#/src` instead"
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F412%2Fhead;p=thirdparty%2Fvuejs%2Fcreate-vue.git

Revert "feat!: use `#/src` instead"

This reverts commit 28b5aaf25049a4c6b5ce105a229ab89413923857.
---

diff --git a/template/base/jsconfig.json b/template/base/jsconfig.json
index 4bd2b782..b5f03929 100644
--- a/template/base/jsconfig.json
+++ b/template/base/jsconfig.json
@@ -2,8 +2,8 @@
   "compilerOptions": {
     "paths": {
       // TODO: no longer needed after TS 5.4
-      "#/*": ["./*"],
-      // Deprecated, use `#/src` instead (configured in `package.json` `imports` field)
+      "#src/*": ["./src/*"],
+      // Deprecated, use `#src` instead (configured in `package.json` `imports` field)
       "@/*": ["./src/*"]
     }
   },
diff --git a/template/base/package.json b/template/base/package.json
index d00f6e14..f711a567 100644
--- a/template/base/package.json
+++ b/template/base/package.json
@@ -2,7 +2,7 @@
   "private": true,
   "type": "module",
   "imports": {
-    "#/*": "./*"
+    "#src/": "./src/"
   },
   "scripts": {
     "dev": "vite",
diff --git a/template/base/vite.config.js.ejs b/template/base/vite.config.js.ejs
index b148800b..c5cd9d2f 100644
--- a/template/base/vite.config.js.ejs
+++ b/template/base/vite.config.js.ejs
@@ -14,7 +14,7 @@ export default defineConfig({
   ],
   resolve: {
     alias: {
-      // Deprecated, use `#/src` instead (configured in `package.json` `imports` field)
+      // Deprecated, use `#src` instead (configured in `package.json` `imports` field)
       '@': fileURLToPath(new URL('./src', import.meta.url))
     },
   },
diff --git a/template/code/router/src/App.vue b/template/code/router/src/App.vue
index 593fb9c3..719e4d99 100644
--- a/template/code/router/src/App.vue
+++ b/template/code/router/src/App.vue
@@ -5,7 +5,7 @@ import HelloWorld from './components/HelloWorld.vue'
 
 <template>
   <header>
-    <img alt="Vue logo" class="logo" src="#/src/assets/logo.svg" width="125" height="125" />
+    <img alt="Vue logo" class="logo" src="#src/assets/logo.svg" width="125" height="125" />
 
     <div class="wrapper">
       <HelloWorld msg="You did it!" />
diff --git a/template/code/typescript-router/src/App.vue b/template/code/typescript-router/src/App.vue
index 861bcc3c..fe29657d 100644
--- a/template/code/typescript-router/src/App.vue
+++ b/template/code/typescript-router/src/App.vue
@@ -5,7 +5,7 @@ import HelloWorld from './components/HelloWorld.vue'
 
 <template>
   <header>
-    <img alt="Vue logo" class="logo" src="#/src/assets/logo.svg" width="125" height="125" />
+    <img alt="Vue logo" class="logo" src="#src/assets/logo.svg" width="125" height="125" />
 
     <div class="wrapper">
       <HelloWorld msg="You did it!" />
diff --git a/template/config/cypress-ct/cypress/support/component.js b/template/config/cypress-ct/cypress/support/component.js
index 4ecfddbe..9aeff110 100644
--- a/template/config/cypress-ct/cypress/support/component.js
+++ b/template/config/cypress-ct/cypress/support/component.js
@@ -20,7 +20,7 @@ import './commands'
 // require('./commands')
 
 // Import global styles
-import '#/src/assets/main.css'
+import '#src/assets/main.css'
 
 import { mount } from 'cypress/vue'
 
diff --git a/template/config/cypress-ct/cypress/support/component.ts b/template/config/cypress-ct/cypress/support/component.ts
index 3278ec0e..b2a0063d 100644
--- a/template/config/cypress-ct/cypress/support/component.ts
+++ b/template/config/cypress-ct/cypress/support/component.ts
@@ -20,7 +20,7 @@ import './commands'
 // require('./commands')
 
 // Import global styles
-import '#/src/assets/main.css'
+import '#src/assets/main.css'
 
 import { mount } from 'cypress/vue'
 
diff --git a/template/tsconfig/base/tsconfig.app.json b/template/tsconfig/base/tsconfig.app.json
index 5271be2d..cbbfd1cf 100644
--- a/template/tsconfig/base/tsconfig.app.json
+++ b/template/tsconfig/base/tsconfig.app.json
@@ -8,8 +8,8 @@
 
     "paths": {
       // TODO: no longer needed after TS 5.4
-      "#/*": ["./*"],
-      // Deprecated, use `#/src` instead (configured in `package.json` `imports` field)
+      "#src/*": ["./src/*"],
+      // Deprecated, use `#src` instead (configured in `package.json` `imports` field)
       "@/*": ["./src/*"]
     }
   }
diff --git a/template/tsconfig/nightwatch-ct/tsconfig.app.json b/template/tsconfig/nightwatch-ct/tsconfig.app.json
index 5271be2d..cbbfd1cf 100644
--- a/template/tsconfig/nightwatch-ct/tsconfig.app.json
+++ b/template/tsconfig/nightwatch-ct/tsconfig.app.json
@@ -8,8 +8,8 @@
 
     "paths": {
       // TODO: no longer needed after TS 5.4
-      "#/*": ["./*"],
-      // Deprecated, use `#/src` instead (configured in `package.json` `imports` field)
+      "#src/*": ["./src/*"],
+      // Deprecated, use `#src` instead (configured in `package.json` `imports` field)
       "@/*": ["./src/*"]
     }
   }