From 6e2afe1c789d238a829ec80dd77e2bb50f048ce9 Mon Sep 17 00:00:00 2001 From: Prashant Shahi Date: Fri, 20 May 2022 19:14:58 +0530 Subject: [PATCH] =?UTF-8?q?fix(husky):=20=F0=9F=9A=A8=20integrate=20is-ci?= =?UTF-8?q?=20and=20webpack-cli=20version=20bump=20(#1181)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(husky): 🚨 integrate is-ci and webpack-cli version bump Signed-off-by: Prashant Shahi * chore(frontend-Dockerfile): 🚀 remove NODE_ENV Signed-off-by: Prashant Shahi --- frontend/Dockerfile | 12 ++++-------- frontend/package.json | 5 +++-- frontend/yarn.lock | 15 +++++++++++---- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/frontend/Dockerfile b/frontend/Dockerfile index c033d07bf6..d7fff6c0bb 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -1,4 +1,4 @@ -# stage1 as builder +# Builder stage FROM node:16.15.0-slim as builder # Add Maintainer Info @@ -9,12 +9,9 @@ ARG TARGETARCH WORKDIR /frontend -# copy the package.json to install dependencies +# Copy the package.json to install dependencies COPY package.json ./ -# configure node_env as production -ENV NODE_ENV=production - # Install the dependencies and make the folder RUN CI=1 yarn install @@ -23,13 +20,12 @@ COPY . . # Build the project and copy the files RUN yarn build -FROM nginx:1.18-alpine -#!/bin/sh +FROM nginx:1.18-alpine COPY conf/default.conf /etc/nginx/conf.d/default.conf -## Remove default nginx index page +# Remove default nginx index page RUN rm -rf /usr/share/nginx/html/* # Copy from the stahg 1 diff --git a/frontend/package.json b/frontend/package.json index d9c40da415..6235eebecd 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -12,7 +12,7 @@ "jest": "jest", "jest:coverage": "jest --coverage", "jest:watch": "jest --watch", - "postinstall": "yarn husky:configure", + "postinstall": "is-ci || yarn husky:configure", "playwright": "playwright test --config=./playwright.config.ts", "playwright:local:debug": "PWDEBUG=console yarn playwright --headed --browser=chromium", "husky:configure": "cd .. && husky install frontend/.husky && cd frontend && chmod ug+x .husky/*", @@ -157,6 +157,7 @@ "eslint-plugin-simple-import-sort": "^7.0.0", "eslint-plugin-sonarjs": "^0.12.0", "husky": "^7.0.4", + "is-ci": "^3.0.1", "jest-playwright-preset": "^1.7.0", "less-plugin-npm-import": "^2.1.0", "lint-staged": "^12.3.7", @@ -167,7 +168,7 @@ "ts-node": "^10.2.1", "typescript-plugin-css-modules": "^3.4.0", "webpack-bundle-analyzer": "^4.5.0", - "webpack-cli": "^4.5.0" + "webpack-cli": "^4.9.2" }, "lint-staged": { "*.(js|jsx|ts|tsx)": [ diff --git a/frontend/yarn.lock b/frontend/yarn.lock index fb60bfe256..08b0946818 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -5416,7 +5416,7 @@ debug@^3.1.1, debug@^3.2.6, debug@^3.2.7: dependencies: ms "^2.1.1" -"debug@github:ngokevin/debug#noTimestamp": +debug@ngokevin/debug#noTimestamp: version "2.2.0" resolved "https://codeload.github.com/ngokevin/debug/tar.gz/ef5f8e66d49ce8bc64c6f282c15f8b7164409e3a" @@ -5623,7 +5623,7 @@ doctrine@^3.0.0: dependencies: esutils "^2.0.2" -"document-register-element@github:dmarcos/document-register-element#8ccc532b7f3744be954574caf3072a5fd260ca90": +document-register-element@dmarcos/document-register-element#8ccc532b7f3744be954574caf3072a5fd260ca90: version "0.5.4" resolved "https://codeload.github.com/dmarcos/document-register-element/tar.gz/8ccc532b7f3744be954574caf3072a5fd260ca90" @@ -7397,6 +7397,13 @@ is-ci@^2.0.0: dependencies: ci-info "^2.0.0" +is-ci@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz#db6ecbed1bd659c43dac0f45661e7674103d1867" + integrity sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ== + dependencies: + ci-info "^3.2.0" + is-core-module@^2.2.0, is-core-module@^2.5.0, is-core-module@^2.8.1: version "2.9.0" resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.9.0.tgz#e1c34429cd51c6dd9e09e0799e396e27b19a9c69" @@ -12346,7 +12353,7 @@ text-table@^0.2.0: resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= -"three-bmfont-text@github:dmarcos/three-bmfont-text#21d017046216e318362c48abd1a48bddfb6e0733": +three-bmfont-text@dmarcos/three-bmfont-text#21d017046216e318362c48abd1a48bddfb6e0733: version "2.4.0" resolved "https://codeload.github.com/dmarcos/three-bmfont-text/tar.gz/21d017046216e318362c48abd1a48bddfb6e0733" dependencies: @@ -13003,7 +13010,7 @@ webpack-bundle-analyzer@^4.5.0: sirv "^1.0.7" ws "^7.3.1" -webpack-cli@^4.5.0: +webpack-cli@^4.9.2: version "4.9.2" resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.9.2.tgz#77c1adaea020c3f9e2db8aad8ea78d235c83659d" integrity sha512-m3/AACnBBzK/kMTcxWHcZFPrw/eQuY4Df1TxvIWfWM2x7mRqBQCqKEd96oCUa9jkapLBaFfRce33eGDb4Pr7YQ==