merge in origin

Author: lmiller1990

.github/CODEOWNERS

@@ -6,7 +6,6 @@
 /cli/  @cypress-io/test-runner
 /packages/coffee/  @cypress-io/test-runner
 /packages/datetime-utils/  @cypress-io/test-runner
-/packages/desktop-gui/  @cypress-io/test-runner
 /packages/driver/  @cypress-io/test-runner
 /packages/electron/  @cypress-io/test-runner
 /packages/example/  @cypress-io/test-runner

.gitignore

@@ -19,10 +19,6 @@ packages/config/lib/*.js
 # from data-context, compiled .js files
 packages/data-context/src/**/*.js
 
-# from desktop-gui
-packages/desktop-gui/cypress/videos
-packages/desktop-gui/src/jsconfig.json
-
 # from driver
 packages/driver/cypress/videos
 packages/driver/cypress/screenshots

.vscode/terminals.json

@@ -75,20 +75,6 @@
       "onlySingle": true,
       "cwd": "[cwd]/packages/driver",
       "command": "yarn cypress:open"
-    },
-    {
-      "name": "packages/desktop-gui cypress open",
-      "focus": true,
-      "onlySingle": true,
-      "cwd": "[cwd]/packages/desktop-gui",
-      "command": "yarn cypress:open"
-    },
-    {
-      "name": "packages/desktop-gui watch",
-      "focus": true,
-      "onlySingle": true,
-      "cwd": "[cwd]/packages/desktop-gui",
-      "command": "yarn watch"
     }
   ]
 }

CONTRIBUTING.md

@@ -274,7 +274,6 @@ Here is a list of the core packages in this repository with a short description,
  | Folder Name                           | Package Name            | Purpose                                                                      |
  | :------------------------------------ | :---------------------- | :--------------------------------------------------------------------------- |
  | [cli](./cli)                          | `cypress`               | The command-line tool that is packaged as an `npm` module.                   |
- | [desktop-gui](./packages/desktop-gui) | `@packages/desktop-gui` | The front-end code for the Cypress Desktop GUI.                              |
  | [driver](./packages/driver)           | `@packages/driver`      | The code that is used to drive the behavior of the API commands.             |
  | [electron](./packages/electron)       | `@packages/electron`    | The Cypress implementation of Electron.                                      |
  | [example](./packages/example)         | `@packages/example`     | Our example kitchen-sink application.                                        |

circle.yml

@@ -1025,8 +1025,6 @@ jobs:
             fi
       - wait-on-circle-jobs:
           job-names: >
-            desktop-gui-integration-tests-7x,
-            desktop-gui-component-tests,
             cli-visual-tests,
             runner-integration-tests-chrome,
             runner-ct-integration-tests-chrome,
@@ -1307,52 +1305,6 @@ jobs:
       - run-driver-integration-tests:
           browser: electron
 
-  desktop-gui-integration-tests-7x:
-    <<: *defaults
-    parallelism: 7
-    steps:
-      - restore_cached_workspace
-      - run:
-          command: yarn build-prod
-          working_directory: packages/desktop-gui
-      - run:
-          command: |
-            CYPRESS_KONFIG_ENV=production \
-            CYPRESS_RECORD_KEY=$PACKAGES_RECORD_KEY \
-            PERCY_PARALLEL_NONCE=$CIRCLE_WORKFLOW_ID \
-            PERCY_ENABLE=${PERCY_TOKEN:-0} \
-            PERCY_PARALLEL_TOTAL=-1 \
-            yarn percy exec --parallel -- -- \
-            yarn cypress:run --record --parallel --group 2x-desktop-gui
-          working_directory: packages/desktop-gui
-      - verify-mocha-results
-      - store_test_results:
-          path: /tmp/cypress
-      - store_artifacts:
-          path: /tmp/artifacts
-      - store-npm-logs
-
-
-  desktop-gui-component-tests:
-    <<: *defaults
-    resource_class: medium
-    parallelism: 1
-    steps:
-      - restore_cached_workspace
-      - run:
-          # will use PERCY_TOKEN environment variable if available
-          command: |
-            CYPRESS_KONFIG_ENV=production \
-            PERCY_PARALLEL_NONCE=$CIRCLE_WORKFLOW_ID \
-            PERCY_ENABLE=${PERCY_TOKEN:-0} \
-            PERCY_PARALLEL_TOTAL=-1 \
-            yarn percy exec --parallel -- -- \
-            yarn cypress:run:ct
-          working_directory: packages/desktop-gui
-      - verify-mocha-results
-      # we don't really need any artifacts - we are only interested in visual screenshots
-      - store-npm-logs
-
   reporter-integration-tests:
     <<: *defaults
     resource_class: medium
