Remove COMPONENT flags for webpack

decidim · May 8, 2018 · 5bf4284 · 5bf4284
1 parent d9d7af3
commit 5bf4284
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 33 deletions.
diff --git a/decidim-admin/spec/bundles_spec.rb b/decidim-admin/spec/bundles_spec.rb
@@ -18,7 +18,7 @@
     end
   end
 
-  let(:command) { "COMPONENT=admin npm run build:prod" }
+  let(:command) { "npm run build:prod" }
 
   describe "javascript bundle" do
     let(:bundle_path) { "app/assets/javascripts/decidim/admin/bundle.js" }

diff --git a/decidim-comments/app/assets/javascripts/decidim/comments/bundle.js b/decidim-comments/app/assets/javascripts/decidim/comments/bundle.js
diff --git a/decidim-comments/spec/bundle_spec.rb b/decidim-comments/spec/bundle_spec.rb
@@ -3,7 +3,7 @@
 require "spec_helper"
 
 describe "Bundle sanity" do
-  let(:command) { "COMPONENT=comments npm run build:prod" }
+  let(:command) { "npm run build:prod" }
 
   it "is up to date" do
     previous_hash = bundle_hash

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -12,8 +12,8 @@
     "node": "^9.2.0"
   },
   "scripts": {
-    "build": "COMPONENT=${COMPONENT:-all} webpack --env.dev",
-    "build:prod": "NODE_ENV=production COMPONENT=${COMPONENT:-all} webpack -p --env.prod",
+    "build": "webpack --env.dev",
+    "build:prod": "NODE_ENV=production webpack -p --env.prod",
     "start": "webpack --env.dev --watch --progress --color --display-error-details",
     "prelint": "tslint decidim-*/**/*.ts decidim-*/**/*.tsx",
     "lint": "eslint -c .eslintrc.json --ext .js,.js.es6,.jsx .",

diff --git a/webpack.config.js b/webpack.config.js
@@ -12,12 +12,10 @@ module.exports = env => {
   const ifTest = envUtils.ifTest;
 
   const config = {
-    entry: Object.entries({
+    entry: {
       admin: "./decidim-admin/app/frontend/entry.ts",
       comments: "./decidim-comments/app/frontend/entry.ts",
-      })
-      .filter(([name, entry]) => process.env.COMPONENT === "all" || process.env.COMPONENT === name)
-      .reduce((a, [name, entry]) => Object.assign(a, {[name]: entry}), {}),
+    },
     output: {
       path: __dirname,
       filename: