From ab49058dcd443f7c850fa99120cbda53cc06306d Mon Sep 17 00:00:00 2001 From: Steve Kellock Date: Sat, 5 Aug 2017 01:19:28 -0400 Subject: [PATCH] Relocates and bundles css. --- fuse.js | 4 ++-- src/renderer/{keyframes.css => features/app/app.css} | 0 src/renderer/features/app/app.tsx | 2 ++ src/renderer/{ => features/app}/reset.css | 0 src/renderer/index.html | 4 ---- 5 files changed, 4 insertions(+), 6 deletions(-) rename src/renderer/{keyframes.css => features/app/app.css} (100%) rename src/renderer/{ => features/app}/reset.css (100%) diff --git a/fuse.js b/fuse.js index 096ed69..9d45067 100644 --- a/fuse.js +++ b/fuse.js @@ -10,7 +10,7 @@ const isProduction = process.env.NODE_ENV === 'production' // copy the renderer's html file into the right place Sparky.task('copy-html', () => { - return Sparky.src('src/renderer/{index.html,*.css}').dest(`${OUTPUT_DIR}/$name`) + return Sparky.src('src/renderer/index.html').dest(`${OUTPUT_DIR}/$name`) }) // the default task @@ -41,7 +41,7 @@ Sparky.task('default', ['copy-html'], () => { // bundle the electron renderer code const rendererBundle = fuse .bundle('renderer') - .instructions('> [renderer/index.tsx]') + .instructions('> [renderer/index.tsx] +fuse-box-css') .plugin(CSSPlugin()) .plugin(CopyPlugin({ useDefault: true, files: ASSETS, dest: 'assets', resolve: 'assets/' })) diff --git a/src/renderer/keyframes.css b/src/renderer/features/app/app.css similarity index 100% rename from src/renderer/keyframes.css rename to src/renderer/features/app/app.css diff --git a/src/renderer/features/app/app.tsx b/src/renderer/features/app/app.tsx index d61c657..1895106 100644 --- a/src/renderer/features/app/app.tsx +++ b/src/renderer/features/app/app.tsx @@ -1,6 +1,8 @@ import * as React from 'react' import { CSSProperties } from 'react' import { WelcomeScreen } from '..' +import './reset.css' +import './app.css' // this is in place to claim 100% of the viewport and not scroll. const rootStyle: CSSProperties = { overflow: 'hidden', height: '100vh', display: 'flex' } diff --git a/src/renderer/reset.css b/src/renderer/features/app/reset.css similarity index 100% rename from src/renderer/reset.css rename to src/renderer/features/app/reset.css diff --git a/src/renderer/index.html b/src/renderer/index.html index b632162..bf59b63 100644 --- a/src/renderer/index.html +++ b/src/renderer/index.html @@ -4,10 +4,6 @@ -