@@ -14,7 +14,5 @@
-
-
diff --git a/src/index.js b/src/index.js
index f1a47ca..0f80240 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,6 +1,7 @@
var d3 = require('d3')
import {readxml} from './data.js'
import {render_calendar, render_nights, render_astronomy, render_temperature, render_clouds} from './render.js'
+import './style.sass'
const canvas = d3.select('svg')
diff --git a/webpack.config.js b/webpack.config.js
index f6f9874..2789650 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,38 +1,32 @@
-const path = require('path');
+var HtmlWebpackPlugin = require('html-webpack-plugin');
+var ExtractTextPlugin = require('extract-text-webpack-plugin');
+var path = require("path");
-module.exports = [{
- name: 'js',
+module.exports = {
entry: ['./src/index.js'],
output: {
- filename: 'main.js',
- path: path.resolve(__dirname, 'dist')
- }
-},
-{
- name: 'css',
- entry: ['./src/style.sass'],
- module: {
- rules: [
- {
- test: /\.sass$/,
- use: [
- {
- loader: 'file-loader',
- options: {
- name: 'style.css',
- }
- },
- {
- loader: 'extract-loader'
- },
- {
- loader: 'css-loader?-url'
- },
- {
- loader: 'sass-loader'
- }
- ]
- }
- ]
- }
-}];
+ path: path.join(__dirname, "./dist/"),
+ filename: "main.js",
+ },
+ module:{
+ rules:[
+ {
+ test:/\.sass$/,
+ use: ExtractTextPlugin.extract({
+ fallback:'style-loader',
+ use:['css-loader','sass-loader']
+ })
+ }
+ ]
+ },
+ plugins: [
+ new ExtractTextPlugin({filename:'style.css'}),
+ new HtmlWebpackPlugin({
+ hash: true,
+ title: 'Weather for Philadelphia, PA',
+ template: './src/index.html',
+ path: path.join(__dirname, "./dist/"),
+ filename: 'index.html'
+ }),
+ ]
+}