Remove yarn workspaces

oddgrd · Dec 18, 2021 · 290472b · 290472b
1 parent 0fd5843
commit 290472b
Show file tree

Hide file tree

Showing 9 changed files with 4,847 additions and 1,850 deletions.
diff --git a/.github/workflows/deployAPI.yaml b/.github/workflows/deployAPI.yaml
@@ -44,6 +44,7 @@ jobs:
         with:
           node-version: '14'
           cache: 'yarn'
+          cache-dependency-path: ./server/yarn.lock
 
       - name: Install dependencies
         run: yarn

diff --git a/.github/workflows/deployClient.yaml b/.github/workflows/deployClient.yaml
@@ -31,6 +31,7 @@ jobs:
         with:
           node-version: '14'
           cache: 'yarn'
+          cache-dependency-path: ./client/yarn.lock
 
       - name: Install dependencies
         run: yarn

diff --git a/.gitignore b/.gitignore
diff --git a/client/package.json b/client/package.json
@@ -11,8 +11,6 @@
     "test": "jest"
   },
   "dependencies": {
-    "cross-env": "5.0.5",
-    "server": "1.0.0",
     "@apollo/client": "^3.4.8",
     "@testing-library/react": "^12.1.2",
     "apollo-upload-client": "^16.0.0",

diff --git a/yarn.lock → client/yarn.lock b/yarn.lock → client/yarn.lock
diff --git a/package.json b/package.json
diff --git a/server/Dockerfile b/server/Dockerfile
@@ -3,7 +3,9 @@ FROM node:14
 # Create app directory
 WORKDIR /usr/src/app
 
+# Ensure package.json AND yarn-lock.json are copied
 COPY package.json ./
+COPY yarn.lock ./
 
 # Install dependencies on first build/when dependencies
 # change

diff --git a/server/package.json b/server/package.json
@@ -15,8 +15,6 @@
     "gen-env": "npx gen-env-types .env -o src/env.d.ts -e ."
   },
   "devDependencies": {
-    "cross-env": "5.0.5",
-    "@types/connect-redis": "^0.0.17",
     "@types/express": "^4.17.13",
     "@types/express-session": "^1.17.4",
     "@types/faker": "^5.5.8",

diff --git a/server/yarn.lock b/server/yarn.lock