From b500878f5a144890a62f7713aaee6523a859c376 Mon Sep 17 00:00:00 2001 From: Kyle Pollard Date: Sun, 7 Apr 2019 17:50:33 -0700 Subject: [PATCH] Removed old dev server and updated build/dev tasks --- dev.js | 75 ---------------------------------------------------- package.json | 4 +-- 2 files changed, 2 insertions(+), 77 deletions(-) delete mode 100644 dev.js diff --git a/dev.js b/dev.js deleted file mode 100644 index 7223e11..0000000 --- a/dev.js +++ /dev/null @@ -1,75 +0,0 @@ -const express = require('express') -const app = express() -const http = require('http').Server(app) -const io = require('socket.io')(http) -const fs = require('fs-extra') -const chokidar = require('chokidar') -const sass = require('node-sass') - -const script = ` -const socket = io() -socket.on('reload', () => location.reload()) -` - -app.get('/', async (req, res) => { - console.log('> Serving index') - const html = await fs.readFile('index.html') - const injected = html.toString().replace('', ``) - res.send(injected) -}) - -app.get('/script.js', async (req, res) => { - console.log('> Serving script') - const script = await fs.readFile('script.js') - res.contentType('javascript') - res.send(script) -}) - -app.use('/dist', (req, res, next) => { - console.log('> Serving a stylesheet') - next() -}, express.static('dist')) - -function reload() { - console.log('> Reloading') - io.emit('reload') -} - -chokidar.watch('index.html', { ignoreInitial: true }).on('all', () => { - console.log('> Index changed') - reload() -}) - -chokidar.watch('script.js', { ignoreInitial: true }).on('all', () => { - console.log('> Script changed') - reload() -}) - -function buildSass(file) { - sass.render({ file, outputStyle: 'compressed' }, async (errors, result) => { - if (errors) { - console.log('> Sass errors!') - console.log(errors) - return - } - const outFile = file.replace('src', 'dist').replace('.scss', '.css') - await fs.outputFile(outFile, result.css) - reload() - }) -} - -chokidar.watch('src/*.scss', { ignoreInitial: true }).on('all', (event, file) => { - console.log('> Stylesheet changed') - buildSass(file) -}) - -chokidar.watch('src/parts/*.scss', { ignoreInitial: true }).on('all', async () => { - console.log('> Stylesheet part changed') - const src = await fs.readdir('src') - const files = src.filter(file => file !== 'parts').map(file => `src/${file}`) - for (let file of files) { - buildSass(file) - } -}) - -http.listen(3000, () => console.log('> Ready at http://localhost:3000/')) \ No newline at end of file diff --git a/package.json b/package.json index 29ddad2..6ac0401 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,8 @@ "description": "A just-add-css collection of styles to make simple websites just a little nicer.", "main": "index.js", "scripts": { - "build": "node-sass src/ --output dist/ --output-style compressed", - "dev": "node dev.js" + "build": "gulp style", + "dev": "gulp watch" }, "repository": { "type": "git",