From bf6251650171d5246d85af62940257ccb48f6d76 Mon Sep 17 00:00:00 2001 From: Bart <45095973+barthuijgen@users.noreply.github.com> Date: Sat, 13 Mar 2021 01:27:31 +0100 Subject: [PATCH] Use nextjs generated package json instead of keeping self managed list --- apps/blueprints/next.config.js | 3 +++ apps/blueprints/prod.package.json | 33 ------------------------------- blueprints.Dockerfile | 2 +- 3 files changed, 4 insertions(+), 34 deletions(-) delete mode 100644 apps/blueprints/prod.package.json diff --git a/apps/blueprints/next.config.js b/apps/blueprints/next.config.js index db62d70..4d4f998 100644 --- a/apps/blueprints/next.config.js +++ b/apps/blueprints/next.config.js @@ -1,5 +1,8 @@ /* eslint-disable @typescript-eslint/no-var-requires */ +// To be included in dependencies, chakra-ui depends on it but has it as peer dependency +require("framer-motion"); + module.exports = { poweredByHeader: false, reactStrictMode: true, diff --git a/apps/blueprints/prod.package.json b/apps/blueprints/prod.package.json deleted file mode 100644 index b17cc35..0000000 --- a/apps/blueprints/prod.package.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "dependencies": { - "@chakra-ui/react": "1.3.3", - "@emotion/react": "11.1.5", - "@emotion/server": "11.0.0", - "@emotion/styled": "11.1.5", - "@fbe/editor": "file:.yalc/@fbe/editor", - "@google-cloud/pubsub": "2.9.0", - "@google-cloud/secret-manager": "3.4.0", - "@google-cloud/storage": "5.7.4", - "@hookstate/core": "3.0.5", - "@prisma/client": "2.18.0", - "bbcode-to-react": "0.2.9", - "bcrypt": "5.0.0", - "cookie": "0.4.1", - "document-register-element": "1.14.10", - "formik": "2.2.6", - "framer-motion": "3.3.0", - "next": "10.0.7", - "nprogress": "0.2.0", - "openid": "2.0.7", - "pako": "1.0.11", - "pg": "8.5.1", - "phin": "3.5.1", - "react": "17.0.1", - "react-dom": "17.0.1", - "react-icons": "4.2.0", - "react-map-interaction": "2.0.0", - "react-markdown": "5.0.3", - "react-multi-select-component": "3.1.3", - "fork-ts-checker-webpack-plugin": "6.1.1" - } -} diff --git a/blueprints.Dockerfile b/blueprints.Dockerfile index d8a2572..27595d9 100644 --- a/blueprints.Dockerfile +++ b/blueprints.Dockerfile @@ -22,7 +22,7 @@ RUN apt-get -qy update && apt-get -qy install openssl WORKDIR /usr/src/app -COPY apps/blueprints/prod.package.json ./package.json +COPY --from=builder /usr/src/app/dist/apps/blueprints/package.json ./package.json COPY yarn.lock . COPY yalc.lock . COPY .yalc ./.yalc/