Skip to content

Commit 5624666

Browse files
committed
finish update to new standards
1 parent 0fbc53f commit 5624666

File tree

4 files changed

+7
-9
lines changed

4 files changed

+7
-9
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
node_modules
2-
public/
2+
dist
33
build

README.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
# Angular 1.x WebPack 2 + Babel workflow
1+
# Angular 1.x Webpack 2 + Babel workflow
22

33
[![Dependency Status](https://david-dm.org/Foxandxss/angular-webpack-workflow/status.svg)](https://david-dm.org/Foxandxss/angular-webpack-workflow#info=dependencies) [![devDependency Status](https://david-dm.org/Foxandxss/angular-webpack-workflow/dev-status.svg)](https://david-dm.org/Foxandxss/angular-webpack-workflow#info=devDependencies)
44

55
**NOTE: This workflow is now using Webpack 2 beta. There is a branch with the old workflow if you want to use it.**
66

7-
**NOTE 2: THIS IS STILL WIP, I WILL REMOVE THIS CAPS WHEN I AM SURE IT WORKS PERFECTLY.**
8-
9-
This workflow serves as a starting point for building Angular 1.x applications using WebPack 2. Should be noted that apart from the pre-installed angular package, this workflow is pretty much generic.
7+
This workflow serves as a starting point for building Angular 1.x applications using Webpack 2. Should be noted that apart from the pre-installed angular package, this workflow is pretty much generic.
108

119
## Features
1210

@@ -31,7 +29,7 @@ $ npm install
3129

3230
## Scripts
3331

34-
All scripts are run with `npm run [script]`, for example: `npm run test`.
32+
All scripts are run with `npm run [script]`, for example: `npm run build`.
3533

3634
* `build` - generate a minified build to dist folder
3735
* `start` - start development server, try it by opening `http://localhost:8080/`
File renamed without changes.

webpack.config.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ module.exports = function makeWebpackConfig (ENV) {
2222
* Karma will set this when it's a test build
2323
*/
2424
config.entry = ENV === 'test' ? {} : {
25-
app: './src/app.js'
25+
app: './src/app/app.js'
2626
};
2727

2828
/**
@@ -33,7 +33,7 @@ module.exports = function makeWebpackConfig (ENV) {
3333
*/
3434
config.output = ENV === 'test' ? {} : {
3535
// Absolute output directory
36-
path: __dirname + '/public',
36+
path: __dirname + '/dist',
3737

3838
// Output path from the view of the page
3939
// Uses webpack-dev-server in development
@@ -157,7 +157,7 @@ module.exports = function makeWebpackConfig (ENV) {
157157
// Reference: https://github.com/webpack/extract-text-webpack-plugin
158158
// Extract css files
159159
// Disabled when in test mode or not in build mode
160-
new ExtractTextPlugin('css/[name].css', {disable: ENV !== 'prod'})
160+
new ExtractTextPlugin('[name].[hash].css', {disable: ENV !== 'prod'})
161161
)
162162
}
163163

0 commit comments

Comments
 (0)