diff --git a/cmd/bin.js b/cmd/bin.js index 7d48eb4..2b25940 100644 --- a/cmd/bin.js +++ b/cmd/bin.js @@ -12,26 +12,12 @@ module.exports = { directory: './frontend', cmd: 'npm', args: ['run', 'dev'], - protocol: 'http://', - hostname: 'localhost', port: 8080, - indexPath: 'index.html', - }, - bundler: { - directory: './', // ./node_modules/.bin/ - cmd: 'esbuild', - args: ['./electron/**/*.js', '--platform=node', '--minify', '--outdir=runtime', '--watch', '--packages=external'], // '--config==./cmd/esbuild.config.js' - }, - bundlerts: { - directory: './', // ./node_modules/.bin/ - cmd: 'esbuild', - args: ['./electronts/**/*.ts', '--platform=node', '--minify', '--format=cjs', '--outdir=runtime', '--tsconfig=./electronts/tsconfig.json', '--packages=external'], // '--config==./cmd/esbuild.config.js' }, electron: { directory: './', cmd: 'electron', args: ['.', '--env=local'], - loadingPage: '/public/html/loading.html', } }, diff --git a/cmd/esbuild.config.js b/cmd/esbuild.config.js deleted file mode 100644 index bd41e0b..0000000 --- a/cmd/esbuild.config.js +++ /dev/null @@ -1,8 +0,0 @@ -module.exports = { - entryPoints: ['electron/main.js'], - //bundle: true, - minify: true, - outdir: 'runtime', - watch: true - //outfile: 'runtime/main.js' -}; \ No newline at end of file diff --git a/cmd/esbuild.config.ts b/cmd/esbuild.config.ts deleted file mode 100644 index 82eb585..0000000 --- a/cmd/esbuild.config.ts +++ /dev/null @@ -1,6 +0,0 @@ -module.exports = { - entryPoints: ['src/index.js'], - bundle: true, - minify: true, - outfile: 'dist/bundle.js' -}; \ No newline at end of file diff --git a/package.json b/package.json index 17eeffd..f9d8d48 100644 --- a/package.json +++ b/package.json @@ -8,8 +8,8 @@ "ts-dev": "tsc -p ./electronts/tsconfig.json", "dev-esbuild": "ee-bin dev --serve=bundlerts", "dev": "ee-bin dev", - "dev-frontend": "ee-bin dev --serve=frontend", - "dev-electron": "ee-bin dev --serve=electron", + "dev-frontend": "cross-env DEBUG=ee-bin* ee-bin dev --serve=frontend", + "dev-electron": "cross-env DEBUG=ee-bin* ee-bin dev --serve=electron", "dev-go": "ee-bin exec --cmds=go", "dev-go-w": "ee-bin exec --cmds=go_w", "dev-python": "ee-bin exec --cmds=python", diff --git a/electronts/tsconfig.json b/tsconfig.json similarity index 87% rename from electronts/tsconfig.json rename to tsconfig.json index 256cdfa..e5f9e92 100644 --- a/electronts/tsconfig.json +++ b/tsconfig.json @@ -24,13 +24,9 @@ "noImplicitReturns": true, "noFallthroughCasesInSwitch": true, "forceConsistentCasingInFileNames": true, - //"outDir": "../outttt/electron" }, "include": [ - "**/*" - ], - "exclude": [ - "tsconfig.json" - ], + "./electronts/**/*" + ] } \ No newline at end of file