From 7a2f07126941adeb78dd81edb5d086e32930923b Mon Sep 17 00:00:00 2001 From: n1474335 Date: Tue, 1 Aug 2017 14:42:09 +0000 Subject: [PATCH] Dependencies in the node version are now kept external in the webpack build --- Gruntfile.js | 3 +++ package-lock.json | 14 ++++++++------ package.json | 5 +++-- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 42cd5923..a025e940 100755 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,6 +1,7 @@ const webpack = require("webpack"); const ExtractTextPlugin = require("extract-text-webpack-plugin"); const HtmlWebpackPlugin = require("html-webpack-plugin"); +const NodeExternals = require("webpack-node-externals"); const Inliner = require("web-resource-inliner"); module.exports = function (grunt) { @@ -294,6 +295,7 @@ module.exports = function (grunt) { tests: { target: "node", entry: "./test/index.js", + externals: [NodeExternals()], output: { filename: "index.js", path: __dirname + "/build/test" @@ -302,6 +304,7 @@ module.exports = function (grunt) { node: { target: "node", entry: "./src/node/index.js", + externals: [NodeExternals()], output: { filename: "CyberChef.js", path: __dirname + "/build/node", diff --git a/package-lock.json b/package-lock.json index c8e87320..8533827a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -865,7 +865,6 @@ "version": "6.23.0", "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.23.0.tgz", "integrity": "sha1-g2TKYt+Or7gwSZ9pkXdGbDsDSZ0=", - "dev": true, "requires": { "babel-runtime": "6.23.0", "core-js": "2.4.1", @@ -929,7 +928,6 @@ "version": "6.23.0", "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz", "integrity": "sha1-CpSJ8UTecO+zzkMArM2zKeL8VDs=", - "dev": true, "requires": { "core-js": "2.4.1", "regenerator-runtime": "0.10.5" @@ -1557,8 +1555,7 @@ "core-js": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz", - "integrity": "sha1-TekR5mew6ukSTjQlS1OupvxhjT4=", - "dev": true + "integrity": "sha1-TekR5mew6ukSTjQlS1OupvxhjT4=" }, "core-util-is": { "version": "1.0.2", @@ -6208,8 +6205,7 @@ "regenerator-runtime": { "version": "0.10.5", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz", - "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=", - "dev": true + "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=" }, "regenerator-transform": { "version": "0.9.11", @@ -7438,6 +7434,12 @@ } } }, + "webpack-node-externals": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/webpack-node-externals/-/webpack-node-externals-1.6.0.tgz", + "integrity": "sha1-Iyxi7GCSsQBjWj0p2DwXRxKN+b0=", + "dev": true + }, "webpack-sources": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.0.1.tgz", diff --git a/package.json b/package.json index 208789bd..89729ed2 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,6 @@ "devDependencies": { "babel-core": "^6.24.0", "babel-loader": "^7.1.1", - "babel-polyfill": "^6.23.0", "babel-preset-env": "^1.6.0", "css-loader": "^0.28.4", "exports-loader": "^0.6.4", @@ -60,11 +59,13 @@ "style-loader": "^0.18.2", "url-loader": "^0.5.8", "web-resource-inliner": "^4.1.0", - "webpack": "^3.3.0" + "webpack": "^3.3.0", + "webpack-node-externals": "^1.6.0" }, "dependencies": { "bootstrap": "^3.3.7", "bootstrap-colorpicker": "^2.5.1", + "babel-polyfill": "^6.23.0", "bootstrap-switch": "^3.3.4", "crypto-api": "^0.6.2", "crypto-js": "^3.1.9-1",