resolved conflicts

apps/remixdesktop/test/tests/app/search.test.ts

@@ -10,9 +10,11 @@ module.exports = {
             .waitForElementVisible('*[data-id="remixIdeIconPanel"]', 10000)
             .waitForElementVisible('button[data-id="landingPageImportFromTemplate"]')
             .click('button[data-id="landingPageImportFromTemplate"]')
+            .waitForElementPresent('*[data-id="create-remixDefault"]')
+            .scrollAndClick('*[data-id="create-remixDefault"]')
             .waitForElementVisible('*[data-id="modalDialogCustomPromptTextCreate"]')
-            .waitForElementPresent('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok')
-            .click('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok')
+            .waitForElementPresent('[data-id="TemplatesSelectionModalDialogContainer-react"] .modal-ok')
+            .click('[data-id="TemplatesSelectionModalDialogContainer-react"] .modal-ok')
             .pause(3000)
             .windowHandles(function (result) {
                 console.log(result.value)
@@ -106,7 +108,8 @@ module.exports = {
         browser
             .waitForElementVisible('*[data-id="toggle_replace"]').click('*[data-id="toggle_replace"]')
             .waitForElementVisible('*[id="search_replace"]')
-            .setValue('*[id="search_replace"]', 'replacing').sendKeys('*[id="search_replace"]', browser.Keys.ENTER).pause(1000)
+            .clearValue('*[id="search_include"]').setValue('*[id="search_include"]', 'contracts/2_*.sol')
+            .setValue('*[id="search_replace"]', 'replacing').sendKeys('*[id="search_include"]', browser.Keys.ENTER).pause(1000)
             .waitForElementVisible('*[data-id="contracts/2_Owner.sol-33-71"]')
             .moveToElement('*[data-id="contracts/2_Owner.sol-33-71"]', 10, 10)
             .waitForElementVisible('*[data-id="replace-contracts/2_Owner.sol-33-71"]')
@@ -132,7 +135,8 @@ module.exports = {
     'Should replace all & undo #group1': function (browser: NightwatchBrowser) {
         browser
             .clearValue('*[id="search_input"]')
-            .setValue('*[id="search_input"]', 'storage').sendKeys('*[id="search_input"]', browser.Keys.ENTER)
+            .clearValue('*[id="search_include"]').setValue('*[id="search_include"]', 'contracts/1_*.sol')
+            .setValue('*[id="search_input"]', 'storage').sendKeys('*[id="search_include"]', browser.Keys.ENTER)
             .clearValue('*[id="search_replace"]')
             .setValue('*[id="search_replace"]', '123test').pause(1000)
             .waitForElementVisible('*[data-id="replace-all-contracts/1_Storage.sol"]')
@@ -151,7 +155,8 @@ module.exports = {
     'Should replace all & undo & switch between files #group1': function (browser: NightwatchBrowser) {
         browser.waitForElementVisible('*[id="search_input"]')
             .clearValue('*[id="search_input"]')
-            .setValue('*[id="search_input"]', 'storage').sendKeys('*[id="search_input"]', browser.Keys.ENTER)
+            .clearValue('*[id="search_include"]').setValue('*[id="search_include"]', '*.sol, *.js, *.txt')
+            .setValue('*[id="search_input"]', 'storage').sendKeys('*[id="search_include"]', browser.Keys.ENTER)
             .clearValue('*[id="search_replace"]')
             .setValue('*[id="search_replace"]', '123test').pause(1000)
             .waitForElementVisible('*[data-id="replace-all-contracts/1_Storage.sol"]')

apps/remixdesktop/test/tests/app/slitherlinux.test.ts

@@ -14,9 +14,11 @@ const tests = {
       .waitForElementVisible('*[data-id="remixIdeIconPanel"]', 10000)
       .waitForElementVisible('button[data-id="landingPageImportFromTemplate"]')
       .click('button[data-id="landingPageImportFromTemplate"]')
+      .waitForElementPresent('*[data-id="create-remixDefault"]')
+      .scrollAndClick('*[data-id="create-remixDefault"]')
       .waitForElementVisible('*[data-id="modalDialogCustomPromptTextCreate"]')
-      .waitForElementPresent('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok')
-      .click('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok')
+      .waitForElementPresent('[data-id="TemplatesSelectionModalDialogContainer-react"] .modal-ok')
+      .click('[data-id="TemplatesSelectionModalDialogContainer-react"] .modal-ok')
       .pause(3000)
       .windowHandles(function (result) {
         console.log(result.value)

apps/remixdesktop/test/tests/app/templates.test.ts

@@ -10,9 +10,11 @@ module.exports = {
       .waitForElementVisible('*[data-id="remixIdeIconPanel"]', 10000)
       .waitForElementVisible('button[data-id="landingPageImportFromTemplate"]')
       .click('button[data-id="landingPageImportFromTemplate"]')
+      .waitForElementPresent('*[data-id="create-remixDefault"]')
+      .scrollAndClick('*[data-id="create-remixDefault"]')
       .waitForElementVisible('*[data-id="modalDialogCustomPromptTextCreate"]')
-      .waitForElementPresent('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok')
-      .click('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok')
+      .waitForElementPresent('[data-id="TemplatesSelectionModalDialogContainer-react"] .modal-ok')
+      .click('[data-id="TemplatesSelectionModalDialogContainer-react"] .modal-ok')
       .pause(3000)
       .windowHandles(function (result) {
         console.log(result.value)

apps/remixdesktop/test/types/index.d.ts

@@ -11,7 +11,7 @@ declare module 'nightwatch' {
     scrollInto(target: string): NightwatchBrowser
     testContracts(fileName: string, contractCode: NightwatchContractContent, compiledContractNames: string[]): NightwatchBrowser
     setEditorValue(value: string, callback?: () => void): NightwatchBrowser
-    addFile(name: string, content: NightwatchContractContent): NightwatchBrowser
+    addFile(name: string, content: NightwatchContractContent, readMeFile?: string): NightwatchBrowser
     verifyContracts(compiledContractNames: string[], opts?: {wait: number; version?: string; runs?: string}): NightwatchBrowser
     selectAccount(account?: string): NightwatchBrowser
     clickFunction(fnFullName: string, expectedInput?: NightwatchClickFunctionExpectedInput): NightwatchBrowser

apps/remixdesktop/tsconfig.e2e.json

@@ -1,7 +1,8 @@
 {
     "extends": "./tsconfig.json",
     "compilerOptions": {
-        "outDir": "build-e2e"
+        "outDir": "build-e2e",
+        "target": "ES6"
     },
     "include": ["test/**/*.ts", "test/**/*.js", "../remix-ide-e2e/src/commands"]
   }

apps/remixdesktop/tsconfig.json

@@ -1,24 +1,35 @@
 {
   "compilerOptions": {
-    "jsx": "react-jsx",
-    "target": "ES6",
+    "target": "ES2018",
     "allowJs": true,
-    "module": "commonjs",
+    "module": "CommonJS",
     "skipLibCheck": true,
     "esModuleInterop": true,
     "noImplicitAny": false,
     "sourceMap": true,
     "baseUrl": ".",
-    "outDir": "build",
+    "outDir": "./build",
     "moduleResolution": "node",
     "resolveJsonModule": true,
     "paths": {
-      "*": ["node_modules/*"],
-      "@remix/remix-ai-core": [
-              "../../libs/remix-ai-core/src"
-            ]
+      "*": [
+        "node_modules/*"
+      ],
+      "@remix-api": [
+        "../../libs/remix-api/src/lib/types/git.ts"
+      ],
+      "@remix-git": [
+        "../../libs/remix-git/"
+      ],
     },
-    "typeRoots": ["src/**/*.d.ts", "node_modules/@types", "test/**/*.d.ts", "../remix-ide-e2e/src/**/*.d.ts"]
+    "typeRoots": [
+      "src/**/*.d.ts",
+      "node_modules/@types",
+      "test/**/*.d.ts",
+      "../remix-ide-e2e/src/**/*.d.ts"
+    ]
   },
-  "include": ["src/**/*"]
+  "include": [
+    "src/**/*",
+  ]
 }