Merge branch 'master' into develop

dwarvesf · Aug 6, 2024 · 7952961 · 7952961
2 parents 53d55c1 + da1ed4f
commit 7952961
Show file tree

Hide file tree

Showing 19 changed files with 3,356 additions and 2,138 deletions.
diff --git a/.env.development b/.env.development
@@ -1,2 +1,3 @@
-BASE_URL='https://develop-api.fortress.d.foundation/api/v1'
+# BASE_URL='https://develop-api.fortress.d.foundation/api/v1'
+BASE_URL='https://api.fortress.d.foundation/api/v1'
 GOOGLE_CLIENT_ID='180094408893-s17eot91hbmqa5lp6gsgjglan9et20sp.apps.googleusercontent.com'
diff --git a/.env.production b/.env.production
@@ -0,0 +1,2 @@
+BASE_URL='https://api.fortress.d.foundation/api/v1'
+GOOGLE_CLIENT_ID='180094408893-s17eot91hbmqa5lp6gsgjglan9et20sp.apps.googleusercontent.com'
diff --git a/.github/workflows/deploy-development.yml b/.github/workflows/deploy-development.yml
@@ -35,7 +35,7 @@ jobs:
           key: ${{ runner.os }}-modules-${{ hashFiles('**/pnpm-lock.yaml') }}
 
       - name: Install dependencies
-        run: pnpm i
+        run: pnpm i --shamefully-hoist
 
       # Build & deploy the app
       - name: Build & Deploy

diff --git a/.github/workflows/deploy-preview.yml b/.github/workflows/deploy-preview.yml
@@ -45,7 +45,7 @@ jobs:
           ref: ${{ github.head_ref }}
 
       - name: Install dependencies
-        run: pnpm i
+        run: pnpm i --shamefully-hoist
 
       # Build & deploy the app
       - name: Build & Deploy

diff --git a/.github/workflows/deploy-production.yml b/.github/workflows/deploy-production.yml
@@ -35,7 +35,7 @@ jobs:
           key: ${{ runner.os }}-modules-${{ hashFiles('**/pnpm-lock.yaml') }}
 
       - name: Install dependencies
-        run: pnpm i
+        run: pnpm i --shamefully-hoist
 
       # Build & deploy the app
       - name: Build & Deploy

diff --git a/.gitignore b/.gitignore
@@ -21,6 +21,7 @@
 # misc
 .DS_Store
 .env.local
+.env.production
 
 # debug
 npm-debug.log*

diff --git a/.npmrc b/.npmrc
@@ -0,0 +1 @@
+public-hoist-pattern[]=*
diff --git a/package.json b/package.json
@@ -46,7 +46,7 @@
     "@commitlint/cli": "^17.0.3",
     "@commitlint/config-conventional": "^17.0.3",
     "@dwarvesf/react-eslint-config": "^0.1.3",
-    "@netlify/plugin-nextjs": "^4.28.4",
+    "@netlify/plugin-nextjs": "^4.41.3",
     "@prettier/plugin-xml": "^2.2.0",
     "@storybook/addon-essentials": "6.4.19",
     "@storybook/addon-postcss": "^2.0.0",
@@ -86,7 +86,7 @@
     "jest-dom": "^4.0.0",
     "jest-environment-jsdom": "^29.1.2",
     "lint-staged": "^13.0.3",
-    "netlify-cli": "^12.0.11",
+    "netlify-cli": "^17.21.1",
     "next-plugin-antd-less": "^1.8.0",
     "prettier": "^2.7.1",
     "rimraf": "^3.0.2",
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		BASE_URL='https://api.fortress.d.foundation/api/v1'
		GOOGLE_CLIENT_ID='180094408893-s17eot91hbmqa5lp6gsgjglan9et20sp.apps.googleusercontent.com'