cypress-io · lmiller1990 · Jul 21, 2022 · Jul 21, 2022 · Jul 21, 2022 · Jul 21, 2022
diff --git a/npm/angular/package.json b/npm/angular/package.json
@@ -61,7 +61,7 @@
     "ts-node": "^10.2.1",
     "tslib": "^2.2.0",
     "tslint": "5.20.1",
-    "typescript": "4.2.4",
+    "typescript": "4.7.4",
     "webpack-dev-server": "4.0.0",
     "zone.js": "0.11.4"
   },

diff --git a/npm/create-cypress-tests/package.json b/npm/create-cypress-tests/package.json
@@ -41,7 +41,7 @@
     "mock-fs": "5.1.1",
     "shx": "0.3.3",
     "snap-shot-it": "7.9.3",
-    "typescript": "^4.2.3"
+    "typescript": "4.7.4"
   },
   "files": [
     "dist",

diff --git a/npm/cypress-schematic/package.json b/npm/cypress-schematic/package.json
@@ -33,7 +33,7 @@
     "chai": "4.2.0",
     "cypress": "0.0.0-development",
     "mocha": "3.5.3",
-    "typescript": "~4.2.4"
+    "typescript": "4.7.4"
   },
   "peerDependencies": {
     "@angular/cli": ">=12",

diff --git a/npm/cypress-schematic/sandbox12/package.json b/npm/cypress-schematic/sandbox12/package.json
@@ -34,7 +34,7 @@
     "karma-coverage": "~2.0.3",
     "karma-jasmine": "~4.0.0",
     "karma-jasmine-html-reporter": "^1.5.0",
-    "typescript": "~4.5.5"
+    "typescript": "4.7.4"
   },
   "resolutions": {
     "@types/eslint": "8.4.3"

diff --git a/npm/mount-utils/package.json b/npm/mount-utils/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "typescript": "^4.2.3"
+    "typescript": "4.7.4"
   },
   "files": [
     "dist"

diff --git a/npm/react/package.json b/npm/react/package.json
@@ -18,19 +18,18 @@
     "@cypress/mount-utils": "0.0.0-development",
     "@rollup/plugin-commonjs": "^17.1.0",
     "@rollup/plugin-node-resolve": "^11.1.1",
-    "@vitejs/plugin-react": "1.3.1",
+    "@vitejs/plugin-react": "2.0.0",
     "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",
     "react-router": "6.0.0-alpha.1",
     "react-router-dom": "6.0.0-alpha.1",
     "rollup": "^2.38.5",
     "rollup-plugin-typescript2": "^0.29.0",
-    "typescript": "^4.2.3",
-    "vite": "2.9.5",
+    "typescript": "4.7.4",
+    "vite": "3.0.2",
     "vite-plugin-require-transform": "1.0.3"
   },
   "peerDependencies": {

diff --git 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
@@ -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.2",
     "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
@@ -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 } from 'node-html-parser'
 import fs from 'fs'
 
 import type { ViteDevServerConfig } from '../devServer'
@@ -52,21 +53,45 @@ 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 `<script>` tags and inject them to <head>.
+      // We will add more handling as we learn the use cases.
+      const root = parse(html)
+
+      const scriptTagsToInject = root.childNodes.filter((node) => {
+        // @ts-ignore
+        return node.rawTagName === 'script'
+      })
+
       const indexHtmlPath = resolve(projectRoot, indexHtmlFile)
 
       debug('resolved the indexHtmlPath as', indexHtmlPath, 'from', indexHtmlFile)
-      const indexHtmlContent = await fs.promises.readFile(indexHtmlPath, { encoding: 'utf8' })
+
+      let indexHtmlContent = await fs.promises.readFile(indexHtmlPath, { encoding: 'utf8' })
+
+      // Inject the script tags
+      indexHtmlContent = indexHtmlContent.replace(
+        '<head>',
+        `<head>
+        ${scriptTagsToInject.map((script) => script.toString())}
+      `,
+      )
+
       // find </body> last index
       const endOfBody = indexHtmlContent.lastIndexOf('</body>')
 
       // insert the script in the end of the body
