diff --git a/npm/react/package.json b/npm/react/package.json
index 59e741223348..87253d194041 100644
--- a/npm/react/package.json
+++ b/npm/react/package.json
@@ -21,7 +21,6 @@
"@vitejs/plugin-react": "1.3.1",
"axios": "0.21.2",
"cypress": "0.0.0-development",
- "cypress-plugin-snapshots": "1.4.4",
"prop-types": "15.7.2",
"react": "16.8.6",
"react-dom": "16.8.6",
@@ -30,7 +29,7 @@
"rollup": "^2.38.5",
"rollup-plugin-typescript2": "^0.29.0",
"typescript": "^4.2.3",
- "vite": "2.9.5",
+ "vite": "3.0.3",
"vite-plugin-require-transform": "1.0.3"
},
"peerDependencies": {
diff --git a/npm/react/tsconfig.json b/npm/react/tsconfig.json
index 8e6ae3e4c8a9..bab3c30f78ff 100644
--- a/npm/react/tsconfig.json
+++ b/npm/react/tsconfig.json
@@ -1,6 +1,6 @@
{
"compilerOptions": {
- "target": "es5",
+ "target": "es6",
"module": "esnext",
"moduleResolution": "node",
"lib": [
diff --git a/npm/vite-dev-server/package.json b/npm/vite-dev-server/package.json
index 88091bd1ec96..751a25976e4f 100644
--- a/npm/vite-dev-server/package.json
+++ b/npm/vite-dev-server/package.json
@@ -18,6 +18,7 @@
"debug": "4.3.3",
"find-up": "6.3.0",
"local-pkg": "0.4.1",
+ "node-html-parser": "5.3.3",
"pathe": "0.2.0"
},
"devDependencies": {
@@ -26,7 +27,7 @@
"mocha": "^9.2.2",
"sinon": "^13.0.1",
"ts-node": "^10.2.1",
- "vite": "2.9.0-beta.3",
+ "vite": "3.0.3",
"vite-plugin-inspect": "0.4.3"
},
"files": [
diff --git a/npm/vite-dev-server/src/plugins/cypress.ts b/npm/vite-dev-server/src/plugins/cypress.ts
index 4ba23ad3aebc..ad45ff88716d 100644
--- a/npm/vite-dev-server/src/plugins/cypress.ts
+++ b/npm/vite-dev-server/src/plugins/cypress.ts
@@ -2,6 +2,7 @@ import debugFn from 'debug'
import { resolve } from 'pathe'
import type { ModuleNode, Plugin, ViteDevServer } from 'vite'
import type { Vite } from '../getVite'
+import { parse, HTMLElement } from 'node-html-parser'
import fs from 'fs'
import type { ViteDevServerConfig } from '../devServer'
@@ -52,21 +53,44 @@ export const Cypress = (
configResolved (config) {
base = config.base
},
- async transformIndexHtml () {
+ async transformIndexHtml (html) {
+ // it's possibe other plugins have modified the HTML
+ // before we get to. For example vitejs/plugin-react will
+ // add a preamble. We do our best to look at the HTML we
+ // receive and inject it.
+ // For now we just grab any `${
- indexHtmlContent.substring(endOfBody)
- }`
+ const newHtml = `
+ ${indexHtmlContent.substring(0, endOfBody)}
+
+ ${indexHtmlContent.substring(endOfBody)}
+ `
+
+ return newHtml
},
configureServer: async (server: ViteDevServer) => {
server.middlewares.use(`${base}index.html`, async (req, res) => {
diff --git a/npm/vue/package.json b/npm/vue/package.json
index 8636900c1ba7..666bdce67105 100644
--- a/npm/vue/package.json
+++ b/npm/vue/package.json
@@ -31,7 +31,7 @@
"rollup-plugin-typescript2": "^0.29.0",
"tailwindcss": "1.1.4",
"typescript": "^4.2.3",
- "vite": "2.9.5",
+ "vite": "3.0.3",
"vue": "3.2.31",
"vue-i18n": "9.0.0-rc.6",
"vue-router": "^4.0.0",
diff --git a/packages/app/package.json b/packages/app/package.json
index 0db3ad18d851..0421c09dff71 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -43,6 +43,7 @@
"cypress-real-events": "1.6.0",
"dayjs": "^1.9.3",
"disparity": "^3.0.0",
+ "engine.io-client": "3.5.2",
"faker": "5.5.3",
"fuzzysort": "^1.1.4",
"graphql": "^15.5.1",
@@ -58,7 +59,7 @@
"rollup-plugin-polyfill-node": "^0.7.0",
"unplugin-icons": "0.13.2",
"unplugin-vue-components": "^0.15.2",
- "vite": "2.9.0-beta.3",
+ "vite": "3.0.3",
"vite-plugin-components": "0.11.3",
"vite-plugin-pages": "0.18.1",
"vite-plugin-vue-layouts": "0.6.0",
@@ -106,7 +107,6 @@
"nanoid",
"pinia",
"shiki",
- "socket.io-client",
"url",
"vue",
"vue-demi",
diff --git a/packages/app/src/App.vue b/packages/app/src/App.vue
index dc01bce35900..d76b3823321d 100644
--- a/packages/app/src/App.vue
+++ b/packages/app/src/App.vue
@@ -5,3 +5,17 @@
/>
+
+
diff --git a/packages/app/vite.config.ts b/packages/app/vite.config.mjs
similarity index 91%
rename from packages/app/vite.config.ts
rename to packages/app/vite.config.mjs
index 07c1088a0378..021497ed8f98 100644
--- a/packages/app/vite.config.ts
+++ b/packages/app/vite.config.mjs
@@ -1,4 +1,4 @@
-import { makeConfig } from '../frontend-shared/vite.config'
+import { makeConfig } from '../frontend-shared/vite.config.mjs'
import Layouts from 'vite-plugin-vue-layouts'
import Pages from 'vite-plugin-pages'
import Copy from 'rollup-plugin-copy'
diff --git a/packages/driver/package.json b/packages/driver/package.json
index 9af15ea1d278..80b664d16fba 100644
--- a/packages/driver/package.json
+++ b/packages/driver/package.json
@@ -83,7 +83,7 @@
"unfetch": "4.1.0",
"url-parse": "1.5.9",
"vanilla-text-mask": "5.1.1",
- "vite": "2.9.0-beta.3",
+ "vite": "3.0.3",
"webpack": "^4.44.2",
"zone.js": "0.9.0"
},
diff --git a/packages/driver/vite.config.ts b/packages/driver/vite.config.mjs
similarity index 100%
rename from packages/driver/vite.config.ts
rename to packages/driver/vite.config.mjs
diff --git a/packages/frontend-shared/cypress/support/common.ts b/packages/frontend-shared/cypress/support/common.ts
index 9506c95afe1d..13c7c04f3aa5 100644
--- a/packages/frontend-shared/cypress/support/common.ts
+++ b/packages/frontend-shared/cypress/support/common.ts
@@ -28,7 +28,7 @@ declare global {
}
}
-import { initHighlighter } from '@cy/components/ShikiHighlight.vue'
+import { initHighlighter } from '@cy/components/highlight'
// Make sure highlighter is initialized before
// we show any code to avoid jank at rendering
diff --git a/packages/frontend-shared/package.json b/packages/frontend-shared/package.json
index 0dde28f90865..be0af1b59493 100644
--- a/packages/frontend-shared/package.json
+++ b/packages/frontend-shared/package.json
@@ -65,7 +65,7 @@
"shiki": "^0.9.12",
"unplugin-icons": "0.13.2",
"unplugin-vue-components": "^0.15.4",
- "vite": "2.9.0-beta.3",
+ "vite": "3.0.3",
"vite-plugin-components": "0.11.3",
"vite-plugin-windicss": "^1.4.7",
"vite-svg-loader": "3.1.2",
@@ -106,7 +106,6 @@
"human-interval",
"lodash",
"shiki",
- "socket.io-client",
"vue",
"vue-i18n",
"vue-toastification",
diff --git a/packages/frontend-shared/src/components/ShikiHighlight.cy.tsx b/packages/frontend-shared/src/components/ShikiHighlight.cy.tsx
index 319841919da6..9c7982e74d38 100644
--- a/packages/frontend-shared/src/components/ShikiHighlight.cy.tsx
+++ b/packages/frontend-shared/src/components/ShikiHighlight.cy.tsx
@@ -1,4 +1,5 @@
-import ShikiHighlight, { initHighlighter } from './ShikiHighlight.vue'
+import ShikiHighlight from './ShikiHighlight.vue'
+import { initHighlighter } from './highlight'
import code from '../../windi.config?raw'
const devServerCode = `const { defineConfig } = require('cypress')
diff --git a/packages/frontend-shared/src/components/ShikiHighlight.vue b/packages/frontend-shared/src/components/ShikiHighlight.vue
index 5e4d4dc4d1a7..bdb4a46c3bc7 100644
--- a/packages/frontend-shared/src/components/ShikiHighlight.vue
+++ b/packages/frontend-shared/src/components/ShikiHighlight.vue
@@ -72,51 +72,12 @@ shikiWrapperClasses computed property.
-
-