feat: use API add from env

mukuljainx · May 20, 2021 · e9d2095 · e9d2095
1 parent e607a34
commit e9d2095
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 30 deletions.
diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
     "test:watch": "jest --watch",
     "start": "webpack serve --progress --config webpack.dev.ts",
     "test:e2e": "cypress open",
-    "build": "webpack --progress --config webpack.prod.ts --mode=production"
+    "build": "NODE_ENV=production webpack --progress --config webpack.prod.ts --mode=production"
   },
   "repository": {
     "type": "git",

diff --git a/src/apps/externalAppShell/index.tsx b/src/apps/externalAppShell/index.tsx
@@ -31,7 +31,7 @@ const ExternalAppShell = ({
 }: IProps) => {
   const { render } = useAnimationEndRender({ instanceId });
   const status = useScript(
-    `http://${process.env.API}/api/manager/assests/${data.appId}/main.js`,
+    `${process.env.API}/api/manager/assests/${data.appId}/main.js`,
     true
   );
   console.log(data.options);

diff --git a/src/auth/userInfo.tsx b/src/auth/userInfo.tsx
@@ -52,7 +52,7 @@ const Auth = ({ user }: IProps) => {
             iconProps={{ iconName: "AddFriend" }}
             allowDisabledFocus
             onClick={() => {
-              window.location.href = `http://${process.env.API}/auth/google`;
+              window.location.href = `${process.env.API}/auth/google`;
             }}
           >
             Continue with Google

diff --git a/src/utils/api/index.ts b/src/utils/api/index.ts
@@ -10,7 +10,7 @@ axios.interceptors.request.use((config) => {
 
   return {
     ...config,
-    baseURL: `http://${process.env.API}/api`,
+    baseURL: `${process.env.API}/api`,
     headers: {
       ...config.headers,
       Authorization: token,

diff --git a/webpack.common.ts b/webpack.common.ts
@@ -58,7 +58,7 @@ const config = {
         test: /\.(png|jpg|gif)($|\?)/,
         loader: "url-loader",
         options: {
-          limit: 8192,
+          limit: 4096,
         },
       },
       {
@@ -74,22 +74,6 @@ const config = {
       },
     ],
   },
-  externals: {
-    // react: {
-    //   root: "React",
-    //   commonjs2: "react",
-    //   commonjs: "react",
-    //   amd: "react",
-    //   umd: "react",
-    // },
-    // "react-dom": {
-    //   root: "ReactDOM",
-    //   commonjs2: "react-dom",
-    //   commonjs: "react-dom",
-    //   amd: "react-dom",
-    //   umd: "react-dom",
-    // },
-  },
 };
 
 module.exports = config;
diff --git a/webpack.prod.ts b/webpack.prod.ts
@@ -16,16 +16,9 @@ const config = {
     path: path.resolve("./dist"),
   },
   optimization: {
-    usedExports: true,
     splitChunks: {
-      cacheGroups: {
-        vendor: {
-          // just need to exclude these they will created by webpack as other chunk
-          test: /.?[\\/]node_modules[\\/](?!(react-pdf|pdfjs-dist|react-table|d3)).*?/,
-          name: "vendors",
-          chunks: "all",
-        },
-      },
+      // include all types of chunks
+      chunks: "all",
     },
   },
 
@@ -51,6 +44,10 @@ const config = {
       openAnalyzer: true,
     }),
   ],
+  externals: {
+    react: "React",
+    "react-dom": "ReactDOM",
+  },
 };
 
 module.exports = merge(common, config);