Upgrade to 0.2.0

subnomo · May 6, 2018 · 94f73e0 · 94f73e0
1 parent 4702e3e
commit 94f73e0
Show file tree

Hide file tree

Showing 6 changed files with 720 additions and 57 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 node_modules/
 *.log
 .fusebox/
+build/
 dist/
 coverage/
diff --git a/fuse.js b/fuse.js
@@ -1,8 +1,6 @@
 const {
   FuseBox,
   Sparky,
-  CSSPlugin,
-  CSSResourcePlugin,
   CopyPlugin,
   EnvPlugin,
   QuantumPlugin,
@@ -15,18 +13,18 @@ const ASSETS = ['*.jpg', '*.png', '*.jpeg', '*.gif', '*.svg'];
 
 let ip = process.env.NODE_ENV === 'production';
 
-// Copy the renderer html file to dist
+// Copy the renderer html file to build
 Sparky.task('copy-html', () => {
-  return Sparky.src('src/renderer/index.html').dest('dist/$name');
+  return Sparky.src('src/renderer/index.html').dest('build/$name');
 });
 
 let fuse;
 let fuseRenderer;
 
-function initFuse() {
+async function initFuse() {
   const config = {
     homeDir: 'src/',
-    output: 'dist/$name.js',
+    output: 'build/$name.js',
     log: true,
     cache: !ip,
     sourceMaps: !ip,
@@ -35,12 +33,11 @@ function initFuse() {
 
   fuse = FuseBox.init({
     ...config,
-    target: 'electron',
+    target: 'server',
     plugins: [
       EnvPlugin({ NODE_ENV: ip ? 'production' : 'development' }),
-      [CSSResourcePlugin(), CSSPlugin()],
       ip && QuantumPlugin({
-        target: 'electron',
+        target: 'server',
         bakeApiIntoBundle : 'app',
         uglify: true,
         treeshake: true,
@@ -53,7 +50,6 @@ function initFuse() {
     target: 'electron',
     plugins: [
       EnvPlugin({ NODE_ENV: ip ? 'production' : 'development' }),
-      [CSSResourcePlugin(), CSSPlugin()],
       ip && QuantumPlugin({
         target: 'electron',
         bakeApiIntoBundle : 'renderer',
@@ -94,17 +90,21 @@ function bundle() {
   };
 }
 
-Sparky.task('bundle', ['copy-html'], () => {
-  bundle();
-  fuse.run();
+Sparky.task('bundle', ['copy-html'], async () => {
+  await bundle();
+  await fuse.run();
+});
+
+Sparky.task('clean', () => {
+  return Sparky.src('./build').clean('build/');
 });
 
-Sparky.task('dist', ['copy-html'], () => {
+Sparky.task('build', ['clean', 'copy-html'], async () => {
   ip = true;
-  initFuse();
-  bundle();
-  fuse.run();
-  fuseRenderer.run();
+  await initFuse();
+  await bundle();
+  await fuse.run();
+  await fuseRenderer.run();
 });
 
 Sparky.task('default', ['copy-html'], () => {
@@ -128,12 +128,11 @@ Sparky.task('default', ['copy-html'], () => {
       if (!ip) {
         spawn('node', [`${__dirname}/node_modules/electron/cli.js`, __dirname], {
           stdio: 'inherit',
+        }).on('exit', (code) => {
+          console.log(`electron process exited with code ${code}`);
+          process.exit(code);
         });
       }
     });
   });
 });
-
-Sparky.task('clean', () => {
-  return Sparky.src('dist/*').clean('dist/');
-});
diff --git a/package.json b/package.json
@@ -1,18 +1,24 @@
 {
   "name": "tubetop",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "A YouTube music player, for your desktop.",
-  "main": "dist/app.js",
+  "main": "build/app.js",
   "repository": "https://github.com/subnomo/tubetop",
   "author": "Alex Taylor <alex@alext.xyz>",
   "license": "MIT",
   "scripts": {
     "start": "node fuse",
-    "build:dist": "node fuse dist",
+    "build": "node fuse build",
+    "dist": "node fuse build && electron-builder",
+    "dist:all": "node fuse build && electron-builder -wl --x64 --ia32",
     "test": "jest --coverage",
     "test:nocov": "jest",
     "coveralls": "cat ./coverage/lcov.info | coveralls"
   },
+  "build": {
+    "artifactName": "${name}-${version}-${os}-${arch}-setup.${ext}",
+    "files": ["build/**/*"]
+  },
   "jest": {
     "collectCoverageFrom": [
       "src/renderer/**/*.{ts,tsx}",
@@ -71,6 +77,7 @@
     "@types/whatwg-fetch": "^0.0.33",
     "coveralls": "^3.0.1",
     "electron": "^2.0.0",
+    "electron-builder": "^20.11.1",
     "electron-devtools-installer": "^2.2.3",
     "enzyme": "^3.3.0",
     "enzyme-adapter-react-16": "^1.1.1",

diff --git a/src/main.ts b/src/main.ts
@@ -34,7 +34,7 @@ function createWindow() {
 
   // Load index.html
   const appPath = app.getAppPath();
-  win.loadURL(`file://${appPath}/dist/index.html`);
+  win.loadURL(`file://${appPath}/build/index.html`);
 
   // Open dev tools
   if (debug) win.webContents.openDevTools();

diff --git a/tsconfig.json b/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es6",
+    "target": "es2015",
     "module": "commonjs",
     "moduleResolution": "node",
     "jsx": "react",