From 0525a3d42006ccd64ae727dcd6521bff3dea26ec Mon Sep 17 00:00:00 2001 From: jessepinkman9900 Date: Mon, 15 Apr 2024 01:33:30 -0500 Subject: [PATCH 1/6] add: idea --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 45e35b7cbf..09fcb9e861 100644 --- a/.gitignore +++ b/.gitignore @@ -52,4 +52,5 @@ yarn-error.log* /playwright/.browser/ /playwright/envs.js -**.dec** \ No newline at end of file +**.dec** +.idea From 9114350b8fc763d7b5e8d4359b5e65e2640926a0 Mon Sep 17 00:00:00 2001 From: jessepinkman9900 Date: Mon, 15 Apr 2024 19:26:23 -0500 Subject: [PATCH 2/6] set: engine node 20.x --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7eb0abc236..40c8c8720e 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "private": false, "homepage": "https://github.com/blockscout/frontend#readme", "engines": { - "node": "20.11.0", + "node": "20.x", "npm": "10.2.4" }, "scripts": { From 2cd3e4962612a028fd9aaee48bf0a4d4c33d1f0a Mon Sep 17 00:00:00 2001 From: jessepinkman9900 Date: Mon, 15 Apr 2024 21:40:36 -0500 Subject: [PATCH 3/6] Revert "set: engine node 20.x" This reverts commit 9114350b8fc763d7b5e8d4359b5e65e2640926a0. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 40c8c8720e..7eb0abc236 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "private": false, "homepage": "https://github.com/blockscout/frontend#readme", "engines": { - "node": "20.x", + "node": "20.11.0", "npm": "10.2.4" }, "scripts": { From c078daad6114ba92c4028f86ad6f3238f6a7b0f3 Mon Sep 17 00:00:00 2001 From: jessepinkman9900 Date: Mon, 15 Apr 2024 21:40:48 -0500 Subject: [PATCH 4/6] set: engine node 20.x --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7eb0abc236..40c8c8720e 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "private": false, "homepage": "https://github.com/blockscout/frontend#readme", "engines": { - "node": "20.11.0", + "node": "20.x", "npm": "10.2.4" }, "scripts": { From 1affc822a11b23bcff3cf41c877eec4598e291ee Mon Sep 17 00:00:00 2001 From: jessepinkman9900 Date: Wed, 17 Apr 2024 00:48:01 -0500 Subject: [PATCH 5/6] add: build fix --- package.json | 2 +- tools/scripts/build-fix.sh | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 tools/scripts/build-fix.sh diff --git a/package.json b/package.json index 40c8c8720e..a2f3575271 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "scripts": { "dev": "./tools/scripts/dev.sh", "dev:preset": "./tools/scripts/dev.preset.sh", - "build": "next build", + "build": "./tools/scripts/build-fix.sh", "build:docker": "docker build --build-arg GIT_COMMIT_SHA=$(git rev-parse --short HEAD) --build-arg GIT_TAG=$(git describe --tags --abbrev=0) -t blockscout-frontend:local ./", "start": "next start", "start:docker:local": "docker run -p 3000:3000 --env-file .env.local blockscout-frontend:local", diff --git a/tools/scripts/build-fix.sh b/tools/scripts/build-fix.sh new file mode 100644 index 0000000000..e624c2ea34 --- /dev/null +++ b/tools/scripts/build-fix.sh @@ -0,0 +1,24 @@ +#!/bin/bash + +# download assets for the running instance +dotenv \ + -e .env.development.local \ + -e .env.local \ + -e .env.development \ + -e .env \ + -- bash -c './deploy/scripts/download_assets.sh ./public/assets' + +yarn svg:build-sprite +echo "" + +# generate envs.js file and run the app +dotenv \ + -v NEXT_PUBLIC_GIT_COMMIT_SHA=1b10d15f \ + -v NEXT_PUBLIC_GIT_TAG=v1.25.0-alpha.2 \ + -e .env.secrets \ + -e .env.development.local \ + -e .env.local \ + -e .env.development \ + -e .env \ + -- bash -c './deploy/scripts/make_envs_script.sh && next build' | +pino-pretty From 3a81bd636d15c5540f0c23f08b22e6c9c1e3568f Mon Sep 17 00:00:00 2001 From: jessepinkman9900 Date: Wed, 17 Apr 2024 00:49:55 -0500 Subject: [PATCH 6/6] fix: file perm --- tools/scripts/build-fix.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 tools/scripts/build-fix.sh diff --git a/tools/scripts/build-fix.sh b/tools/scripts/build-fix.sh old mode 100644 new mode 100755