From 42f24a0fbb516db6adc68859fd10dbe3ae3c361d Mon Sep 17 00:00:00 2001
From: Shravan Sunder <shravan.sunder.dev@gmail.com>
Date: Thu, 21 Oct 2021 00:53:21 -0400
Subject: [PATCH] #21 removed contract-types for now

---
 packages/hardhat-ts/package.json    |  1 +
 packages/vite-app-ts/vite.config.ts | 15 ++++++++++++---
 yarn.lock                           | 21 +++++++++++----------
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/packages/hardhat-ts/package.json b/packages/hardhat-ts/package.json
index 23e0a5597..6a2f60b33 100644
--- a/packages/hardhat-ts/package.json
+++ b/packages/hardhat-ts/package.json
@@ -22,6 +22,7 @@
     "@eth-optimism/hardhat-ovm": "^0.2.2",
     "@ethereumjs/vm": "^5.5.3",
     "@ethersproject/providers": "^5.4.1",
+    "@nomiclabs/hardhat-ethers": "npm:hardhat-deploy-ethers@^0.3.0-beta.10",
     "@nomiclabs/hardhat-waffle": "^2.0.0",
     "@openzeppelin/contracts": "^4.1.0",
     "@tenderly/hardhat-tenderly": "^1.0.10",
diff --git a/packages/vite-app-ts/vite.config.ts b/packages/vite-app-ts/vite.config.ts
index b14b8e604..d63e015a3 100644
--- a/packages/vite-app-ts/vite.config.ts
+++ b/packages/vite-app-ts/vite.config.ts
@@ -1,23 +1,32 @@
 import { defineConfig } from 'vite';
 //import reactRefresh from '@vitejs/plugin-react-refresh';
 import macrosPlugin from 'vite-plugin-babel-macros';
-import react from '@vitejs/plugin-react';
+import reactPlugin from '@vitejs/plugin-react';
 import tsconfigPaths from 'vite-tsconfig-paths';
 import path, { resolve } from 'path';
 import nodePolyfills from 'rollup-plugin-polyfill-node';
 import { esbuildCommonjs } from '@originjs/vite-plugin-commonjs';
+import React from 'react';
+import reactdom from 'react-dom';
 
 //console.log('env:dev', process.env.ENVIRONMENT);
 // https://vitejs.dev/config/
 export default defineConfig({
-  plugins: [nodePolyfills(), react(), macrosPlugin(), tsconfigPaths()],
+  plugins: [nodePolyfills(), reactPlugin(), macrosPlugin(), tsconfigPaths()],
 
   build: {
     // sourcemap: true,
     commonjsOptions: {
       include: /node_modules/,
       transformMixedEsModules: true,
-      // esmExternals: true,
+      ...{
+        namedExports: {
+          react: Object.keys(React),
+          'react-dom': Object.keys(reactdom),
+          // '@apollo/client': ['ApolloProvider', 'ApolloClient', 'HttpLink', 'InMemoryCache', 'useQuery', 'gql'],
+          // 'styled-components': ['styled', 'css', 'ThemeProvider'],
+        },
+      },
     },
   },
   esbuild: {
diff --git a/yarn.lock b/yarn.lock
index 13fee630d..14fe17fd2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1886,6 +1886,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@nomiclabs/hardhat-ethers@npm:hardhat-deploy-ethers@^0.3.0-beta.10, hardhat-deploy-ethers@npm:^0.3.0-beta.10":
+  version: 0.3.0-beta.11
+  resolution: "hardhat-deploy-ethers@npm:0.3.0-beta.11"
+  peerDependencies:
+    ethers: ^5.0.0
+    hardhat: ^2.0.0
+  checksum: 0becd3dc7b1b447127cf74ef1018589b8d6d3c73bbeb893e3c27fe7e412aabb3a6d11aec1169fef427d85a6c2c512f1f99017ab1a928cdaab5960b74e445625a
+  languageName: node
+  linkType: hard
+
 "@nomiclabs/hardhat-waffle@npm:^2.0.0, @nomiclabs/hardhat-waffle@npm:^2.0.1":
   version: 2.0.1
   resolution: "@nomiclabs/hardhat-waffle@npm:2.0.1"
@@ -2053,6 +2063,7 @@ __metadata:
     "@eth-optimism/hardhat-ovm": ^0.2.2
     "@ethereumjs/vm": ^5.5.3
     "@ethersproject/providers": ^5.4.1
+    "@nomiclabs/hardhat-ethers": "npm:hardhat-deploy-ethers@^0.3.0-beta.10"
     "@nomiclabs/hardhat-waffle": ^2.0.0
     "@openzeppelin/contracts": ^4.1.0
     "@tenderly/hardhat-tenderly": ^1.0.10
@@ -11270,16 +11281,6 @@ fsevents@~2.1.1:
   languageName: node
   linkType: hard
 
-"hardhat-deploy-ethers@npm:^0.3.0-beta.10":
-  version: 0.3.0-beta.11
-  resolution: "hardhat-deploy-ethers@npm:0.3.0-beta.11"
-  peerDependencies:
-    ethers: ^5.0.0
-    hardhat: ^2.0.0
-  checksum: 0becd3dc7b1b447127cf74ef1018589b8d6d3c73bbeb893e3c27fe7e412aabb3a6d11aec1169fef427d85a6c2c512f1f99017ab1a928cdaab5960b74e445625a
-  languageName: node
-  linkType: hard
-
 "hardhat-deploy@npm:^0.9.2":
   version: 0.9.4
   resolution: "hardhat-deploy@npm:0.9.4"