From 04612da3840bcdf6594aa5a40240c15b2e41e0a4 Mon Sep 17 00:00:00 2001
From: joseph izang <joeizang@hotmail.com>
Date: Fri, 20 Aug 2021 14:08:38 +0100
Subject: [PATCH] resolved conflict after pulling from master

---
 .../remix-ui/plugin-manager/tsconfig.lib.json | 14 +++++----
 tsconfig.base.json                            |  1 +
 tsconfig.json                                 | 30 +------------------
 3 files changed, 10 insertions(+), 35 deletions(-)

diff --git a/libs/remix-ui/plugin-manager/tsconfig.lib.json b/libs/remix-ui/plugin-manager/tsconfig.lib.json
index b560bc4dec..ae1aeb41d7 100644
--- a/libs/remix-ui/plugin-manager/tsconfig.lib.json
+++ b/libs/remix-ui/plugin-manager/tsconfig.lib.json
@@ -1,13 +1,15 @@
 {
-  "extends": "./tsconfig.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "../../../dist/out-tsc",
     "types": ["node"]
   },
-  "files": [
-    "../../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
-    "../../../node_modules/@nrwl/react/typings/image.d.ts"
-  ],
+  "files": [],
   "exclude": ["**/*.spec.ts", "**/*.spec.tsx"],
-  "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
+  "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    }
+  ]
 }
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 87a3bd1b40..3efbbce238 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -41,6 +41,7 @@
       "@remix-project/core-plugin": ["libs/remix-core-plugin/src/index.ts"],
       "@remix-ui/solidity-compiler": ["libs/remix-ui/solidity-compiler/src/index.ts"],
       "@remix-ui/publish-to-storage": ["libs/remix-ui/publish-to-storage/src/index.ts"],
+      "@remix-ui/plugin-manager": ["libs/remix-ui/plugin-manager/src/index.ts"],
       "@remix-ui/renderer": ["libs/remix-ui/renderer/src/index.ts"]
     }
   },
diff --git a/tsconfig.json b/tsconfig.json
index eb54c0e242..6204014228 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -14,35 +14,7 @@
     "skipLibCheck": true,
     "skipDefaultLibCheck": true,
     "baseUrl": ".",
-    "paths": {
-      "@remix-project/remix-analyzer": ["dist/libs/remix-analyzer/index.js"],
-      "@remix-project/remix-astwalker": ["dist/libs/remix-astwalker/index.js"],
-      "@remix-project/remix-debug": ["dist/libs/remix-debug/src/index.js"],
-      "@remix-project/remix-lib": ["dist/libs/remix-lib/src/index.js"],
-      "@remix-project/remix-simulator": ["dist/libs/remix-simulator/src/index.js"],
-      "@remix-project/remix-solidity": ["dist/libs/remix-solidity/index.js"],
-      "@remix-project/remix-tests": ["dist/libs/remix-tests/src/index.js"],
-      "@remix-project/remix-url-resolver": ["dist/libs/remix-url-resolver/index.js"],
-      "@remixproject/debugger-plugin": ["apps/debugger/src/index.ts"],
-      "@remix-project/remixd": ["dist/libs/remixd/index.js"],
-      "@remix-ui/tree-view": ["libs/remix-ui/tree-view/src/index.ts"],
-      "@remix-ui/debugger-ui": ["libs/remix-ui/debugger-ui/src/index.ts"],
-      "@remix-ui/utils": ["libs/remix-ui/utils/src/index.ts"],
-      "@remix-ui/clipboard": ["libs/remix-ui/clipboard/src/index.ts"],
-      "@remix-project/remix-solidity-ts": ["libs/remix-solidity/src/index.ts"],
-      "@remix-ui/modal-dialog": ["libs/remix-ui/modal-dialog/src/index.ts"],
-      "@remix-ui/toaster": ["libs/remix-ui/toaster/src/index.ts"],
-      "@remix-ui/file-explorer": ["libs/remix-ui/file-explorer/src/index.ts"],
-      "@remix-ui/workspace": ["libs/remix-ui/workspace/src/index.ts"],
-      "@remix-ui/static-analyser": ["libs/remix-ui/static-analyser/src/index.ts"],
-      "@remix-ui/checkbox": ["libs/remix-ui/checkbox/src/index.ts"],
-      "@remix-ui/settings": ["libs/remix-ui/settings/src/index.ts"],
-      "@remix-ui/plugin-manager": ["libs/remix-ui/plugin-manager/src/index.ts"],
-      "@remix-project/core-plugin": ["libs/remix-core-plugin/src/index.ts"],
-      "@remix-ui/solidity-compiler": ["libs/remix-ui/solidity-compiler/src/index.ts"],
-      "@remix-ui/publish-to-storage": ["libs/remix-ui/publish-to-storage/src/index.ts"],
-      "@remix-ui/renderer": ["libs/remix-ui/renderer/src/index.ts"]
-    },
+    "paths": {},
     "allowSyntheticDefaultImports": true
   },
   "exclude": ["node_modules", "tmp"]