update: upgraded yarn and packages

bn-digital · Jan 29, 2022 · c950841 · c950841
1 parent ade1321
commit c950841
Show file tree

Hide file tree

Showing 8 changed files with 723 additions and 813 deletions.
diff --git a/images/build/Dockerfile b/images/build/Dockerfile
@@ -50,7 +50,6 @@ RUN apt-get update --fix-missing \
  && rm -rf /var/lib/apt/lists/* /etc/apt/sources.list.d/* /requirements.apt \
  && yarn global add \
       @bn-digital/vault-env \
-      @sentry/cli \
       eslint \
       less \
       npm \
@@ -59,19 +58,12 @@ RUN apt-get update --fix-missing \
       stylelint \
       typescript
 ENV YARN_GLOBAL_FOLDER=/usr/local/yarn
+VOLUME ["/usr/local/yarn"]
 COPY --from=yarn --chown=runner /usr/local/yarn /usr/local/yarn
-COPY --from=yarn --chown=runner /usr/local/src /usr/local/src
+COPY --from=yarn --chown=runner /usr/local/src/.yarn /usr/local/src/.yarn
+COPY --from=yarn --chown=runner /usr/local/src/.yarnrc.yml /usr/local/src/.yarnrc.yml
 USER runner
-ONBUILD USER root
 WORKDIR /runner
+ONBUILD USER root
 ONBUILD WORKDIR /usr/local/src
 ONBUILD COPY ./package.json .
-ONBUILD RUN yarn set version berry \
-         && yarn config set enableGlobalCache true \
-         && yarn config set globalFolder /usr/local/yarn \
-         && yarn config set nodeLinker node-modules \
-         && yarn config set enableTelemetry false \
-         && yarn config set preferAggregateCacheInfo false \
-         && yarn plugin import workspace-tools \
-         && yarn plugin import version
-VOLUME ["/usr/local/yarn"]
diff --git a/images/build/app/.yarnrc.yml b/images/build/app/.yarnrc.yml
@@ -2,6 +2,7 @@ enableGlobalCache: true
 enableTelemetry: false
 nodeLinker: node-modules
 preferAggregateCacheInfo: true
+nmHoistingLimits: workspaces
 logFilters:
   - code: YN0002
     level: discard

diff --git a/images/build/app/package.json b/images/build/app/package.json
@@ -3,40 +3,40 @@
   "description": "Includes NodeJS libraries and packages used in BN Digital projects as part of CI Yarn caching layer",
   "version": "1.4.0",
   "dependencies": {
-    "@ant-design/charts": "^1.3.4",
+    "@ant-design/charts": "^1.3.5",
     "@ant-design/icons": "^4.7.0",
-    "@apollo/client": "^3.5.7",
+    "@apollo/client": "^3.5.8",
     "@bn-digital/antd": "^1.1.2",
-    "@bn-digital/commitlint-config": "^1.2.2",
-    "@bn-digital/eslint-config": "^1.18.6",
-    "@bn-digital/graphql-client": "^1.1.21",
-    "@bn-digital/graphql-config": "^1.0.5",
+    "@bn-digital/commitlint-config": "^1.1.1",
+    "@bn-digital/eslint-config": "^1.19.0",
+    "@bn-digital/graphql-client": "^1.1.22",
+    "@bn-digital/graphql-config": "^1.0.6",
     "@bn-digital/postcss-config": "^1.0.5",
     "@bn-digital/prettier-config": "^1.13.2",
-    "@bn-digital/react": "^1.1.4",
-    "@bn-digital/react-i18n": "^1.0.0",
-    "@bn-digital/sdk": "^1.1.7",
+    "@bn-digital/react": "^1.2.0",
+    "@bn-digital/react-i18n": "^1.0.1",
+    "@bn-digital/sdk": "^1.2.2",
     "@bn-digital/stylelint-config": "^1.13.5",
     "@bn-digital/vault-env": "^1.4.0",
-    "@bn-digital/vite": "^1.4.5",
+    "@bn-digital/vite": "^1.5.5",
     "@bn-digital/webpack": "^1.19.0",
     "@gravitybv/strapi-plugin-permissions": "^1.0.2",
-    "@strapi/plugin-content-manager": "^4.0.5",
-    "@strapi/plugin-content-type-builder": "^4.0.5",
-    "@strapi/plugin-email": "^4.0.5",
-    "@strapi/plugin-graphql": "^4.0.5",
-    "@strapi/plugin-i18n": "^4.0.5",
-    "@strapi/plugin-sentry": "^4.0.5",
-    "@strapi/plugin-upload": "^4.0.5",
-    "@strapi/plugin-users-permissions": "^4.0.5",
-    "@strapi/provider-email-nodemailer": "^4.0.5",
-    "@strapi/provider-upload-aws-s3": "^4.0.5",
-    "@strapi/strapi": "^4.0.5",
+    "@strapi/plugin-content-manager": "^4.0.6",
+    "@strapi/plugin-content-type-builder": "^4.0.6",
+    "@strapi/plugin-email": "^4.0.6",
+    "@strapi/plugin-graphql": "^4.0.6",
+    "@strapi/plugin-i18n": "^4.0.6",
+    "@strapi/plugin-sentry": "^4.0.6",
+    "@strapi/plugin-upload": "^4.0.6",
+    "@strapi/plugin-users-permissions": "^4.0.6",
+    "@strapi/provider-email-nodemailer": "^4.0.6",
+    "@strapi/provider-upload-aws-s3": "^4.0.6",
+    "@strapi/strapi": "^4.0.6",
     "antd": "^4.18.5",
-    "commander": "^8.3.0",
+    "commander": "^9.0.0",
     "core-js": "^3.20.3",
-    "esbuild": "^0.14.13",
-    "graphql": "^16.2.0",
+    "esbuild": "^0.14.14",
+    "graphql": "^16.3.0",
     "gsap": "^3.9.1",
     "history": "^5.2.0",
     "knex": "^1.0.1",
@@ -49,7 +49,7 @@
     "react-gtm-module": "^2.0.11",
     "react-helmet": "^6.1.0",
     "react-helmet-async": "^1.2.2",
-    "react-intl": "^5.24.3",
+    "react-intl": "^5.24.4",
     "react-markdown": "^8.0.0",
     "react-responsive": "^9.0.0-beta.6",
     "react-router": "^6.2.1",
@@ -63,7 +63,7 @@
     "strapi-admin": "^3.6.8",
     "strapi-connector-bookshelf": "^3.6.8",
     "strapi-middleware-cache": "^2.1.7",
-    "strapi-plugin-config-sync": "^1.0.0-beta.5",
+    "strapi-plugin-config-sync": "^1.0.0-beta.8",
     "strapi-plugin-content-manager": "^3.6.8",
     "strapi-plugin-content-type-builder": "^3.6.8",
     "strapi-plugin-email": "^3.6.8",
@@ -81,7 +81,6 @@
     "strapi-provider-email-sendmail": "^3.6.8",
     "strapi-provider-upload-aws-s3": "^3.6.8",
     "strapi-utils": "^3.6.8",
-    "tailwindcss": "^3.0.15",
     "webpack": "^5.67.0"
   },
   "devDependencies": {
@@ -92,7 +91,7 @@
     "@types/react-helmet": "^6.1.5",
     "@types/react-router-hash-link": "^2.4.5",
     "cross-env": "^7.0.3",
-    "dotenv": "^14.2.0",
+    "dotenv": "^14.3.2",
     "node-gyp": "^8.4.1",
     "nodemon": "^2.0.15",
     "ts-node": "^10.4.0",