Merge pull request #597 from ethereum/fix-debugger

apps/remix-ide/ci/browser_tests_chrome.sh

@@ -13,11 +13,11 @@ npm run remixd &
 
 sleep 5
 
-npx nx build remix-ide-e2e
+npm run build:e2e
 
 TESTFILES=$(circleci tests glob "dist/apps/remix-ide-e2e/src/tests/**/*.test.js" | circleci tests split --split-by=timings)
 for TESTFILE in $TESTFILES; do
-    npx nx e2e remix-ide-e2e --filePath=$TESTFILE --env=chrome  || TEST_EXITCODE=1
+    npx nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js $TESTFILE --env=chrome  || TEST_EXITCODE=1
 done
 
 echo "$TEST_EXITCODE"

apps/remix-ide/ci/browser_tests_firefox.sh

@@ -13,11 +13,11 @@ npm run remixd &
 
 sleep 5
 
-npx nx build remix-ide-e2e
+npm run build:e2e
 
 TESTFILES=$(circleci tests glob "dist/apps/remix-ide-e2e/src/tests/**/*.test.js" | circleci tests split --split-by=timings)
 for TESTFILE in $TESTFILES; do
-    npx nx e2e remix-ide-e2e --filePath=$TESTFILE --env=firefox  || TEST_EXITCODE=1
+    npx nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js $TESTFILE --env=firefox  || TEST_EXITCODE=1
 done
 
 echo "$TEST_EXITCODE"

apps/remix-ide/ci/browser_tests_run_deploy.sh

@@ -11,7 +11,7 @@ npm run serve &
 
 sleep 5
 
-npx nx build remix-ide-e2e
+npm run build:e2e
 npm run nightwatch_local_runAndDeploy || TEST_EXITCODE=1
 
 echo "$TEST_EXITCODE"

workspace.json

@@ -100,23 +100,6 @@
       "sourceRoot": "apps/remix-ide-e2e/src",
       "projectType": "application",
       "architect": {
-        "build": {
-          "builder": "@nrwl/workspace:run-commands",
-          "options": {
-            "commands": [
-              "tsc -p apps/remix-ide-e2e/tsconfig.e2e.json"
-            ]
-          }
-        },
-        "e2e": {
-          "builder": "@nrwl/workspace:run-commands",
-          "options": {
-            "commands": [
-              "TEST_SCRIPT='node_modules/.bin/nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js'; if [ {args.env} != undefined ]; then TEST_SCRIPT=${TEST_SCRIPT}' --env {args.env}'; else TEST_SCRIPT=${TEST_SCRIPT}' --env chrome'; fi; if [ {args.filePath} != undefined ]; then TEST_SCRIPT=${TEST_SCRIPT}' {args.filePath}'; fi; eval $TEST_SCRIPT;"
-            ],
-            "parallel": false
-          }
-        },
         "lint": {
           "builder": "@nrwl/linter:lint",
           "options": {
@@ -145,11 +128,7 @@
         "test": {
           "builder": "@nrwl/workspace:run-commands",
           "options": {
-            "commands": [
-              {
-                "command": "./../../node_modules/.bin/npm-run-all test"
-              }
-            ],
+            "commands": ["npm-run-all test"],
             "cwd": "libs/remix-analyzer"
           }
         },
@@ -183,11 +162,7 @@
         "test": {
           "builder": "@nrwl/workspace:run-commands",
           "options": {
-            "commands": [
-              {
-                "command": "./../../node_modules/.bin/npm-run-all test"
-              }
-            ],
+            "commands": ["npm-run-all test"],
             "cwd": "libs/remix-astwalker"
           }
         },
@@ -221,11 +196,7 @@
         "test": {
           "builder": "@nrwl/workspace:run-commands",
           "options": {
-            "commands": [
-              {
-                "command": "./../../node_modules/.bin/npm-run-all test"
-              }
-            ],
+            "commands": ["npm-run-all test"],
             "cwd": "libs/remix-debug"
           }
         },
@@ -270,11 +241,7 @@
         "test": {
           "builder": "@nrwl/workspace:run-commands",
           "options": {
-            "commands": [
-              {
-                "command": "./../../node_modules/.bin/npm-run-all test"
-              }
-            ],
+            "commands": ["npm-run-all test"],
             "cwd": "libs/remix-lib"
           }
         },
@@ -308,11 +275,7 @@
         "test": {
           "builder": "@nrwl/workspace:run-commands",
           "options": {
-            "commands": [
-              {
-                "command": "./../../node_modules/.bin/npm-run-all test"
-              }
-            ],
+            "commands": ["npm-run-all test"],
             "cwd": "libs/remix-simulator"
           }
         },
@@ -357,11 +320,7 @@
         "test": {
           "builder": "@nrwl/workspace:run-commands",
           "options": {
-            "commands": [
-              {
-                "command": "./../../node_modules/.bin/npm-run-all test"
-              }
-            ],
+            "commands": ["npm-run-all test"],
             "cwd": "libs/remix-solidity"
           }
         },
@@ -443,11 +402,7 @@
         "test": {
           "builder": "@nrwl/workspace:run-commands",
           "options": {
-            "commands": [
-              {
-                "command": "./../../node_modules/.bin/npm-run-all test"
-              }
-            ],
+            "commands": ["npm-run-all test"],
             "cwd": "libs/remix-url-resolver"
           }
         },