fix merge conflicts

masa-finance · Feb 16, 2023 · 928021b · 928021b
1 parent ce652dc
commit 928021b
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 36 deletions.
diff --git a/package.json b/package.json
@@ -15,7 +15,7 @@
   "scripts": {
     "start": "yarn build:watch",
     "build": "yarn build:tsc && yarn build:dist",
-    "build:tsc": "tsc && cp -R ./fonts/ ./dist/fonts/ && cp ./src/styles.scss ./dist/src/styles.scss && cp ./src/common/components/modal/styles.scss ./dist/src/common/components/modal/styles.scss ",
+    "build:tsc": "tsc && cp -R ./fonts/ ./dist/fonts/ && cp ./src/styles.scss ./dist/src/styles.scss && cp ./src/components/modal/styles.scss ./dist/src/components/modal/styles.scss",
     "build:dist": "cross-env NODE_ENV=production webpack",
     "build:watch": "tsc -w",
     "lint": "eslint src/**/*.{ts,tsx} stories/**/*.tsx --fix",

diff --git a/src/config/colors.js b/src/config/colors.js
diff --git a/src/masa-react-env.d.ts b/src/masa-react-env.d.ts
diff --git a/src/modules.d.ts b/src/modules.d.ts
@@ -0,0 +1,7 @@
+import { MetaMaskInpageProvider } from '@metamask/providers';
+
+declare global {
+  interface Window {
+    ethereum?: MetaMaskInpageProvider;
+  }
+}
diff --git a/tsconfig.json b/tsconfig.json
@@ -4,6 +4,7 @@
     "src"
   ],
   "compilerOptions": {
+    "target": "ES2015",
     "module": "ESNext",
     "lib": [
       "DOM",
@@ -16,7 +17,7 @@
     "sourceMap": true,
     // match output dir to input dir. e.g. dist/index instead of dist/src/index
     "rootDir": "./src",
-    "outDir": "./dist",
+    "outDir": "./dist/src",
     // stricter type-checking for stronger correctness. Recommended by TS
     "strict": true,
     // linter checks for common issues