Skip to content
This repository has been archived by the owner on May 7, 2021. It is now read-only.

Commit

Permalink
fix(build): upgrade versions and clean up webpack, fabric8-wit to 6.5…
Browse files Browse the repository at this point in the history
….1 and widgets to 0.6.2
  • Loading branch information
joshuawilson committed Mar 3, 2017
1 parent 252b2c8 commit 0181b8e
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 29 deletions.
6 changes: 3 additions & 3 deletions config/webpack.common.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,13 @@ module.exports = {
},
{
test: /\.(png|jpe?g|gif|svg|woff|woff2|ttf|eot|ico)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
use: 'file-loader'
use: ['file-loader']
},

// Support for *.json files.
{
test: /\.json$/,
use: 'json-loader'
use: ['json-loader']
},

{
Expand Down Expand Up @@ -117,7 +117,7 @@ module.exports = {
},
{
test: /\.html$/,
use: 'raw-loader'
use: ['raw-loader']
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion config/webpack.prod.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ module.exports = webpackMerge(commonConfig, {

// require those dependencies but don't bundle them
externals: [
/^\@angular\//,
/^@angular\//,
/^rxjs\//
],

Expand Down
14 changes: 7 additions & 7 deletions config/webpack.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ module.exports = {
*/
{
test: /\.ts$/,
loaders: [
use: [
'awesome-typescript-loader',
'angular2-template-loader'
],
Expand All @@ -84,30 +84,30 @@ module.exports = {

{
test: /\.(png|jpe?g|gif|svg|woff|woff2|ttf|eot|ico)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
use: 'file-loader'
use: ['file-loader']
},

// Support for *.json files.
{
test: /\.json$/,
use: 'json-loader'
use: ['json-loader']
},
{
test: /\.(png|jpe?g|gif|svg|woff|woff2|ttf|eot|ico)$/,
loader: 'null-loader'
use: ['null-loader']
},
{
test: /\.css$/,
loaders: ['to-string-loader', 'css-loader']
use: ['to-string-loader', 'css-loader']
},

{
test: /\.scss$/,
loaders: ["css-to-string-loader", "css-loader", "sass-loader"]
use: ["css-to-string-loader", "css-loader", "sass-loader"]
},
{
test: /\.html$/,
loader: 'raw-loader',
use: ['raw-loader'],
exclude: [helpers.root('src/index.html')]
},

Expand Down
36 changes: 18 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -113,15 +113,15 @@
"core-js": "2.4.1",
"lodash": "4.17.4",
"moment": "2.17.1",
"mydatepicker": "1.6.18",
"mydatepicker": "1.7.2",
"ng2-bootstrap": "1.1.16",
"ng2-completer": "0.3.1",
"ng2-dnd": "2.0.1",
"ngx-dropdown": "0.0.22",
"ngx-fabric8-wit": "6.5.1",
"ngx-login-client": "0.1.7",
"ngx-login-client": "0.1.8",
"ngx-modal": "0.0.29",
"ngx-widgets": "0.4.3",
"ngx-widgets": "0.6.2",
"reflect-metadata": "0.1.10",
"rxjs": "5.0.1",
"zone.js": "0.7.7"
Expand All @@ -132,22 +132,22 @@
"@angular/compiler-cli": "2.4.8",
"@krux/condition-jenkins": "^1.0.1",
"@types/jasmine": "2.5.43",
"@types/lodash": "4.14.53",
"@types/lodash": "4.14.54",
"@types/node": "6.0.45",
"@types/selenium-webdriver": "2.53.40",
"@types/zone.js": "0.0.27",
"angular-in-memory-web-api": "0.2.4",
"angular-in-memory-web-api": "0.3.0",
"angular2-load-children-loader": "0.1.3",
"angular2-router-loader": "0.3.5",
"angular2-template-loader": "0.6.2",
"angular2-tree-component": "2.8.2",
"assets-webpack-plugin": "3.5.1",
"autoprefixer": "6.7.5",
"awesome-typescript-loader": "3.0.7",
"autoprefixer": "6.7.6",
"awesome-typescript-loader": "3.0.8",
"child_process": "1.0.2",
"clean-css": "4.0.8",
"clean-webpack-plugin": "0.1.15",
"codelyzer": "2.0.1",
"codelyzer": "3.0.0-beta.0",
"copy-webpack-plugin": "4.0.1",
"copyfiles": "1.2.0",
"cpy-cli": "1.0.1",
Expand Down Expand Up @@ -175,10 +175,10 @@
"gulp-uglify": "2.0.1",
"gulp-wait": "0.0.2",
"html-loader": "0.4.5",
"html-minifier": "3.3.3",
"html-minifier": "3.4.0",
"html-webpack-plugin": "2.28.0",
"husky": "0.13.1",
"imports-loader": "0.7.0",
"husky": "0.13.2",
"imports-loader": "0.7.1",
"istanbul-instrumenter-loader": "2.0.0",
"jasmine-core": "2.5.2",
"json-loader": "0.5.4",
Expand All @@ -201,19 +201,19 @@
"null-loader": "0.1.1",
"opt-cli": "1.5.1",
"optimize-js-plugin": "0.0.4",
"parse5": "3.0.1",
"parse5": "2.2.3",
"phantomjs-prebuilt": "2.1.14",
"postcss-loader": "1.3.2",
"postcss-loader": "1.3.3",
"precss": "1.4.0",
"protractor": "5.1.1",
"raw-loader": "0.5.1",
"resolve-url-loader": "2.0.0",
"resolve-url-loader": "2.0.1",
"rimraf": "2.6.1",
"rollup": "0.41.4",
"rollup-plugin-angular-aot": "0.0.4",
"run-sequence": "1.2.2",
"sass-lint": "1.10.2",
"sass-loader": "4.1.1",
"sass-loader": "6.0.2",
"sasslint-webpack-plugin": "1.0.4",
"script-ext-html-webpack-plugin": "1.7.1",
"semantic-release": "^6.3.2",
Expand All @@ -224,11 +224,11 @@
"ts-helpers": "1.1.2",
"ts-loader": "2.0.1",
"ts-node": "2.1.0",
"tslint": "4.4.2",
"tslint-loader": "3.4.2",
"tslint": "4.5.1",
"tslint-loader": "3.4.3",
"typedoc": "0.5.7",
"typescript": "2.1.6",
"uglify-js": "2.7.5",
"uglify-js": "2.8.5",
"url-loader": "0.5.8",
"validate-commit-msg": "^2.11.1",
"webpack": "2.2.1",
Expand Down
1 change: 1 addition & 0 deletions src/app/footer/footer.component.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.content { }

0 comments on commit 0181b8e

Please sign in to comment.