-      return `${indexHtmlContent.substring(0, endOfBody)
-    }<script>
-    ${loader}
-    </script>${
-      indexHtmlContent.substring(endOfBody)
-    }`
+      const newHtml = `
+        ${indexHtmlContent.substring(0, endOfBody)}
+        <script>${loader}</script>
+        ${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
@@ -30,8 +30,8 @@
     "rollup-plugin-istanbul": "2.0.1",
     "rollup-plugin-typescript2": "^0.29.0",
     "tailwindcss": "1.1.4",
-    "typescript": "^4.2.3",
-    "vite": "2.9.5",
+    "typescript": "4.7.4",
+    "vite": "3.0.2",
     "vue": "3.2.31",
     "vue-i18n": "9.0.0-rc.6",
     "vue-router": "^4.0.0",

diff --git a/npm/vue2/package.json b/npm/vue2/package.json
@@ -23,7 +23,7 @@
     "@rollup/plugin-replace": "^2.3.1",
     "rollup-plugin-typescript2": "^0.29.0",
     "tslib": "^2.1.0",
-    "typescript": "^4.2.3",
+    "typescript": "4.7.4",
     "vue": "2.6.12"
   },
   "peerDependencies": {

diff --git a/npm/webpack-batteries-included-preprocessor/package.json b/npm/webpack-batteries-included-preprocessor/package.json
@@ -41,7 +41,7 @@
     "graphql": "14.0.0",
     "mocha": "^8.1.1",
     "react": "^16.13.1",
-    "typescript": "^4.2.3"
+    "typescript": "4.7.4"
   },
   "peerDependencies": {
     "@cypress/webpack-preprocessor": "^5.4.4"

diff --git a/npm/webpack-preprocessor/examples/use-ts-loader/package.json b/npm/webpack-preprocessor/examples/use-ts-loader/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "ts-loader": "7.0.4",
-    "typescript": "^4.2.3"
+    "typescript": "4.7.4"
   },
   "license": "ISC",
   "keywords": []

diff --git a/package.json b/package.json
@@ -213,7 +213,7 @@
     "through2": "^4.0.2",
     "tree-kill": "1.2.2",
     "ts-node": "^10.2.1",
-    "typescript": "^4.4.4",
+    "typescript": "4.7.4",
     "yarn-deduplicate": "3.1.0"
   },
   "engines": {

diff --git a/packages/app/package.json b/packages/app/package.json
@@ -58,7 +58,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.2",
     "vite-plugin-components": "0.11.3",
     "vite-plugin-pages": "0.18.1",
     "vite-plugin-vue-layouts": "0.6.0",

diff --git a/packages/app/vite.config.ts → packages/app/vite.config.mjs b/packages/app/vite.config.ts → 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/data-context/src/sources/migration/codegen.ts b/packages/data-context/src/sources/migration/codegen.ts
@@ -536,6 +536,7 @@ export function getSpecPattern (cfg: LegacyCypressConfigJson, testingType: Testi
 function formatWithBundledBabel (config: string) {
   const ast = parse(config)
 
+  // @ts-ignore - babel/types need to be updated to work with TypeScript 4.7.x
   let { code } = generate(ast, {}, config)
   // By default babel generates imports like this:
   // const {

diff --git a/packages/driver/package.json b/packages/driver/package.json
@@ -81,7 +81,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.2",
     "webpack": "^4.44.2",
     "zone.js": "0.9.0"
   },

diff --git a/packages/extension/gulpfile.ts b/packages/extension/gulpfile.ts
@@ -52,10 +52,10 @@ const build = gulp.series(
     icons,
     logos,
     manifest,
-    background,
     html,
     css,
   ),
+  background,
 )
 
 const watchBuild = () => {

diff --git 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.2",
     "vite-plugin-components": "0.11.3",
     "vite-plugin-windicss": "^1.4.7",
     "vite-svg-loader": "3.1.2",

diff --git a/packages/frontend-shared/vite.config.ts → packages/frontend-shared/vite.config.mjs b/packages/frontend-shared/vite.config.ts → packages/frontend-shared/vite.config.mjs
@@ -1,8 +1,10 @@
+// @ts-check
 import path from 'path'
+import { fileURLToPath } from 'url'
 import { defineConfig } from 'vite'
 import vue from '@vitejs/plugin-vue'
 import vueJsx from '@vitejs/plugin-vue-jsx'
-import VueI18n from '@intlify/vite-plugin-vue-i18n'
+import { vueI18n } from '@intlify/vite-plugin-vue-i18n'
 import VueSvgLoader from 'vite-svg-loader'
 import { CyCSSVitePlugin } from '@cypress-design/css'
 import Components from 'unplugin-vue-components/vite'
@@ -12,18 +14,8 @@ import { FileSystemIconLoader } from 'unplugin-icons/loaders'
 
 import PkgConfig from 'vite-plugin-package-config'
 
-// eslint-disable-next-line no-duplicate-imports
-import type { UserConfig } from 'vite'
-import type { ArgumentsType } from '@antfu/utils'
-
-type PluginOptions = {
-  plugins?: any[]
-
-  // These types aren't publicly exported
-  vueI18nOptions?: ArgumentsType<typeof VueI18n>[0]
-  iconsOptions?: ArgumentsType<typeof Icons>[0]
-  componentsOptions?: ArgumentsType<typeof Components>[0]
-}
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
 
 const base = './'
 
@@ -39,7 +31,7 @@ const makePlugins = (plugins) => {
   return ([
     vue(),
     vueJsx(), // Used mostly for testing in *.(t|j)sx files.
-    VueI18n({
+    vueI18n({
       include: path.resolve(__dirname, './src/locales/**'),
       ...plugins.vueI18nOptions,
     }),
@@ -88,14 +80,26 @@ const makePlugins = (plugins) => {
 
     // package.json is modified and auto-updated when new cjs dependencies
     // are added
-    PkgConfig(),
+    PkgConfig.default(),
     // OptimizationPersist(),
     // For new plugins only! Merge options for shared plugins via PluginOptions.
     ...(plugins?.plugins || []),
   ])
 }
 
-export const makeConfig = (config: Partial<UserConfig> = {}, plugins: PluginOptions = {}): UserConfig => {
+/**
+ * @typedef PluginOptions
+ * @type {object}
+ * @property {import('@antfu/utils').ArgumentsType<typeof vueI18n>[0]=} vueI18nOptions
+ * @property {import('@antfu/utils').ArgumentsType<typeof Icons>[0]=} VueI18n
+ * @property {import('@antfu/utils').ArgumentsType<typeof Components>[0]=} componentOptions
+
+ * 
+ * @param {import('vite').UserConfig} config 
+ * @param {PluginOptions} plugins 
+ * @returns {import('vite').UserConfig}
+ */
+export const makeConfig = (config = {}, plugins = {}) => {
   // Don't overwrite plugins
   delete config.plugins
 

diff --git a/packages/launcher/package.json b/packages/launcher/package.json
@@ -32,7 +32,7 @@
     "rimraf": "3.0.2",
     "sinon": "^10.0.0",
     "sinon-chai": "3.4.0",
-    "typescript": "^4.2.3"
+    "typescript": "4.7.4"
   },
   "files": [
     "index.js",

diff --git a/packages/launchpad/package.json b/packages/launchpad/package.json
@@ -59,7 +59,7 @@
     "rimraf": "3.0.2",
     "rollup-plugin-polyfill-node": "^0.7.0",
     "type-fest": "^2.3.4",
-    "vite": "2.9.0-beta.3",
+    "vite": "3.0.2",
     "vite-plugin-components": "0.11.3",
     "vite-plugin-optimize-persist": "0.0.5",
     "vite-plugin-package-config": "0.0.3",

diff --git a/packages/launchpad/vite.config.mjs b/packages/launchpad/vite.config.mjs
@@ -0,0 +1,3 @@
+import ViteConfig from '../frontend-shared/vite.config.mjs'
+
+export default ViteConfig
diff --git a/packages/launchpad/vite.config.ts b/packages/launchpad/vite.config.ts
diff --git a/packages/network/package.json b/packages/network/package.json
@@ -35,7 +35,7 @@
     "rimraf": "3.0.2",
     "sinon": "7.3.1",
     "sinon-chai": "3.3.0",
-    "typescript": "^4.2.3"
+    "typescript": "4.7.4"
   },
   "files": [
     "lib"

diff --git a/packages/proxy/package.json b/packages/proxy/package.json
@@ -36,7 +36,7 @@
     "express": "4.17.1",
     "rimraf": "3.0.2",
     "supertest": "6.0.1",
-    "typescript": "^4.2.3"
+    "typescript": "4.7.4"
   },
   "files": [
     "lib"

diff --git a/packages/socket/package.json b/packages/socket/package.json
@@ -19,7 +19,7 @@
     "engine.io": "5.2.1",
     "engine.io-parser": "4.0.2",
     "socket.io": "4.0.1",
-    "socket.io-client": "4.0.1"
+    "socket.io-client": "4.5.1"
   },
   "devDependencies": {
     "chai": "3.5.0",

diff --git a/packages/socket/tsconfig.json b/packages/socket/tsconfig.json
@@ -1,6 +1,7 @@
 {
   "extends": "./../ts/tsconfig.json",
   "compilerOptions": {
+    "lib": ["DOM"],
     "strict": true,
     "noImplicitAny": true,
     "skipLibCheck": false

diff --git a/packages/types/package.json b/packages/types/package.json
@@ -13,7 +13,7 @@
   "devDependencies": {
     "@types/node": "14.14.31",
     "rimraf": "3.0.2",
-    "typescript": "^4.2.3"
+    "typescript": "4.7.4"
   },
   "files": [
     "src/*"