From 1ee86f4979448045e11a3665e6a8be93e119c482 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8D=89=E9=9E=8B=E6=B2=A1=E5=8F=B7?= <308487730@qq.com> Date: Tue, 8 Feb 2022 08:40:04 +0800 Subject: [PATCH] src -> packages --- package.json | 2 +- {src => packages}/main/index.ts | 0 {src => packages}/main/samples/electron-store.ts | 0 {src => packages}/preload/index.ts | 0 {src => packages}/preload/loading.ts | 0 {src => packages}/preload/utils.ts | 0 {src => packages}/renderer/index.html | 0 {src => packages}/renderer/public/images/node.png | Bin {src => packages}/renderer/src/App.tsx | 0 {src => packages}/renderer/src/assets/electron.png | Bin {src => packages}/renderer/src/assets/favicon.svg | 0 {src => packages}/renderer/src/assets/react.svg | 0 {src => packages}/renderer/src/assets/vite.svg | 0 {src => packages}/renderer/src/assets/vue.png | Bin {src => packages}/renderer/src/global.d.ts | 0 {src => packages}/renderer/src/main.tsx | 0 .../renderer/src/samples/electron-store.ts | 0 .../renderer/src/styles/app.module.scss | 0 {src => packages}/renderer/src/styles/index.css | 0 {src => packages}/renderer/src/vite-env.d.ts | 0 {src => packages}/renderer/tsconfig.json | 0 {src => packages}/renderer/vite.config.ts | 1 - paths.json | 5 ++--- scripts/build.mjs | 6 +++--- scripts/watch.mjs | 6 +++--- 25 files changed, 9 insertions(+), 11 deletions(-) rename {src => packages}/main/index.ts (100%) rename {src => packages}/main/samples/electron-store.ts (100%) rename {src => packages}/preload/index.ts (100%) rename {src => packages}/preload/loading.ts (100%) rename {src => packages}/preload/utils.ts (100%) rename {src => packages}/renderer/index.html (100%) rename {src => packages}/renderer/public/images/node.png (100%) rename {src => packages}/renderer/src/App.tsx (100%) rename {src => packages}/renderer/src/assets/electron.png (100%) rename {src => packages}/renderer/src/assets/favicon.svg (100%) rename {src => packages}/renderer/src/assets/react.svg (100%) rename {src => packages}/renderer/src/assets/vite.svg (100%) rename {src => packages}/renderer/src/assets/vue.png (100%) rename {src => packages}/renderer/src/global.d.ts (100%) rename {src => packages}/renderer/src/main.tsx (100%) rename {src => packages}/renderer/src/samples/electron-store.ts (100%) rename {src => packages}/renderer/src/styles/app.module.scss (100%) rename {src => packages}/renderer/src/styles/index.css (100%) rename {src => packages}/renderer/src/vite-env.d.ts (100%) rename {src => packages}/renderer/tsconfig.json (100%) rename {src => packages}/renderer/vite.config.ts (98%) diff --git a/package.json b/package.json index 89501b0..f64a1ce 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "scripts": { "dev": "node scripts/watch.mjs", "build": "npm run typecheck && node scripts/build.mjs && electron-builder --config .electron-builder.config.js", - "typecheck": "tsc --noEmit --project src/renderer/tsconfig.json" + "typecheck": "tsc --noEmit --project packages/renderer/tsconfig.json" }, "engines": { "node": ">=14.17.0" diff --git a/src/main/index.ts b/packages/main/index.ts similarity index 100% rename from src/main/index.ts rename to packages/main/index.ts diff --git a/src/main/samples/electron-store.ts b/packages/main/samples/electron-store.ts similarity index 100% rename from src/main/samples/electron-store.ts rename to packages/main/samples/electron-store.ts diff --git a/src/preload/index.ts b/packages/preload/index.ts similarity index 100% rename from src/preload/index.ts rename to packages/preload/index.ts diff --git a/src/preload/loading.ts b/packages/preload/loading.ts similarity index 100% rename from src/preload/loading.ts rename to packages/preload/loading.ts diff --git a/src/preload/utils.ts b/packages/preload/utils.ts similarity index 100% rename from src/preload/utils.ts rename to packages/preload/utils.ts diff --git a/src/renderer/index.html b/packages/renderer/index.html similarity index 100% rename from src/renderer/index.html rename to packages/renderer/index.html diff --git a/src/renderer/public/images/node.png b/packages/renderer/public/images/node.png similarity index 100% rename from src/renderer/public/images/node.png rename to packages/renderer/public/images/node.png diff --git a/src/renderer/src/App.tsx b/packages/renderer/src/App.tsx similarity index 100% rename from src/renderer/src/App.tsx rename to packages/renderer/src/App.tsx diff --git a/src/renderer/src/assets/electron.png b/packages/renderer/src/assets/electron.png similarity index 100% rename from src/renderer/src/assets/electron.png rename to packages/renderer/src/assets/electron.png diff --git a/src/renderer/src/assets/favicon.svg b/packages/renderer/src/assets/favicon.svg similarity index 100% rename from src/renderer/src/assets/favicon.svg rename to packages/renderer/src/assets/favicon.svg diff --git a/src/renderer/src/assets/react.svg b/packages/renderer/src/assets/react.svg similarity index 100% rename from src/renderer/src/assets/react.svg rename to packages/renderer/src/assets/react.svg diff --git a/src/renderer/src/assets/vite.svg b/packages/renderer/src/assets/vite.svg similarity index 100% rename from src/renderer/src/assets/vite.svg rename to packages/renderer/src/assets/vite.svg diff --git a/src/renderer/src/assets/vue.png b/packages/renderer/src/assets/vue.png similarity index 100% rename from src/renderer/src/assets/vue.png rename to packages/renderer/src/assets/vue.png diff --git a/src/renderer/src/global.d.ts b/packages/renderer/src/global.d.ts similarity index 100% rename from src/renderer/src/global.d.ts rename to packages/renderer/src/global.d.ts diff --git a/src/renderer/src/main.tsx b/packages/renderer/src/main.tsx similarity index 100% rename from src/renderer/src/main.tsx rename to packages/renderer/src/main.tsx diff --git a/src/renderer/src/samples/electron-store.ts b/packages/renderer/src/samples/electron-store.ts similarity index 100% rename from src/renderer/src/samples/electron-store.ts rename to packages/renderer/src/samples/electron-store.ts diff --git a/src/renderer/src/styles/app.module.scss b/packages/renderer/src/styles/app.module.scss similarity index 100% rename from src/renderer/src/styles/app.module.scss rename to packages/renderer/src/styles/app.module.scss diff --git a/src/renderer/src/styles/index.css b/packages/renderer/src/styles/index.css similarity index 100% rename from src/renderer/src/styles/index.css rename to packages/renderer/src/styles/index.css diff --git a/src/renderer/src/vite-env.d.ts b/packages/renderer/src/vite-env.d.ts similarity index 100% rename from src/renderer/src/vite-env.d.ts rename to packages/renderer/src/vite-env.d.ts diff --git a/src/renderer/tsconfig.json b/packages/renderer/tsconfig.json similarity index 100% rename from src/renderer/tsconfig.json rename to packages/renderer/tsconfig.json diff --git a/src/renderer/vite.config.ts b/packages/renderer/vite.config.ts similarity index 98% rename from src/renderer/vite.config.ts rename to packages/renderer/vite.config.ts index c51dc32..3f2df14 100644 --- a/src/renderer/vite.config.ts +++ b/packages/renderer/vite.config.ts @@ -33,7 +33,6 @@ export default defineConfig({ resolve: { alias: { '@': join(__dirname, 'src'), - src: join(__dirname, '../../src'), }, }, server: { diff --git a/paths.json b/paths.json index 6ff9072..d643910 100644 --- a/paths.json +++ b/paths.json @@ -3,8 +3,7 @@ "compilerOptions": { "baseUrl": "./", "paths": { - "@/*": ["src/renderer/src/*"], - "src/*": ["src/*"] + "@/*": ["packages/renderer/src/*"] } } -} \ No newline at end of file +} diff --git a/scripts/build.mjs b/scripts/build.mjs index f894437..2e538fb 100644 --- a/scripts/build.mjs +++ b/scripts/build.mjs @@ -8,7 +8,7 @@ const __dirname = dirname(fileURLToPath(import.meta.url)) await build({ configFile: 'scripts/vite.config.mjs', - root: join(__dirname, '../src/main'), + root: join(__dirname, '../packages/main'), build: { outDir: '../../dist/main', }, @@ -16,10 +16,10 @@ await build({ await build({ configFile: 'scripts/vite.config.mjs', - root: join(__dirname, '../src/preload'), + root: join(__dirname, '../packages/preload'), build: { outDir: '../../dist/preload', }, }) -await build({ configFile: 'src/renderer/vite.config.ts' }) +await build({ configFile: 'packages/renderer/vite.config.ts' }) diff --git a/scripts/watch.mjs b/scripts/watch.mjs index 7b4e68d..fd7f1cc 100644 --- a/scripts/watch.mjs +++ b/scripts/watch.mjs @@ -22,7 +22,7 @@ function watchMain() { return build({ configFile: 'scripts/vite.config.mjs', - root: join(__dirname, '../src/main'), + root: join(__dirname, '../packages/main'), build: { outDir: '../../dist/main', watch: true, @@ -46,7 +46,7 @@ function watchMain() { function watchPreload(server) { return build({ configFile: 'scripts/vite.config.mjs', - root: join(__dirname, '../src/preload'), + root: join(__dirname, '../packages/preload'), build: { outDir: '../../dist/preload', watch: true, @@ -61,7 +61,7 @@ function watchPreload(server) { } // bootstrap -const server = await createServer({ configFile: 'src/renderer/vite.config.ts' }) +const server = await createServer({ configFile: 'packages/renderer/vite.config.ts' }) await server.listen() await watchPreload(server)