Skip to content

Commit

Permalink
fix(dependencies): fix versions
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexander Zhukov committed Feb 16, 2017
1 parent 62810ae commit 5523029
Show file tree
Hide file tree
Showing 4 changed files with 144 additions and 113 deletions.
5 changes: 1 addition & 4 deletions config/helpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,7 @@ function isWebpackDevServer() {
return process.argv[1] && !! (/webpack-dev-server/.exec(process.argv[1]));
}

function root(args) {
args = Array.prototype.slice.call(arguments, 0);
return path.join.apply(path, [ROOT].concat(args));
}
var root = path.join.bind(path, ROOT);

exports.hasProcessFlag = hasProcessFlag;
exports.hasNpmFlag = hasNpmFlag;
Expand Down
6 changes: 4 additions & 2 deletions config/html-elements-plugin/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,12 @@ function createTag(tagName, attrMap, publicPath) {
}
}

return name + '="' + value + '"';
return `${name}="${value}"`;
});

return '<' + tagName + ' ' + attributes.join(' ') + '>';
const closingTag = tagName === 'script' ? '</script>' : '';

return `<${tagName} ${attributes.join(' ')}>${closingTag}`;
}

/**
Expand Down
25 changes: 11 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"@angularclass/conventions-loader": "1.0.13",
"@angularclass/hmr": "1.2.2",
"@angularclass/hmr-loader": "3.0.2",
"amcharts3": "github:amcharts/amcharts3#3.20.20",
"ammap3": "github:amcharts/ammap3#3.20.20",
"amcharts3": "github:amcharts/amcharts3",
"ammap3": "github:amcharts/ammap3",
"animate.css": "3.5.2",
"bootstrap": "4.0.0-alpha.4",
"chart.js": "1.1.1",
Expand Down Expand Up @@ -54,7 +54,6 @@
},
"devDependencies": {
"@angular/compiler-cli": "2.4.7",
"@angular/tsc-wrapped": "0.5.2",
"@types/electron": "1.4.32",
"@types/fullcalendar": "2.7.37",
"@types/hammerjs": "2.0.34",
Expand All @@ -68,18 +67,17 @@
"add-asset-html-webpack-plugin": "1.0.2",
"angular2-template-loader": "0.6.0",
"assets-webpack-plugin": "3.5.1",
"awesome-typescript-loader": "3.0.3",
"awesome-typescript-loader": "3.0.4",
"bootstrap-loader": "2.0.0-beta.18",
"codelyzer": "2.0.0",
"compression-webpack-plugin": "0.3.2",
"copy-webpack-plugin": "4.0.1",
"css-loader": "0.26.1",
"electron": "1.6.0",
"es6-promise": "4.0.5",
"es6-shim": "0.35.3",
"es7-reflect-metadata": "1.6.0",
"exports-loader": "0.6.3",
"expose-loader": "0.7.2",
"expose-loader": "0.7.3",
"extract-text-webpack-plugin": "2.0.0-rc.3",
"file-loader": "0.10.0",
"find-root": "1.0.0",
Expand All @@ -88,16 +86,15 @@
"imports-loader": "0.7.0",
"json-loader": "0.5.4",
"ng-router-loader": "2.1.0",
"ngc-webpack": "1.1.3",
"node-sass": "4.3.0",
"ngc-webpack": "1.1.0",
"node-sass": "4.5.0",
"npm-run-all": "4.0.1",
"optimize-js-plugin": "0.0.4",
"parse5": "3.0.1",
"postcss-loader": "0.13.0",
"postcss-loader": "1.3.0",
"raw-loader": "0.5.1",
"resolve-url-loader": "1.6.1",
"rimraf": "2.5.4",
"sass-loader": "4.1.1",
"sass-loader": "6.0.0",
"script-ext-html-webpack-plugin": "1.7.1",
"source-map-loader": "0.1.6",
"string-replace-loader": "1.0.5",
Expand All @@ -106,12 +103,12 @@
"ts-node": "2.1.0",
"tslib": "1.5.0",
"tslint": "4.4.2",
"typedoc": "0.5.5",
"typedoc": "0.5.6",
"typescript": "2.1.6",
"url-loader": "0.5.7",
"webpack": "2.2.0",
"webpack-dev-middleware": "1.10.0",
"webpack-dev-server": "2.2.0",
"webpack-dev-server": "2.3.0",
"webpack-dll-bundles-plugin": "1.0.0-beta.5",
"webpack-merge": "2.6.1"
},
Expand Down Expand Up @@ -140,7 +137,7 @@
"prebuild:prod": "npm run clean:dist",
"build:prod": "npm run clean:dist && webpack --config config/webpack.prod.js --progress --profile",
"server": "npm run server:dev",
"server:dev": "webpack-dev-server --config config/webpack.dev.js --open --progress --profile --watch --content-base src/",
"server:dev": "webpack-dev-server --config config/webpack.dev.js --progress --profile --watch --content-base src/",
"server:dev:hmr": "npm run server:dev -- --inline --hot",
"server:prod": "http-server dist -c-1 --cors",
"server:test": "http-server dist-demo -c-1 --cors",
Expand Down
Loading

0 comments on commit 5523029

Please sign in to comment.