From 6a28b9ff26b7cde442dd2aaeed72d5c3b47fc30f Mon Sep 17 00:00:00 2001 From: Dave Page Date: Wed, 30 May 2018 16:52:37 -0400 Subject: [PATCH] Revert failed Yarn changes. --- pkg/docker/Dockerfile | 2 +- web/package.json | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/docker/Dockerfile b/pkg/docker/Dockerfile index e8842cdc9..8603d6434 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 && \ + yarn run bundle --emoji false && \ 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 62f2a4bbc..7d4ffb333 100644 --- a/web/package.json +++ b/web/package.json @@ -94,13 +94,13 @@ "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 && yarn run webpacker:watch --emoji false", - "bundle:dev": "yarn run linter && yarn run webpacker --emoji false", + "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 && yarn run karma start --single-run --emoji false", - "test:karma": "yarn run linter && yarn run karma start --emoji false", - "test:feature": "yarn run bundle && python regression/runtests.py --pkg feature_tests", - "test": "yarn run test:karma-once && yarn run bundle && python regression/runtests.py", + "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", "pep8": "pycodestyle --config=.pycodestyle ." } }