From bea176a6463690a3e2cecda37569125cf97e575c Mon Sep 17 00:00:00 2001
From: Dave Page <dpage@pgadmin.org>
Date: Wed, 30 May 2018 16:52:54 -0400
Subject: [PATCH] Fix failed yarn changes

---
 pkg/docker/Dockerfile |  2 +-
 web/package.json      | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkg/docker/Dockerfile b/pkg/docker/Dockerfile
index 8603d6434..1b9f86e4f 100644
--- a/pkg/docker/Dockerfile
+++ b/pkg/docker/Dockerfile
@@ -15,7 +15,7 @@ COPY ./pgadmin4/web/ /pgadmin4/web/
 WORKDIR /pgadmin4/web
 
 RUN yarn install --emoji false --cache-folder ./ycache --verbose && \
-    yarn run bundle --emoji false && \
+    yarn run --emoji false bundle && \
     rm -rf ./ycache ./pgadmin/static/js/generated/.cache
 
 # Build Sphinx documentation in separate container
diff --git a/web/package.json b/web/package.json
index 7d4ffb333..1b533d94b 100644
--- a/web/package.json
+++ b/web/package.json
@@ -92,15 +92,15 @@
   },
   "scripts": {
     "linter": "yarn eslint --emoji false --no-eslintrc -c .eslintrc.js --ext .js --ext .jsx .",
-    "webpacker": "yarn run webpack --emoji false --config webpack.config.js --progress",
-    "webpacker:watch": "yarn run webpack --emoji false --config webpack.config.js --progress --watch",
-    "bundle:watch": "yarn run linter --emoji false && yarn run webpacker:watch --emoji false",
-    "bundle:dev": "yarn run linter --emoji false && yarn run webpacker --emoji false",
-    "bundle": "cross-env NODE_ENV=production yarn run bundle:dev --emoji false",
-    "test:karma-once": "yarn run linter --emoji false && yarn run karma start --single-run --emoji false",
-    "test:karma": "yarn run linter --emoji false  && yarn run karma start --emoji false",
-    "test:feature": "yarn run bundle --emoji false && python regression/runtests.py --pkg feature_tests",
-    "test": "yarn run test:karma-once --emoji false && yarn run bundle --emoji false && python regression/runtests.py",
+    "webpacker": "yarn run --emoji false webpack --config webpack.config.js --progress",
+    "webpacker:watch": "yarn run --emoji false webpack --config webpack.config.js --progress --watch",
+    "bundle:watch": "yarn run --emoji false linter && yarn run --emoji false webpacker:watch",
+    "bundle:dev": "yarn run --emoji false linter && yarn run --emoji false webpacker",
+    "bundle": "cross-env NODE_ENV=production yarn run --emoji false bundle:dev",
+    "test:karma-once": "yarn run --emoji false linter && yarn run --emoji false karma start --single-run",
+    "test:karma": "yarn run --emoji false linter && yarn run --emoji false karma start",
+    "test:feature": "yarn run --emoji false bundle && python regression/runtests.py --pkg feature_tests",
+    "test": "yarn run --emoji false test:karma-once && yarn run bundle && python regression/runtests.py",
     "pep8": "pycodestyle --config=.pycodestyle ."
   }
 }