Skip to content
This repository has been archived by the owner on Jun 1, 2022. It is now read-only.

Commit

Permalink
feat(webpack): upgrade to Webpack 3 and other dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
niieani committed Jul 17, 2017
1 parent 0418981 commit dad52cb
Show file tree
Hide file tree
Showing 13 changed files with 6,420 additions and 1,450 deletions.
2,474 changes: 1,965 additions & 509 deletions skeleton-esnext-webpack/package-lock.json

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions skeleton-esnext-webpack/package-scripts.js
@@ -1,5 +1,5 @@
const {series, crossEnv, concurrent, rimraf} = require('nps-utils')
const {config: {port : E2E_PORT}} = require('./test/protractor.conf')
const {config: {port: E2E_PORT}} = require('./test/protractor.conf')

module.exports = {
scripts: {
Expand Down Expand Up @@ -89,9 +89,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',
Expand Down
30 changes: 15 additions & 15 deletions skeleton-esnext-webpack/package.json
Expand Up @@ -58,55 +58,55 @@
"aurelia-testing": "1.0.0-beta.3.0.1",
"aurelia-tools": "1.0.0",
"aurelia-webpack-plugin": "2.0.0-rc.2",
"autoprefixer": "7.1.1",
"autoprefixer": "7.1.2",
"babel-core": "6.25.0",
"babel-eslint": "7.2.3",
"babel-jest": "20.0.3",
"babel-loader": "7.0.0",
"babel-loader": "7.1.1",
"babel-plugin-istanbul": "4.1.4",
"babel-plugin-transform-class-properties": "6.24.1",
"babel-plugin-transform-decorators-legacy": "1.3.4",
"babel-polyfill": "6.23.0",
"babel-preset-env": "1.5.2",
"babel-preset-env": "1.6.0",
"babel-register": "6.24.1",
"copy-webpack-plugin": "4.0.1",
"cross-env": "5.0.1",
"css-loader": "0.28.4",
"eslint": "3.19.0",
"expose-loader": "0.7.3",
"extract-text-webpack-plugin": "2.1.2",
"extract-text-webpack-plugin": "3.0.0",
"file-loader": "0.11.2",
"html-webpack-plugin": "2.28.0",
"html-webpack-plugin": "2.29.0",
"http-server": "0.10.0",
"jasmine-core": "2.6.3",
"jasmine-core": "2.6.4",
"jest": "20.0.4",
"jest-cli": "20.0.4",
"json-loader": "0.5.4",
"karma": "1.7.0",
"karma-chrome-launcher": "2.1.1",
"karma-chrome-launcher": "2.2.0",
"karma-coverage": "1.1.1",
"karma-jasmine": "1.1.0",
"karma-mocha-reporter": "2.2.3",
"karma-webpack": "2.0.3",
"nps": "5.3.1",
"karma-webpack": "2.0.4",
"nps": "5.6.0",
"nps-utils": "1.2.0",
"postcss-loader": "2.0.5",
"postcss-loader": "2.0.6",
"protractor": "5.1.2",
"style-loader": "0.18.2",
"url-loader": "0.5.8",
"url-loader": "0.5.9",
"wait-on": "2.0.2",
"webpack": "2.6.1",
"webpack-dev-server": "2.4.5"
"webpack": "3.3.0",
"webpack-dev-server": "2.5.1"
},
"dependencies": {
"aurelia-bootstrapper": "2.1.1",
"aurelia-fetch-client": "1.1.2",
"aurelia-framework": "1.1.2",
"aurelia-framework": "1.1.4",
"aurelia-history-browser": "1.0.0",
"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",
Expand Down
4 changes: 3 additions & 1 deletion skeleton-esnext-webpack/src/users.js
Expand Up @@ -2,7 +2,9 @@ import {inject, Lazy} from 'aurelia-framework';
import {HttpClient} from 'aurelia-fetch-client';

// polyfill fetch client conditionally
const fetch = !self.fetch ? System.import('isomorphic-fetch') : Promise.resolve(self.fetch);
const fetchPolyfill = !self.fetch
? import('isomorphic-fetch' /* webpackChunkName: 'fetch' */)
: Promise.resolve(self.fetch);

@inject(Lazy.of(HttpClient))
export class Users {
Expand Down
1 change: 1 addition & 0 deletions skeleton-esnext-webpack/webpack.config.js
Expand Up @@ -30,6 +30,7 @@ module.exports = ({production, server, extractCss, coverage} = {}) => ({
extensions: ['.js'],
modules: [srcDir, 'node_modules'],
},
devtool: production ? 'source-map' : 'cheap-module-eval-source-map',
entry: {
app: ['aurelia-bootstrapper'],
vendor: ['bluebird', 'jquery', 'bootstrap'],
Expand Down

0 comments on commit dad52cb

Please sign in to comment.