Skip to content

Commit 34b6af5

Browse files
committed
Merge branch 'release/6.1.0'
2 parents 9dc3848 + 115846a commit 34b6af5

File tree

6 files changed

+749
-331
lines changed

6 files changed

+749
-331
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ language: node_js
22
node_js:
33
- "6.9.1"
44
install:
5-
- npm install
5+
- yarn install
66
script:
77
- npm test
88
- npm start -- build

package-scripts.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
const { series, crossEnv, concurrent, rimraf } = require('nps-utils')
2-
const { config: { port: E2E_PORT } } = require('./test/protractor.conf')
1+
const { series, crossEnv, concurrent, rimraf } = require('nps-utils');
2+
const { config: { port: E2E_PORT } } = require('./test/protractor.conf');
33

44
module.exports = {
55
scripts: {
@@ -83,9 +83,9 @@ module.exports = {
8383
}
8484
},
8585
server: {
86-
default: `webpack-dev-server -d --devtool '#source-map' --inline --env.server`,
87-
extractCss: `webpack-dev-server -d --devtool '#source-map' --inline --env.server --env.extractCss`,
88-
hmr: `webpack-dev-server -d --devtool '#source-map' --inline --hot --env.server`
86+
default: `webpack-dev-server -d --inline --env.server`,
87+
extractCss: `webpack-dev-server -d --inline --env.server --env.extractCss`,
88+
hmr: `webpack-dev-server -d --inline --hot --env.server`
8989
},
9090
},
9191
serve: 'http-server dist --cors --gzip',

