From 9d26344428b8a29b1de9194cd90d27508e710395 Mon Sep 17 00:00:00 2001 From: Mike Ryan Date: Sun, 24 Jul 2016 18:21:56 -0500 Subject: [PATCH] Build improvements --- app/app.ts | 11 +++++++++-- app/index.html | 2 -- package.json | 18 +++++++++--------- webpack.config.js | 4 ++++ 4 files changed, 22 insertions(+), 13 deletions(-) diff --git a/app/app.ts b/app/app.ts index 78a3738..1c185a2 100644 --- a/app/app.ts +++ b/app/app.ts @@ -3,8 +3,15 @@ import { Component } from '@angular/core'; @Component({ selector: 'my-app', template: ` -

Hello, World!

- ` +
+

Hello, World!

+
+ `, + styles: [` + h1 { + color: blue; + } + `] }) export default class App { diff --git a/app/index.html b/app/index.html index ed68f1f..47f12c6 100644 --- a/app/index.html +++ b/app/index.html @@ -9,7 +9,5 @@ - - diff --git a/package.json b/package.json index a1e4e18..1b39a96 100644 --- a/package.json +++ b/package.json @@ -7,13 +7,12 @@ "test:unit": "karma start", "unit": "npm run test:unit -- --auto-watch --no-single-run", "test": "echo \"Error: no test specified\" && exit 1", - "clean-dist": "rimraf dist", - "copy-files": "cpy app/index.html dist", - "clean-and-copy": "npm run clean-dist && npm run copy-files", - "prebuild:prod": "npm run clean-and-copy", - "build": "webpack --env.dev", - "build:prod": "webpack --env.prod -p", - "prestart": "npm run clean-and-copy", + "clean": "rimraf dist", + "prebuild": "npm run clean", + "build": "webpack", + "build:dev": "npm run build -- --env.dev", + "build:prod": "npm run build -- --env.prod -p", + "prestart": "npm run clean", "start": "webpack-dev-server --history-api-fallback --env.dev --content-base dist" }, "repository": { @@ -34,12 +33,13 @@ "babel-core": "6.8.0", "babel-eslint": "6.0.4", "babel-loader": "6.2.4", - "babel-plugin-__coverage__": "0.111111.11", + "babel-plugin-__coverage__": "^11.0.0", "babel-preset-es2015-webpack": "6.4.1", "cpy-cli": "1.0.0", "css-loader": "0.23.1", "eslint": "2.9.0", "eslint-loader": "1.3.0", + "html-webpack-plugin": "^2.22.0", "jasmine-core": "2.4.1", "karma": "^0.13.22", "karma-chrome-launcher": "^1.0.1", @@ -53,7 +53,7 @@ "style-loader": "0.13.1", "ts-loader": "^0.8.2", "typescript": "^2.0.0", - "webpack": "2.1.0-beta.7", + "webpack": "^2.1.0-beta.20", "webpack-dev-server": "2.0.0-beta" }, "dependencies": { diff --git a/webpack.config.js b/webpack.config.js index f2f88c9..9e6f7ed 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,10 +1,14 @@ const {resolve} = require('path') const {DefinePlugin, optimize} = require('webpack'); +const HtmlWebpackPlugin = require('html-webpack-plugin'); module.exports = function createWebpackConfig(env) { const DEFAULT_PLUGINS = [ new DefinePlugin({ PROD: JSON.stringify(env.prod) + }), + new HtmlWebpackPlugin({ + template: './app/index.html' }) ];