fix: dependency updates (#268)

.gitattributes

@@ -0,0 +1,2 @@
+/.yarn/releases/** binary
+/.yarn/plugins/** binary

.github/actions/detect-env/action.yml

@@ -6,6 +6,3 @@ runs:
     - name: Determine Node Version
       run: echo NODE_VERSION=$(cat .nvmrc | tr -d '\n') >> $GITHUB_ENV
       shell: bash
-    - name: Determine Yarn Version
-      run: echo YARN_VERSION=$(cat .yvmrc | tr -d '\n') >> $GITHUB_ENV
-      shell: bash

.github/workflows/cicd.yml

@@ -7,6 +7,9 @@ on:
   pull_request:
   workflow_dispatch:
 
+env:
+  CI: 1
+
 jobs:
   client:
     if: "!contains(github.event.head_commit.message, 'skip ci')"
@@ -23,7 +26,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ./client/node_modules
-          key: ${{ env.NODE_VERSION }}-${{ env.YARN_VERSION }}-${{ hashFiles('./client/yarn.lock') }}
+          key: ${{ env.NODE_VERSION }}-${{ hashFiles('./client/yarn.lock') }}
       - name: lint client
         uses: ./.github/actions/lint
         with:
@@ -60,7 +63,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ./service/node_modules
-          key: ${{ env.NODE_VERSION }}-${{ env.YARN_VERSION }}-${{ hashFiles('./service/yarn.lock') }}
+          key: ${{ env.NODE_VERSION }}-${{ hashFiles('./service/yarn.lock') }}
       - name: lint service
         uses: ./.github/actions/lint
         with:
@@ -107,7 +110,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ./node_modules
-          key: ${{ env.NODE_VERSION }}-${{ env.YARN_VERSION }}-${{ hashFiles('yarn.lock') }}
+          key: ${{ env.NODE_VERSION }}-${{ hashFiles('yarn.lock') }}
       - name: install dependencies
         run: make install
       - name: package artifacts
@@ -147,7 +150,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ./node_modules
-          key: ${{ env.NODE_VERSION }}-${{ env.YARN_VERSION }}-${{ hashFiles('yarn.lock') }}
+          key: ${{ env.NODE_VERSION }}-${{ hashFiles('yarn.lock') }}
       - name: install dependencies
         run: make install
       - name: package artifacts
@@ -196,7 +199,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ./website/node_modules
-          key: ${{ env.NODE_VERSION }}-${{ env.YARN_VERSION }}-${{ hashFiles('./website/yarn.lock') }}
+          key: ${{ env.NODE_VERSION }}-${{ hashFiles('./website/yarn.lock') }}
       - name: Install dependencies
         if: steps.node-modules-cache.outputs.cache-hit != 'true'
         run: yarn install --frozen-lockfile

.gitignore

@@ -1,8 +1,12 @@
+# IDE
 .idea/
+
+# OS
+.DS_Store
+
 .serverless/
 artifacts/
 node_modules/
-.DS_Store
 yarn-error.log
 npm-debug.log
 dist/
@@ -13,13 +17,22 @@ example/repo/output/
 # client
 client/bin
 
+# service
+.cache
+
 serverless_chromium.zip
 headless-chromium
 release-archive
 
 .terraform/
 .terraform.lock.hcl
 
-.yarn/
+.yarn/*
+!.yarn/patches
+!.yarn/releases
+!.yarn/plugins
+!.yarn/versions
+!.yarn/sdks
+.pnp.*
 
 output

.nvmrc

@@ -1 +1 @@
-v14.17.6
+v14.19.0

.yarnrc.yml

@@ -1,3 +1,3 @@
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-berry.cjs
+yarnPath: .yarn/releases/yarn-3.2.0.cjs

client/Makefile

@@ -13,22 +13,22 @@ else
 endif
 
 ESLINT_ARGS=--max-warnings 0 $(ESLINT_EXTRA_ARGS)
-NODE_MODULES_BIN := ./node_modules/.bin
-ESLINT := $(NODE_MODULES_BIN)/eslint $(ESLINT_ARGS)
-PKG := $(NODE_MODULES_BIN)/pkg
 
 .PHONY: install
 install: check-versions
 	yarn install
 
 .PHONY: build-docker
 build-docker:
+ifndef CI
+	@make package
+endif
 	@echo "Building Docker Container"
 	docker build . -t ghcr.io/tophat/sanity-runner-client
 
 .PHONY: package
 package:
-	$(PKG) . --out-path bin/
+	yarn pkg . --out-path bin/
 
 # ----- Helpers -----
 .PHONY: check-versions
@@ -42,11 +42,11 @@ clean:
 
 .PHONY: lint
 lint:
-	$(ESLINT) .
+	yarn eslint $(ESLINT_ARGS) .
 
 .PHONY: lint-fix
 lint-fix:
-	$(ESLINT) --fix .
+	yarn eslint $(ESLINT_ARGS) --fix .
 
 PHONY: publish-docker
 publish-docker: