chore: fix config

reearth · May 27, 2021 · 7a6ed38 · 7a6ed38
1 parent f2e947d
commit 7a6ed38
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,4 @@ node_modules
 __screenshots__
 /cypress/videos
 /cypress/screenshots
+/.env.local
diff --git a/src/gql/provider.tsx b/src/gql/provider.tsx
@@ -9,6 +9,9 @@ import { store, localSlice } from "@reearth/state";
 import fragmentMatcher from "./fragmentMatcher.json";
 
 const Provider: React.FC = ({ children }) => {
+  const endpoint = window.REEARTH_CONFIG?.api
+    ? `${window.REEARTH_CONFIG.api}/graphql`
+    : "/api/graphql";
   const { getAccessTokenSilently } = useAuth0();
 
   const authLink = setContext(async (_, { headers }) => {
@@ -24,7 +27,7 @@ const Provider: React.FC = ({ children }) => {
   });
 
   const uploadLink = createUploadLink({
-    uri: window.REEARTH_CONFIG?.api,
+    uri: endpoint,
   });
 
   const errorLink = onError(({ graphQLErrors, networkError }) => {
@@ -47,7 +50,7 @@ const Provider: React.FC = ({ children }) => {
   });
 
   const client = new ApolloClient({
-    uri: window.REEARTH_CONFIG?.api ? `${window.REEARTH_CONFIG.api}/graphql` : "/api/graphql",
+    uri: endpoint,
     link: ApolloLink.from([errorLink, authLink, uploadLink]),
     cache,
     connectToDevTools: process.env.NODE_ENV === "development",

diff --git a/webpack.config.js b/webpack.config.js
@@ -15,10 +15,15 @@ const { readEnv } = require("read-env");
 
 module.exports = (env, args = {}) => {
   const isProd = args.mode === "production";
-  const envName = Object.keys(env).find(e => !e.startsWith("WEBPACK_"));
+  let envfile = "";
+  try {
+    envfile = fs.readFileSync(`.env.local`);
+  } catch {
+    // ignore
+  }
   const config = readEnv("REEARTH_WEB", {
     source: {
-      ...dotenv.parse(fs.readFileSync(`.env${envName ? `.${envName}` : ""}`)),
+      ...dotenv.parse(envfile),
       ...process.env,
     },
   });
@@ -43,7 +48,7 @@ module.exports = (env, args = {}) => {
           res.json({
             api: "http://localhost:8080/api",
             published: "http://localhost:8080/p/{}",
-            ...config,
+            ...Object.fromEntries(Object.entries(config).filter(([, v]) => Boolean(v))),
           });
         });
       },