IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

build: minor webpack fix

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-10-02 13:15:28 +02:00
parent 010a29a42d
commit c338d8250b
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
package.json
View File

@ -15,7 +15,9 @@
"@types/node": "^8.0.31", "@types/node": "^8.0.31",
"@types/react": "^16.0.5", "@types/react": "^16.0.5",
"@types/react-dom": "^15.5.4", "@types/react-dom": "^15.5.4",
"angular-mocks": "^1.6.6",
"autoprefixer": "^6.4.0", "autoprefixer": "^6.4.0",
"awesome-typescript-loader": "^3.2.3",
"babel-core": "^6.26.0", "babel-core": "^6.26.0",
"babel-loader": "^7.1.2", "babel-loader": "^7.1.2",
"babel-preset-es2015": "^6.24.1", "babel-preset-es2015": "^6.24.1",
@ -66,6 +68,7 @@
"ng-annotate-loader": "^0.6.1", "ng-annotate-loader": "^0.6.1",
"ng-annotate-webpack-plugin": "^0.2.1-pre", "ng-annotate-webpack-plugin": "^0.2.1-pre",
"ngtemplate-loader": "^2.0.1", "ngtemplate-loader": "^2.0.1",
"npm": "^5.4.2",
"phantomjs-prebuilt": "^2.1.15", "phantomjs-prebuilt": "^2.1.15",
"postcss-browser-reporter": "^0.5.0", "postcss-browser-reporter": "^0.5.0",
"postcss-loader": "^2.0.6", "postcss-loader": "^2.0.6",
@ -85,10 +88,7 @@
"webpack-bundle-analyzer": "^2.9.0", "webpack-bundle-analyzer": "^2.9.0",
"webpack-cleanup-plugin": "^0.5.1", "webpack-cleanup-plugin": "^0.5.1",
"webpack-merge": "^4.1.0", "webpack-merge": "^4.1.0",
"zone.js": "^0.7.2", "zone.js": "^0.7.2"
"awesome-typescript-loader": "^3.2.3",
"angular-mocks": "^1.6.6",
"npm": "^5.4.2"
}, },
"scripts": { "scripts": {
"dev": "./node_modules/.bin/webpack --progress --colors --config scripts/webpack/webpack.dev.js", "dev": "./node_modules/.bin/webpack --progress --colors --config scripts/webpack/webpack.dev.js",
@ -99,17 +99,17 @@
}, },
"license": "Apache-2.0", "license": "Apache-2.0",
"dependencies": { "dependencies": {
"babel-polyfill": "^6.26.0",
"jquery": "^3.2.1",
"angular": "^1.6.6", "angular": "^1.6.6",
"angular-bindonce": "^0.3.1", "angular-bindonce": "^0.3.1",
"angular-native-dragdrop": "^1.2.2", "angular-native-dragdrop": "^1.2.2",
"angular-route": "^1.6.6", "angular-route": "^1.6.6",
"angular-sanitize": "^1.6.6", "angular-sanitize": "^1.6.6",
"babel-polyfill": "^6.26.0",
"brace": "^0.10.0", "brace": "^0.10.0",
"clipboard": "^1.7.1", "clipboard": "^1.7.1",
"eventemitter3": "^2.0.3", "eventemitter3": "^2.0.3",
"file-saver": "^1.3.3", "file-saver": "^1.3.3",
"jquery": "^3.2.1",
"lodash": "^4.17.4", "lodash": "^4.17.4",
"moment": "^2.18.1", "moment": "^2.18.1",
"mousetrap": "^1.6.0", "mousetrap": "^1.6.0",

8
scripts/webpack/webpack.dev.js
View File

@ -9,7 +9,15 @@ const ExtractTextPlugin = require("extract-text-webpack-plugin");
const WebpackCleanupPlugin = require('webpack-cleanup-plugin'); const WebpackCleanupPlugin = require('webpack-cleanup-plugin');
const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin; const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
const pkg = require('../../package.json'); const pkg = require('../../package.json');
const _ = require('lodash');
let dependencies = Object.keys(pkg.dependencies); let dependencies = Object.keys(pkg.dependencies);
// remove jquery
dependencies = _.filter(dependencies, function(key) {
return key !== 'jquery';
});
// add it first
dependencies.unshift('jquery');
module.exports = merge(common, { module.exports = merge(common, {
devtool: "source-map", devtool: "source-map",