Fix merge conflicts of main to staging

dgidb · Oct 9, 2023 · 0a8a1a2 · 0a8a1a2
2 parents 8b0aa4b + e95623a
commit 0a8a1a2
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 17 deletions.
diff --git a/.github/workflows/build_client.yml b/.github/workflows/build_client.yml
@@ -30,7 +30,7 @@ jobs:
       - run: rm -rf public/*
         working-directory: ./server
 
-      - run: CI=false yarn build:${{ inputs.branch }}
+      - run: CI=false yarn build:${{ inputs.branch == 'main' && 'prod' || inputs.branch }}
         working-directory: ./client
 
       - run: cp -r ../../client/build/* .

diff --git a/client/yarn.lock b/client/yarn.lock
@@ -4391,15 +4391,10 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001181:
-  version "1.0.30001191"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001191.tgz#bacb432b6701f690c8c5f7c680166b9a9f0843d9"
-  integrity sha512-xJJqzyd+7GCJXkcoBiQ1GuxEiOBCLQ0aVW9HMekifZsAVGdj5eJ4mFB9fEhSHipq9IOk/QXFJUiIr9lZT+EsGw==
-
-caniuse-lite@^1.0.30001317:
-  version "1.0.30001323"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001323.tgz#a451ff80dec7033016843f532efda18f02eec011"
-  integrity sha512-e4BF2RlCVELKx8+RmklSEIVub1TWrmdhvA5kEUueummz1XyySW0DVk+3x9HyhU9MuWTa2BhqLgEuEmUwASAdCA==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001181, caniuse-lite@^1.0.30001317:
+  version "1.0.30001546"
+  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001546.tgz"
+  integrity sha512-zvtSJwuQFpewSyRrI3AsftF6rM0X80mZkChIt1spBGEvRglCrjTniXvinc8JKRoqTwXAgvqTImaN9igfSMtUBw==
 
 case-sensitive-paths-webpack-plugin@^2.4.0:
   version "2.4.0"

diff --git a/server/public/asset-manifest.json b/server/public/asset-manifest.json
@@ -1,7 +1,7 @@
 {
   "files": {
     "main.css": "/static/css/main.ca1b09b5.css",
-    "main.js": "/static/js/main.a0fc9e63.js",
+    "main.js": "/static/js/main.c35a66d2.js",
     "static/js/461.86214142.chunk.js": "/static/js/461.86214142.chunk.js",
     "static/js/80.a852d8b5.chunk.js": "/static/js/80.a852d8b5.chunk.js",
     "static/js/990.d59bee53.chunk.js": "/static/js/990.d59bee53.chunk.js",
@@ -28,7 +28,7 @@
     "static/js/925.a41f4405.chunk.js": "/static/js/925.a41f4405.chunk.js",
     "index.html": "/index.html",
     "main.ca1b09b5.css.map": "/static/css/main.ca1b09b5.css.map",
-    "main.a0fc9e63.js.map": "/static/js/main.a0fc9e63.js.map",
+    "main.c35a66d2.js.map": "/static/js/main.c35a66d2.js.map",
     "461.86214142.chunk.js.map": "/static/js/461.86214142.chunk.js.map",
     "80.a852d8b5.chunk.js.map": "/static/js/80.a852d8b5.chunk.js.map",
     "990.d59bee53.chunk.js.map": "/static/js/990.d59bee53.chunk.js.map",
@@ -56,6 +56,6 @@
   },
   "entrypoints": [
     "static/css/main.ca1b09b5.css",
-    "static/js/main.a0fc9e63.js"
+    "static/js/main.c35a66d2.js"
   ]
 }
diff --git a/server/public/index.html b/server/public/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.png"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="DGIdb, The Drug Gene Interaction Database, is a research resource that can be used to search candidate genes or drugs against the known and potentially druggable genome."/><link rel="preconnect" href="https://fonts.googleapis.com"><link rel="preconnect" href="https://fonts.gstatic.com" crossorigin><link href="https://fonts.googleapis.com/css2?family=Fira+Sans:wght@300;350;400;500;700;800&display=swap" rel="stylesheet"><link href="https://fonts.googleapis.com/css2?family=Lato:wght@100;300;350;400;700&display=swap" rel="stylesheet"><link href="https://fonts.googleapis.com/css2?family=Work+Sans:wght@200;300;350;400;500;600&display=swap" rel="stylesheet"><link rel="apple-touch-icon" href="/dgidb-icon_48.png"/><link rel="manifest" href="/manifest.json"/><title>DGIdb</title><script defer="defer" src="/static/js/main.a0fc9e63.js"></script><link href="/static/css/main.ca1b09b5.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.png"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="DGIdb, The Drug Gene Interaction Database, is a research resource that can be used to search candidate genes or drugs against the known and potentially druggable genome."/><link rel="preconnect" href="https://fonts.googleapis.com"><link rel="preconnect" href="https://fonts.gstatic.com" crossorigin><link href="https://fonts.googleapis.com/css2?family=Fira+Sans:wght@300;350;400;500;700;800&display=swap" rel="stylesheet"><link href="https://fonts.googleapis.com/css2?family=Lato:wght@100;300;350;400;700&display=swap" rel="stylesheet"><link href="https://fonts.googleapis.com/css2?family=Work+Sans:wght@200;300;350;400;500;600&display=swap" rel="stylesheet"><link rel="apple-touch-icon" href="/dgidb-icon_48.png"/><link rel="manifest" href="/manifest.json"/><title>DGIdb</title><script defer="defer" src="/static/js/main.c35a66d2.js"></script><link href="/static/css/main.ca1b09b5.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
diff --git a/server/public/static/js/main.a0fc9e63.js → server/public/static/js/main.c35a66d2.js b/server/public/static/js/main.a0fc9e63.js → server/public/static/js/main.c35a66d2.js
diff --git a/...ic/static/js/main.a0fc9e63.js.LICENSE.txt → ...ic/static/js/main.c35a66d2.js.LICENSE.txt b/...ic/static/js/main.a0fc9e63.js.LICENSE.txt → ...ic/static/js/main.c35a66d2.js.LICENSE.txt
diff --git a/server/public/static/js/main.c35a66d2.js.map b/server/public/static/js/main.c35a66d2.js.map