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

diff --cc template/base/package.json
Simple merge

diff --cc template/base/vite.config.js.ejs
index a04ed07329ba486f088e1681dd543e3efc1f3e54,3851c4279231e44971bfe4a2316c4c5d9b3779f0..c5cd9d2fabfcf44c13e7048bae086440256ffd22
--- 1/template/base/vite.config.js.ejs
--- 2/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 59419d6de2374df71373042a7ee0271dae8f88c4,93f952f1dd81403bc536b9fedae23f14d41eec22..cbbfd1cfcbf782ca3d54c861f58f9dd522313acc
--- 1/template/tsconfig/base/tsconfig.app.json
--- 2/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 59419d6de2374df71373042a7ee0271dae8f88c4,93f952f1dd81403bc536b9fedae23f14d41eec22..cbbfd1cfcbf782ca3d54c861f58f9dd522313acc
--- 1/template/tsconfig/nightwatch-ct/tsconfig.app.json
--- 2/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/*"]
      }
    }