package.json

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "aurelia-typescript-boilerplate",
3-
"version": "6.0.0",
3+
"version": "6.1.0",
44
"title": "Aurelia Typescript Boilerplate",
55
"description": "A starter kit for building a standard navigation-style app with Aurelia and Webpack.",
66
"main": "dist/app.bundle.js",
@@ -76,29 +76,29 @@
7676
},
7777
"devDependencies": {
7878
"@types/cordova": "^0.0.34",
79-
"@types/i18next-browser-languagedetector": "^0.0.31",
80-
"@types/jest": "^20.0.2",
81-
"@types/jquery": "^2.0.46",
82-
"@types/lodash": "^4.14.66",
83-
"@types/node": "^8.0.2",
84-
"@types/webpack": "^3.0.0",
79+
"@types/i18next-browser-languagedetector": "^2.0.0",
80+
"@types/jest": "^20.0.4",
81+
"@types/jquery": "^3.2.9",
82+
"@types/lodash": "^4.14.71",
83+
"@types/node": "^8.0.15",
84+
"@types/webpack": "^3.0.5",
8585
"aurelia-loader-nodejs": "^1.0.1",
8686
"aurelia-pal-nodejs": "1.0.0-beta.1.0.0",
8787
"aurelia-protractor-plugin": "^1.0.3",
8888
"aurelia-template-lint-webpack-loader": "^1.0.3",
8989
"aurelia-testing": "^1.0.0-beta.3.0.1",
9090
"aurelia-webpack-plugin": "^2.0.0-rc.2",
91-
"autoprefixer": "^7.1.1",
92-
"awesome-typescript-loader": "^3.1.3",
91+
"autoprefixer": "^7.1.2",
92+
"awesome-typescript-loader": "^3.2.1",
9393
"case-sensitive-paths-webpack-plugin": "^2.1.1",
94-
"chalk": "^1.1.3",
95-
"compression-webpack-plugin": "^0.4.0",
94+
"chalk": "^2.0.1",
95+
"compression-webpack-plugin": "^1.0.0",
9696
"copy-webpack-plugin": "^4.0.1",
9797
"cordova": "^7.0.1",
9898
"cross-env": "^5.0.1",
9999
"css-loader": "^0.28.4",
100100
"expose-loader": "^0.7.3",
101-
"extract-text-webpack-plugin": "^2.1.2",
101+
"extract-text-webpack-plugin": "^3.0.0",
102102
"favicons-webpack-plugin": "^0.0.7",
103103
"file-loader": "^0.11.2",
104104
"html-webpack-plugin": "^2.29.0",
@@ -108,32 +108,32 @@
108108
"jasmine-core": "^2.6.4",
109109
"jest": "^20.0.4",
110110
"jest-cli": "^20.0.4",
111-
"json-loader": "^0.5.4",
111+
"json-loader": "^0.5.7",
112112
"karma": "^1.7.0",
113113
"karma-chrome-launcher": "^2.2.0",
114114
"karma-coverage-istanbul-reporter": "^1.3.0",
115115
"karma-jasmine": "^1.1.0",
116116
"karma-mocha-reporter": "^2.2.3",
117-
"karma-webpack": "^2.0.3",
117+
"karma-webpack": "^2.0.4",
118118
"loader-utils": "^1.1.0",
119119
"ncp": "^2.0.0",
120120
"node-sass": "^4.5.3",
121-
"nps": "^5.3.2",
121+
"nps": "^5.6.0",
122122
"nps-utils": "^1.2.0",
123123
"postcss-loader": "^2.0.6",
124124
"protractor": "^5.1.2",
125125
"sass-loader": "^6.0.6",
126126
"style-loader": "^0.18.2",
127-
"ts-jest": "^20.0.6",
128-
"ts-node": "^3.1.0",
127+
"ts-jest": "^20.0.7",
128+
"ts-node": "^3.2.1",
129129
"tslib": "^1.7.1",
130-
"tslint": "^5.4.3",
130+
"tslint": "^5.5.0",
131131
"tslint-loader": "^3.5.3",
132-
"typescript": "^2.3.4",
132+
"typescript": "^2.4.2",
133133
"url-loader": "^0.5.9",
134134
"wait-on": "^2.0.2",
135-
"webpack": "^3.0.0",
136-
"webpack-dev-server": "^2.5.0",
135+
"webpack": "^3.3.0",
136+
"webpack-dev-server": "^2.6.1",
137137
"webpack-notifier": "^1.5.0"
138138
},
139139
"dependencies": {
@@ -142,19 +142,19 @@
142142
"aurelia-bootstrapper": "^2.1.1",
143143
"aurelia-dialog": "^1.0.0-rc.1.0.3",
144144
"aurelia-fetch-client": "^1.1.2",
145-
"aurelia-framework": "^1.1.2",
145+
"aurelia-framework": "^1.1.4",
146146
"aurelia-history-browser": "^1.0.0",
147-
"aurelia-i18n": "^1.6.1",
147+
"aurelia-i18n": "^1.6.2",
148148
"aurelia-loader-webpack": "^2.1.0",
149149
"aurelia-logging-console": "^1.0.0",
150150
"aurelia-pal-browser": "^1.2.1",
151-
"aurelia-polyfills": "^1.2.1",
151+
"aurelia-polyfills": "^1.2.2",
152152
"aurelia-router": "^1.3.0",
153153
"aurelia-templating": "^1.4.2",
154154
"aurelia-templating-binding": "^1.3.0",
155155
"aurelia-templating-resources": "^1.4.0",
156156
"aurelia-templating-router": "^1.1.0",
157-
"aurelia-validation": "^1.0.0",
157+
"aurelia-validation": "^1.1.1",
158158
"bluebird": "^3.5.0",
159159
"bootstrap-sass": "^3.3.7",
160160
"font-awesome": "^4.7.0",

tsconfig.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
"moduleResolution": "node",
88
"allowJs": true,
99
"sourceRoot": "src",
10-
"compileOnSave": false,
1110
"importHelpers": true,
1211
"lib": [
1312
"es2017", "dom"

webpack.config.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const path = require('path')
1+
const path = require('path');
22
const chalk = require('chalk');
33
const HtmlWebpackPlugin = require('html-webpack-plugin');
44
const CopyWebpackPlugin = require('copy-webpack-plugin');
@@ -8,7 +8,7 @@ const WebpackNotifierPlugin = require('webpack-notifier');
88
const CompressionPlugin = require("compression-webpack-plugin");
99
const CaseSensitivePathsPlugin = require('case-sensitive-paths-webpack-plugin');
1010
const { AureliaPlugin } = require('aurelia-webpack-plugin');
11-
const { optimize: { CommonsChunkPlugin }, ProvidePlugin, BannerPlugin, DefinePlugin } = require('webpack')
11+
const { optimize: { CommonsChunkPlugin }, ProvidePlugin, BannerPlugin, DefinePlugin } = require('webpack');
1212
const { TsConfigPathsPlugin, CheckerPlugin } = require('awesome-typescript-loader');
1313
const pkg = require('./package.json');
1414

@@ -34,6 +34,9 @@ const cssRules = [
3434
}
3535
]
3636

37+
/**
38+
* @return {webpack.Configuration}
39+
*/
3740
module.exports = ({ production, server, extractCss, coverage, platform, config } = {}) => {
3841

3942
const PLATFORM = platform || 'browser';
@@ -57,6 +60,7 @@ module.exports = ({ production, server, extractCss, coverage, platform, config }
5760
extensions: ['.ts', '.js'],
5861
modules: [srcDir, 'node_modules'],
5962
},
63+
devtool: production ? 'source-map' : 'cheap-module-eval-source-map',
6064
entry: {
6165
app: ['aurelia-bootstrapper'],
6266
vendor: ['bluebird', 'jquery', 'bootstrap-sass'],

0 commit comments

Comments
 (0)