@@ -1400,6 +1352,7 @@ jobs:
 
   npm-webpack-preprocessor:
     <<: *defaults
+    resource_class: medium
     steps:
       - restore_cached_workspace
       - run:
@@ -1437,6 +1390,7 @@ jobs:
 
   npm-webpack-dev-server:
     <<: *defaults
+    resource_class: medium
     steps:
       - restore_cached_workspace
       - run:
@@ -1640,6 +1594,7 @@ jobs:
 
   test-kitchensink:
     <<: *defaults
+    resource_class: medium
     steps:
       - clone-repo-and-checkout-branch:
           repo: cypress-example-kitchensink
@@ -2238,12 +2193,6 @@ linux-workflow: &linux-workflow
         context: test-runner:launchpad-tests
         requires:
           - build
-    - desktop-gui-integration-tests-7x:
-        requires:
-          - build
-    - desktop-gui-component-tests:
-        requires:
-          - build
     - reporter-integration-tests:
         requires:
           - build
@@ -2308,8 +2257,6 @@ linux-workflow: &linux-workflow
           - ui-components-integration-tests
           - reporter-integration-tests
           - Linux lint
-          - desktop-gui-component-tests
-          - desktop-gui-integration-tests-7x
           - runner-ct-integration-tests-chrome
           - runner-integration-tests-firefox
           - runner-integration-tests-chrome

npm/design-system/package.json

@@ -85,7 +85,7 @@
     "typed-scss-modules": "^4.1.1",
     "typescript": "^4.2.3",
     "vite": "2.4.4",
-    "webpack": "4.44.1"
+    "webpack": "^4.44.2"
   },
   "peerDependencies": {
     "react": "^=16.x || ^=17.x",

npm/react/package.json

@@ -94,7 +94,7 @@
     "svg-url-loader": "3.0.3",
     "typescript": "^4.2.3",
     "victory": "34.3.6",
-    "webpack": "4.44.1",
+    "webpack": "^4.44.2",
     "webpack-cli": "3.3.9"
   },
   "peerDependencies": {

npm/vue/examples/code-coverage/package.json

@@ -26,7 +26,7 @@
     "sass-loader": "7.3.1",
     "vue": "3.2.6",
     "vue-loader": "16.2.0",
-    "webpack": "4.46.0"
+    "webpack": "^4.44.2"
   },
   "license": "MIT",
   "keywords": []

npm/vue/package.json

@@ -56,7 +56,7 @@
     "vue-style-loader": "4.1.2",
     "vue-tsc": "^0.3.0",
     "vuex": "^4.0.0",
-    "webpack": "4.42.0"
+    "webpack": "^4.44.2"
   },
   "peerDependencies": {
     "@cypress/webpack-dev-server": "*",

npm/webpack-batteries-included-preprocessor/package.json

@@ -22,7 +22,7 @@
     "ts-loader": "^8.0.2",
     "tsconfig-package": "npm:tsconfig@^7.0.0",
     "tsconfig-paths-webpack-plugin": "^3.3.0",
-    "webpack": "^4.44.1"
+    "webpack": "^4.44.2"
   },
   "devDependencies": {
     "@cypress/eslint-plugin-dev": "0.0.0-development",