Skip to content

Commit

Permalink
Merge branch 'release/6.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
dweber019 committed Sep 4, 2017
2 parents 9dc3848 + 115846a commit 34b6af5
Show file tree
Hide file tree
Showing 6 changed files with 749 additions and 331 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ language: node_js
node_js:
- "6.9.1"
install:
- npm install
- yarn install
script:
- npm test
- npm start -- build
Expand Down
10 changes: 5 additions & 5 deletions package-scripts.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const { series, crossEnv, concurrent, rimraf } = require('nps-utils')
const { config: { port: E2E_PORT } } = require('./test/protractor.conf')
const { series, crossEnv, concurrent, rimraf } = require('nps-utils');
const { config: { port: E2E_PORT } } = require('./test/protractor.conf');

module.exports = {
scripts: {
Expand Down Expand Up @@ -83,9 +83,9 @@ module.exports = {
}
},
server: {
default: `webpack-dev-server -d --devtool '#source-map' --inline --env.server`,
extractCss: `webpack-dev-server -d --devtool '#source-map' --inline --env.server --env.extractCss`,
hmr: `webpack-dev-server -d --devtool '#source-map' --inline --hot --env.server`
default: `webpack-dev-server -d --inline --env.server`,
extractCss: `webpack-dev-server -d --inline --env.server --env.extractCss`,
hmr: `webpack-dev-server -d --inline --hot --env.server`
},
},
serve: 'http-server dist --cors --gzip',
Expand Down
50 changes: 25 additions & 25 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "aurelia-typescript-boilerplate",
"version": "6.0.0",
"version": "6.1.0",
"title": "Aurelia Typescript Boilerplate",
"description": "A starter kit for building a standard navigation-style app with Aurelia and Webpack.",
"main": "dist/app.bundle.js",
Expand Down Expand Up @@ -76,29 +76,29 @@
},
"devDependencies": {
"@types/cordova": "^0.0.34",
"@types/i18next-browser-languagedetector": "^0.0.31",
"@types/jest": "^20.0.2",
"@types/jquery": "^2.0.46",
"@types/lodash": "^4.14.66",
"@types/node": "^8.0.2",
"@types/webpack": "^3.0.0",
"@types/i18next-browser-languagedetector": "^2.0.0",
"@types/jest": "^20.0.4",
"@types/jquery": "^3.2.9",
"@types/lodash": "^4.14.71",
"@types/node": "^8.0.15",
"@types/webpack": "^3.0.5",
"aurelia-loader-nodejs": "^1.0.1",
"aurelia-pal-nodejs": "1.0.0-beta.1.0.0",
"aurelia-protractor-plugin": "^1.0.3",
"aurelia-template-lint-webpack-loader": "^1.0.3",
"aurelia-testing": "^1.0.0-beta.3.0.1",
"aurelia-webpack-plugin": "^2.0.0-rc.2",
"autoprefixer": "^7.1.1",
"awesome-typescript-loader": "^3.1.3",
"autoprefixer": "^7.1.2",
"awesome-typescript-loader": "^3.2.1",
"case-sensitive-paths-webpack-plugin": "^2.1.1",
"chalk": "^1.1.3",
"compression-webpack-plugin": "^0.4.0",
"chalk": "^2.0.1",
"compression-webpack-plugin": "^1.0.0",
"copy-webpack-plugin": "^4.0.1",
"cordova": "^7.0.1",
"cross-env": "^5.0.1",
"css-loader": "^0.28.4",
"expose-loader": "^0.7.3",
"extract-text-webpack-plugin": "^2.1.2",
"extract-text-webpack-plugin": "^3.0.0",
"favicons-webpack-plugin": "^0.0.7",
"file-loader": "^0.11.2",
"html-webpack-plugin": "^2.29.0",
Expand All @@ -108,32 +108,32 @@
"jasmine-core": "^2.6.4",
"jest": "^20.0.4",
"jest-cli": "^20.0.4",
"json-loader": "^0.5.4",
"json-loader": "^0.5.7",
"karma": "^1.7.0",
"karma-chrome-launcher": "^2.2.0",
"karma-coverage-istanbul-reporter": "^1.3.0",
"karma-jasmine": "^1.1.0",
"karma-mocha-reporter": "^2.2.3",
"karma-webpack": "^2.0.3",
"karma-webpack": "^2.0.4",
"loader-utils": "^1.1.0",
"ncp": "^2.0.0",
"node-sass": "^4.5.3",
"nps": "^5.3.2",
"nps": "^5.6.0",
"nps-utils": "^1.2.0",
"postcss-loader": "^2.0.6",
"protractor": "^5.1.2",
"sass-loader": "^6.0.6",
"style-loader": "^0.18.2",
"ts-jest": "^20.0.6",
"ts-node": "^3.1.0",
"ts-jest": "^20.0.7",
"ts-node": "^3.2.1",
"tslib": "^1.7.1",
"tslint": "^5.4.3",
"tslint": "^5.5.0",
"tslint-loader": "^3.5.3",
"typescript": "^2.3.4",
"typescript": "^2.4.2",
"url-loader": "^0.5.9",
"wait-on": "^2.0.2",
"webpack": "^3.0.0",
"webpack-dev-server": "^2.5.0",
"webpack": "^3.3.0",
"webpack-dev-server": "^2.6.1",
"webpack-notifier": "^1.5.0"
},
"dependencies": {
Expand All @@ -142,19 +142,19 @@
"aurelia-bootstrapper": "^2.1.1",
"aurelia-dialog": "^1.0.0-rc.1.0.3",
"aurelia-fetch-client": "^1.1.2",
"aurelia-framework": "^1.1.2",
"aurelia-framework": "^1.1.4",
"aurelia-history-browser": "^1.0.0",
"aurelia-i18n": "^1.6.1",
"aurelia-i18n": "^1.6.2",
"aurelia-loader-webpack": "^2.1.0",
"aurelia-logging-console": "^1.0.0",
"aurelia-pal-browser": "^1.2.1",
"aurelia-polyfills": "^1.2.1",
"aurelia-polyfills": "^1.2.2",
"aurelia-router": "^1.3.0",
"aurelia-templating": "^1.4.2",
"aurelia-templating-binding": "^1.3.0",
"aurelia-templating-resources": "^1.4.0",
"aurelia-templating-router": "^1.1.0",
"aurelia-validation": "^1.0.0",
"aurelia-validation": "^1.1.1",
"bluebird": "^3.5.0",
"bootstrap-sass": "^3.3.7",
"font-awesome": "^4.7.0",
Expand Down
1 change: 0 additions & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"moduleResolution": "node",
"allowJs": true,
"sourceRoot": "src",
"compileOnSave": false,
"importHelpers": true,
"lib": [
"es2017", "dom"
Expand Down
8 changes: 6 additions & 2 deletions webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const path = require('path')
const path = require('path');
const chalk = require('chalk');
const HtmlWebpackPlugin = require('html-webpack-plugin');
const CopyWebpackPlugin = require('copy-webpack-plugin');
Expand All @@ -8,7 +8,7 @@ const WebpackNotifierPlugin = require('webpack-notifier');
const CompressionPlugin = require("compression-webpack-plugin");
const CaseSensitivePathsPlugin = require('case-sensitive-paths-webpack-plugin');
const { AureliaPlugin } = require('aurelia-webpack-plugin');
const { optimize: { CommonsChunkPlugin }, ProvidePlugin, BannerPlugin, DefinePlugin } = require('webpack')
const { optimize: { CommonsChunkPlugin }, ProvidePlugin, BannerPlugin, DefinePlugin } = require('webpack');
const { TsConfigPathsPlugin, CheckerPlugin } = require('awesome-typescript-loader');
const pkg = require('./package.json');

Expand All @@ -34,6 +34,9 @@ const cssRules = [
}
]

/**
* @return {webpack.Configuration}
*/
module.exports = ({ production, server, extractCss, coverage, platform, config } = {}) => {

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

0 comments on commit 34b6af5

Please sign in to comment.