From 18ca318b18f9fc11b65162af6dce4230bbfb8c9f Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Sun, 14 Mar 2021 20:05:00 +0100 Subject: [PATCH] proper scripts for electron building/webapp building --- .gitignore | 5 ++++- index.html => app/index.html | 4 ++-- app/package.json | 20 +++++++++++++++++++ {public => app/public}/favicon.png | Bin {src => app/src}/App.svelte | 0 {src => app/src}/main.js | 0 tailwind.config.js => app/tailwind.config.js | 0 vite.config.ts => app/vite.config.ts | 3 ++- main.js | 2 +- package.json | 20 ++++--------------- 10 files changed, 33 insertions(+), 21 deletions(-) rename index.html => app/index.html (67%) create mode 100644 app/package.json rename {public => app/public}/favicon.png (100%) rename {src => app/src}/App.svelte (100%) rename {src => app/src}/main.js (100%) rename tailwind.config.js => app/tailwind.config.js (100%) rename vite.config.ts => app/vite.config.ts (98%) diff --git a/.gitignore b/.gitignore index 80f231a..98b787b 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,7 @@ .DS_Store package-lock.json yarn.lock -/out \ No newline at end of file +/out +/yarn.lock +/app/node_modules +/app/dist \ No newline at end of file diff --git a/index.html b/app/index.html similarity index 67% rename from index.html rename to app/index.html index 1ac1469..5c50b53 100644 --- a/index.html +++ b/app/index.html @@ -6,11 +6,11 @@ LfK!Scan - + - + \ No newline at end of file diff --git a/app/package.json b/app/package.json new file mode 100644 index 0000000..7248b19 --- /dev/null +++ b/app/package.json @@ -0,0 +1,20 @@ +{ + "name": "@lfk/scanclient", + "version": "0.0.0", + "scripts": { + "dev": "vite", + "build": "vite build" + }, + "devDependencies": { + "@svitejs/vite-plugin-svelte": "^0.11.0", + "@tsconfig/svelte": "^1.0.10", + "@types/html-minifier": "^4.0.0", + "axios": "^0.21.1", + "glob": "^7.1.6", + "html-minifier": "^4.0.0", + "svelte": "^3.35.0", + "svelte-preprocess": "^4.6.9", + "vite": "^2.0.5", + "vite-plugin-windicss": "^0.8.2" + } +} diff --git a/public/favicon.png b/app/public/favicon.png similarity index 100% rename from public/favicon.png rename to app/public/favicon.png diff --git a/src/App.svelte b/app/src/App.svelte similarity index 100% rename from src/App.svelte rename to app/src/App.svelte diff --git a/src/main.js b/app/src/main.js similarity index 100% rename from src/main.js rename to app/src/main.js diff --git a/tailwind.config.js b/app/tailwind.config.js similarity index 100% rename from tailwind.config.js rename to app/tailwind.config.js diff --git a/vite.config.ts b/app/vite.config.ts similarity index 98% rename from vite.config.ts rename to app/vite.config.ts index 1eefcca..0b6f2a2 100644 --- a/vite.config.ts +++ b/app/vite.config.ts @@ -2,7 +2,7 @@ import svelte from '@svitejs/vite-plugin-svelte'; import windiCSS from 'vite-plugin-windicss'; import { minify } from 'html-minifier'; import { defineConfig } from 'vite'; -// +// const indexReplace = () => { return { name: 'html-transform', @@ -17,6 +17,7 @@ const indexReplace = () => { export default defineConfig(({ command, mode }) => { const isProduction = mode === 'production'; return { + base: './', build: { polyfillDynamicImport: false, cssCodeSplit: false, diff --git a/main.js b/main.js index c801f69..765254d 100644 --- a/main.js +++ b/main.js @@ -10,7 +10,7 @@ function createWindow() { // preload: path.join(__dirname, 'preload.js') // } }); - mainWindow.loadFile('dist/index.html'); + mainWindow.loadFile('app/dist/index.html'); // mainWindow.removeMenu(); // mainWindow.webContents.openDevTools() } diff --git a/package.json b/package.json index f99f4bc..44d4ea1 100644 --- a/package.json +++ b/package.json @@ -1,25 +1,13 @@ { "name": "@lfk/scanclient", "version": "0.0.0", - "description": "minimal electron application", - "main": "main.js", + "description": "minimal electron application", + "main": "main.js", "scripts": { - "dev": "vite ", - "build": "vite build", - "electron:start": "vite build && electron-forge start", - "electron:package": "vite build && electron-forge package" + "electron:start": "cd app && yarn build && cd .. && electron-forge start", + "electron:package": "cd app && yarn build && cd .. && electron-forge package" }, "devDependencies": { - "@svitejs/vite-plugin-svelte": "^0.11.0", - "@tsconfig/svelte": "^1.0.10", - "@types/html-minifier": "^4.0.0", - "axios": "^0.21.1", - "glob": "^7.1.6", - "html-minifier": "^4.0.0", - "svelte": "^3.35.0", - "svelte-preprocess": "^4.6.9", - "vite": "^2.0.5", - "vite-plugin-windicss": "^0.8.2", "@electron-forge/cli": "^6.0.0-beta.54", "@electron-forge/maker-deb": "^6.0.0-beta.54", "@electron-forge/maker-rpm": "^6.0.0-beta.54",