From b00931407ee2cd3588a3ed81b94c464cd95c379f Mon Sep 17 00:00:00 2001 From: Dave Page Date: Wed, 30 May 2018 16:53:03 -0400 Subject: [PATCH] Fix failed yarn changes --- pkg/docker/Dockerfile | 4 ++-- web/package.json | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkg/docker/Dockerfile b/pkg/docker/Dockerfile index 1b9f86e4f..577d8a06e 100644 --- a/pkg/docker/Dockerfile +++ b/pkg/docker/Dockerfile @@ -14,8 +14,8 @@ FROM node:6 AS node-builder COPY ./pgadmin4/web/ /pgadmin4/web/ WORKDIR /pgadmin4/web -RUN yarn install --emoji false --cache-folder ./ycache --verbose && \ - yarn run --emoji false bundle && \ +RUN yarn install --cache-folder ./ycache --verbose && \ + yarn run 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 1b533d94b..6ccc4ee67 100644 --- a/web/package.json +++ b/web/package.json @@ -91,16 +91,16 @@ "webcabin-docker": "git+https://github.com/EnterpriseDB/wcDocker" }, "scripts": { - "linter": "yarn eslint --emoji false --no-eslintrc -c .eslintrc.js --ext .js --ext .jsx .", - "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", + "linter": "yarn eslint --no-eslintrc -c .eslintrc.js --ext .js --ext .jsx .", + "webpacker": "yarn run webpack --config webpack.config.js --progress", + "webpacker:watch": "yarn run webpack --config webpack.config.js --progress --watch", + "bundle:watch": "yarn run linter && yarn run webpacker:watch", + "bundle:dev": "yarn run linter && yarn run webpacker", + "bundle": "cross-env NODE_ENV=production yarn run bundle:dev", + "test:karma-once": "yarn run linter && yarn run karma start --single-run", + "test:karma": "yarn run linter && yarn run karma start", + "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", "pep8": "pycodestyle --config=.pycodestyle ." } }