next 6; babel config -> next config

Dexecure · May 1, 2018 · 1fe995d · 1fe995d
1 parent 99627da
commit 1fe995d
Show file tree

Hide file tree

Showing 7 changed files with 925 additions and 959 deletions.
diff --git a/.babelrc b/.babelrc
diff --git a/components/result.js b/components/result.js
@@ -14,13 +14,15 @@ import { ToastContainer } from "react-toastify";
 import { style, toast } from "react-toastify";
 import { countryList } from "../data/countryList";
 import { deviceList, connectionList } from "../data/devAndConList";
+import getConfig from "next/config";
 
 style({
   colorDefault: "#153B58",
   colorProgressDefault: "#db3340",
   width: "500px"
 });
 
+const { publicRuntimeConfig } = getConfig();
 const humanCount = 1000;
 const defaultUrl = "https://google.com";
 const devAndconAndconuDefault = "all";
@@ -215,7 +217,7 @@ class ResultComponent extends React.Component {
     if (!input) {
       return Promise.resolve({ options: [] });
     }
-    return fetch(`${process.env.BACKEND_URL}/search`, {
+    return fetch(`${publicRuntimeConfig.backend_url}/search`, {
       method: "post",
       headers: {
         "Content-Type": "application/json"
@@ -243,7 +245,7 @@ class ResultComponent extends React.Component {
       loading: true
     });
     const origin = url.origin || url;
-    const response = await fetch(`${process.env.BACKEND_URL}/content`, {
+    const response = await fetch(`${publicRuntimeConfig.backend_url}/content`, {
       method: "post",
       headers: {
         "Content-Type": "application/json"

diff --git a/components/resultGraph.js b/components/resultGraph.js
@@ -6,7 +6,9 @@ import Autosuggest from "react-autosuggest";
 import { PulseLoader } from "react-spinners";
 import Visual from "../components/visual";
 import ResultScore from "./resultScore";
+import getConfig from "next/config";
 
+const { publicRuntimeConfig } = getConfig();
 const humanCount = 1000;
 const defaultUrl = "https://google.com";
 
@@ -123,18 +125,21 @@ class ResultGraph extends React.Component {
         loading: true
       });
       const origin = url.origin || url;
-      const response = await fetch(`${process.env.BACKEND_URL}/content`, {
-        method: "post",
-        headers: {
-          "Content-Type": "application/json"
-        },
-        body: JSON.stringify({
-          origin,
-          device,
-          connection,
-          country
-        })
-      });
+      const response = await fetch(
+        `${publicRuntimeConfig.backend_url}/content`,
+        {
+          method: "post",
+          headers: {
+            "Content-Type": "application/json"
+          },
+          body: JSON.stringify({
+            origin,
+            device,
+            connection,
+            country
+          })
+        }
+      );
       if (response.ok) {
         const responseJSON = await response.json();
         this.setState({
@@ -193,7 +198,7 @@ class ResultGraph extends React.Component {
     if (!input) {
       return Promise.resolve({ options: [] });
     }
-    return fetch(`${process.env.BACKEND_URL}/search`, {
+    return fetch(`${publicRuntimeConfig.backend_url}/search`, {
       method: "post",
       headers: {
         "Content-Type": "application/json"

diff --git a/env-config.js b/env-config.js
diff --git a/next.config.js b/next.config.js
@@ -1,14 +1,8 @@
-module.exports = {
-  webpack: (config) => {
-    // Perform customizations to config
-    config.module.rules = config.module.rules.map(rule => {
-      if(rule.loader === "babel-loader") {
-        rule.options.cacheDirectory = false;
-      }
-      return rule;
-    });
+const prod = process.env.NODE_ENV === "production";
 
-    return config;
-  },
+module.exports = {
+  publicRuntimeConfig: {
+    backend_url: "https://ruxt-api.dexecure.com",
+    ga_id: prod ? "UA-55423842-6" : "UA-xxxxxxxx-x"
+  }
 };
-
diff --git a/package.json b/package.json
@@ -13,10 +13,9 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "babel-plugin-transform-define": "^1.3.0",
     "create-react-class": "^15.6.3",
     "es6-promise-debounce": "^1.0.1",
-    "next": "^5.1.0",
+    "next": "^6.0.0",
     "qs": "^6.5.1",
     "react": "^16.3.2",
     "react-autocomplete": "^1.7.2",