cut over runtime packages (not tests except npm packages) to tsx

Author: AtofStryker

gulpfile.js

@@ -1,2 +1,2 @@
-require('@packages/ts/register')
+require('tsx/cjs')
 require('./scripts/gulp/gulpfile')

npm/puppeteer/.mocharc.json

@@ -2,6 +2,6 @@
   "watch-ignore": [
     "node_modules"
   ],
-  "require": "ts-node/register",
+  "require": "tsx/cjs",
   "exit": true
 }

npm/puppeteer/package.json

@@ -30,7 +30,7 @@
     "semantic-release": "22.0.12",
     "sinon": "^13.0.1",
     "sinon-chai": "^3.7.0",
-    "ts-node": "^10.9.2",
+    "tsx": "^4.19.3",
     "typescript": "5.4.5"
   },
   "peerDependencies": {

npm/puppeteer/test/unit/setup.spec.ts

@@ -1,18 +1,18 @@
 import { expect, use } from 'chai'
 import chaiAsPromised from 'chai-as-promised'
-import type { PuppeteerNode, Browser } from 'puppeteer-core'
+import type { PuppeteerNode, Browser, Page } from 'puppeteer-core'
 import sinon from 'sinon'
 import sinonChai from 'sinon-chai'
 import { MessageHandler } from '../../src/plugin/setup'
 import { setup } from '../../src/plugin'
-import * as activateMainTabExport from '../../src/plugin/activateMainTab'
 
 use(chaiAsPromised)
 use(sinonChai)
 
 type StubbedMessageHandler = sinon.SinonStub<Parameters<MessageHandler>, ReturnType<MessageHandler>>
 
 describe('#setup', () => {
+  let mockPage: Partial<Page>
   let mockBrowser: Partial<Browser>
   let mockPuppeteer: Pick<PuppeteerNode, 'connect'>
   let on: sinon.SinonStub
@@ -30,9 +30,13 @@ describe('#setup', () => {
   }
 
   beforeEach(() => {
-    sinon.stub(activateMainTabExport, 'activateMainTab')
+    mockPage = {
+      evaluate: sinon.stub().resolves(),
+    }
+
     mockBrowser = {
       disconnect: sinon.stub().resolves(),
+      pages: sinon.stub().resolves([mockPage]),
     }
 
     mockPuppeteer = {
@@ -50,8 +54,6 @@ describe('#setup', () => {
 
   afterEach(() => {
     sinon.reset()
-
-    ;(activateMainTabExport.activateMainTab as sinon.SinonStub).restore()
   })
 
   it('registers `after:browser:launch` and `task` handlers', () => {
@@ -229,19 +231,18 @@ describe('#setup', () => {
       )
     })
 
-    it('calls activateMainTab if there is a page in the browser', async () => {
-      (activateMainTabExport.activateMainTab as sinon.SinonStub).withArgs(mockBrowser).resolves()
+    it('calls page.evaluate() if there is a page in the browser', async () => {
       setup({ on, onMessage, puppeteer: mockPuppeteer as PuppeteerNode })
       const task = getTask()
 
       simulateBrowserLaunch()
       await task({ name: testTask, args: [] })
 
-      expect(activateMainTabExport.activateMainTab).to.be.calledWith(mockBrowser)
+      expect(mockPage.evaluate).to.be.calledWith(sinon.match.func, 2000)
     })
 
     it('returns an error object if activateMainTab rejects', async () => {
-      (activateMainTabExport.activateMainTab as sinon.SinonStub).withArgs(mockBrowser).rejects()
+      mockBrowser.pages = sinon.stub().rejects(new Error('Failed to get pages'))
 
       setup({ on, onMessage, puppeteer: mockPuppeteer as PuppeteerNode })
       simulateBrowserLaunch()
@@ -263,7 +264,7 @@ describe('#setup', () => {
 
       await task({ name: testTask, args: [] })
 
-      expect(activateMainTabExport.activateMainTab).not.to.be.called
+      expect(mockPage.evaluate).not.to.be.called
     })
 
     it('does not try to activate main tab when the browser is electron', async () => {
@@ -272,7 +273,7 @@ describe('#setup', () => {
       const task = getTask()
 
       await task({ name: testTask, args: [] })
-      expect(activateMainTabExport.activateMainTab).not.to.be.called
+      expect(mockPage.evaluate).not.to.be.called
     })
   })
 

npm/vite-dev-server/package.json

@@ -11,7 +11,7 @@
     "cypress:run-cypress-in-cypress": "cross-env CYPRESS_INTERNAL_E2E_TESTING_SELF_PARENT_PROJECT=1 HTTP_PROXY_TARGET_FOR_ORIGIN_REQUESTS=http://localhost:4455 CYPRESS_REMOTE_DEBUGGING_PORT=6666 TZ=America/New_York",
     "lint": "eslint --ext .js,.ts,.json, .",
     "test": "yarn test-unit",
-    "test-unit": "mocha -r ts-node/register/transpile-only --config ./test/.mocharc.js",
+    "test-unit": "mocha -r tsx/cjs --config ./test/.mocharc.js",
     "watch": "tsc -w"
   },
   "dependencies": {
@@ -26,7 +26,7 @@
     "dedent": "^0.7.0",
     "mocha": "^9.2.2",
     "sinon": "^13.0.1",
-    "ts-node": "^10.9.2",
+    "tsx": "^4.19.3",
     "vite-4": "npm:vite@^4.5.3",
     "vite-5": "npm:vite@^5.2.8",
     "vite-6": "npm:vite@^6.0.0",

npm/vite-dev-server/src/dynamic-import.ts

@@ -2,6 +2,7 @@
 // is used (e.g. module=node16). To change this, we would also have to change the ts-node behavior when requiring the
 // Cypress config file. This hack for keeping dynamic imports from being converted works across all
 // of our supported node versions
+// TODO: IS THIS STILL VALID???
 const _dynamicImport = new Function('specifier', 'return import(specifier)')
 
 export const dynamicImport = <T>(module: string) => _dynamicImport(module) as Promise<T>

npm/webpack-dev-server/package.json

@@ -14,7 +14,7 @@
     "dev": "tsc --watch",
     "lint": "eslint --ext .js,.ts,.json, .",
     "test": "yarn test-unit",
-    "test-unit": "mocha -r ts-node/register/transpile-only --config ./test/.mocharc.js"
+    "test-unit": "mocha -r tsx/cjs --config ./test/.mocharc.js"
   },
   "dependencies": {
     "find-up": "6.3.0",
@@ -38,7 +38,7 @@
     "proxyquire": "2.1.3",
     "sinon": "^13.0.1",
     "snap-shot-it": "^7.9.6",
-    "ts-node": "^10.9.2",
+    "tsx": "^4.19.3",
     "webpack": "npm:webpack@^5",
     "webpack-4": "npm:webpack@^4",
     "webpack-dev-server-4": "npm:webpack-dev-server@^4"

npm/webpack-dev-server/test/fixtures/dependency.js

@@ -1 +1 @@
-export {}
+export {}

npm/webpack-preprocessor/.mocharc.json

@@ -3,6 +3,6 @@
     "./test/_test-output",
     "node_modules"
   ],
-  "require": "ts-node/register",
+  "require": "tsx/cjs",
   "exit": true
 }

npm/webpack-preprocessor/index.ts

@@ -5,7 +5,7 @@ import * as events from 'events'
 import * as path from 'path'
 import webpack from 'webpack'
 import utils from './lib/utils'
-import { overrideSourceMaps } from './lib/typescript-overrides'
+import overrides from './lib/typescript-overrides'
 
 const debug = Debug('cypress:webpack')
 const debugStats = Debug('cypress:webpack:stats')
@@ -211,7 +211,7 @@ const preprocessor: WebpackPreprocessor = (options: PreprocessorOptions = {}): F
     .tap((opts) => {
       if (opts.devtool === false) {
         // disable any overrides if we've explicitly turned off sourcemaps
-        overrideSourceMaps(false, options.typescript)
+        overrides.overrideSourceMaps(false, options.typescript)
 
         return
       }
@@ -221,7 +221,7 @@ const preprocessor: WebpackPreprocessor = (options: PreprocessorOptions = {}): F
       opts.devtool = 'inline-source-map'
 
       // override typescript to always generate proper source maps
-      overrideSourceMaps(true, options.typescript)
+      overrides.overrideSourceMaps(true, options.typescript)
 
       // To support dynamic imports, we have to disable any code splitting.
       debug('Limiting number of chunks to 1')

npm/webpack-preprocessor/lib/typescript-overrides.ts

@@ -9,7 +9,7 @@ const getProgramOptions = (rootNamesOrOptions: CreateProgramOptions, options: Co
   return _.isArray(rootNamesOrOptions) ? options : rootNamesOrOptions.options
 }
 
-export const overrideSourceMaps = (sourceMap: boolean, typescriptPath?: string) => {
+const overrideSourceMaps = (sourceMap: boolean, typescriptPath?: string) => {
   try {
     if (patched) {
       debug('typescript.createProgram() already overridden')
@@ -59,3 +59,7 @@ export const overrideSourceMaps = (sourceMap: boolean, typescriptPath?: string)
     return err
   }
 }
+
+export default {
+  overrideSourceMaps,
+}

npm/webpack-preprocessor/test/unit/index.spec.js renamed to npm/webpack-preprocessor/test/unit/index.spec.ts

@@ -1,5 +1,3 @@
-'use strict'
-
 const chai = require('chai')
 const mockery = require('mockery')
 const Promise = require('bluebird')
@@ -23,7 +21,7 @@ mockery.enable({
 mockery.registerMock('webpack', webpack)
 
 const preprocessor = require('../../index')
-const typescriptOverrides = require('../../lib/typescript-overrides')
+const typescriptOverrides = require('../../lib/typescript-overrides').default
 
 describe('webpack preprocessor', function () {
   beforeEach(function () {

npm/webpack-preprocessor/test/unit/typescript-overrides.spec.ts

@@ -21,7 +21,7 @@ describe('./lib/typescript-overrides', () => {
     it('it sets sourceMap: true', () => {
       const typescriptOverrides = proxyquire('../../lib/typescript-overrides', {
         typescript,
-      })
+      }).default
 
       typescriptOverrides.overrideSourceMaps(true)
 
@@ -43,7 +43,7 @@ describe('./lib/typescript-overrides', () => {
     it('it sets sourceMap: false', () => {
       const typescriptOverrides = proxyquire('../../lib/typescript-overrides', {
         typescript,
-      })
+      }).default
 
       typescriptOverrides.overrideSourceMaps(false)
 
@@ -65,7 +65,7 @@ describe('./lib/typescript-overrides', () => {
     it('sets options when given an array', () => {
       const typescriptOverrides = proxyquire('../../lib/typescript-overrides', {
         typescript,
-      })
+      }).default
 
       typescriptOverrides.overrideSourceMaps(true)
 
@@ -83,7 +83,7 @@ describe('./lib/typescript-overrides', () => {
     it('require "default" typescript if typescript option not specified', () => {
       const typescriptOverrides = proxyquire('../../lib/typescript-overrides', {
         typescript,
-      })
+      }).default
 
       typescriptOverrides.overrideSourceMaps(true)
 
@@ -104,7 +104,7 @@ describe('./lib/typescript-overrides', () => {
       const typescriptOverrides = proxyquire('../../lib/typescript-overrides', {
         typescript,
         '/path/to/user/typescript': userTypescript,
-      })
+      }).default
 
       typescriptOverrides.overrideSourceMaps(true, '/path/to/user/typescript')
 
@@ -121,7 +121,7 @@ describe('./lib/typescript-overrides', () => {
       const typescriptOverrides = proxyquire('../../lib/typescript-overrides', {
         typescript,
         '/path/to/user/typescript': null,
-      })
+      }).default
 
       typescriptOverrides.overrideSourceMaps(true)
 
@@ -142,7 +142,7 @@ describe('./lib/typescript-overrides', () => {
     it('gracefully returns error when typescript cannot be required', () => {
       const typescriptOverrides = proxyquire('../../lib/typescript-overrides', {
         typescript: null,
-      })
+      }).default
 
       const err = typescriptOverrides.overrideSourceMaps(true)
 

packages/config/index.js

@@ -1,5 +1,5 @@
 if (process.env.CYPRESS_INTERNAL_ENV !== 'production') {
-  require('@packages/ts/registerDir')(__dirname)
+  require('tsx/cjs')
 }
 
 module.exports = require('./src')

packages/data-context/index.js

@@ -1,5 +1,5 @@
 if (process.env.CYPRESS_INTERNAL_ENV !== 'production') {
-  require('@packages/ts/register')
+  require('tsx/cjs')
 }
 
 module.exports = require('./src')

packages/driver/cypress/plugins/index.js

@@ -1,5 +1,5 @@
 // only required to read in webpack config, since it is .ts
-require('@packages/ts/register')
+require('tsx/cjs')
 require('./server')
 const _ = require('lodash')
 const path = require('path')

packages/errors/index.js

@@ -6,7 +6,7 @@
 try {
   require.resolve('./src')
 } catch (e) {
-  require('@packages/ts/register')
+  require('tsx/cjs')
 }
 
 module.exports = require('./src')

packages/frontend-shared/index.js

@@ -1,5 +1,5 @@
 if (process.env.CYPRESS_INTERNAL_ENV !== 'production') {
-  require('@packages/ts/register')
+  require('tsx/cjs')
 }
 
 module.exports = require('./src')

packages/frontend-shared/script/codegen-type-map.js

@@ -1,2 +1,2 @@
-require('@packages/ts/register')
+require('tsx/cjs')
 module.exports = require('./codegen-type-map-ts').default

packages/frontend-shared/script/generate-shiki-theme.js

@@ -1,2 +1,2 @@
-require('@packages/ts/register')
+require('tsx/cjs')
 module.exports = require('./generate-shiki-theme-ts').default

packages/frontend-shared/script/generate-stub-specs.js

@@ -1,2 +1,2 @@
-require('@packages/ts/register')
+require('tsx/cjs')
 module.exports = require('./generate-stub-specs-ts').default

packages/graphql/index.js

@@ -1,5 +1,5 @@
 if (process.env.CYPRESS_INTERNAL_ENV !== 'production') {
-  require('@packages/ts/register')
+  require('tsx/cjs')
 }
 
 module.exports = require('./src')

packages/graphql/package.json

@@ -12,7 +12,7 @@
     "clean-deps": "rimraf node_modules",
     "postinstall": "echo '@packages/graphql needs: yarn build'",
     "lint": "eslint --ext .js,.jsx,.ts,.tsx,.json, .",
-    "nexus-build": "ts-node ./scripts/nexus-build.ts",
+    "nexus-build": "node --import tsx ./scripts/nexus-build.ts",
     "test-integration": "mocha -r @packages/ts/register test/integration/**/*.spec.ts --config ./test/.mocharc.js --exit",
     "test-unit": "mocha -r @packages/ts/register test/unit/**/*.spec.ts --config ./test/.mocharc.js --exit",
     "tslint": "tslint --config ../ts/tslint.json --project . --exclude ./src/gen/nxs.gen.ts"

packages/graphql/src/utils/nexusTypegenUtils.ts

@@ -54,12 +54,11 @@ export async function nexusTypegen (cfg: NexusTypegenCfg) {
   }
 
   const nodeCmd = `node${process.platform === 'win32' ? '.cmd' : ''}`
-  const out = spawn(nodeCmd, ['-r', '@packages/ts/register', cfg.filePath], {
+  const out = spawn(nodeCmd, ['--import', 'tsx', cfg.filePath], {
     cwd: cfg.cwd,
     env: {
       ...process.env,
       CYPRESS_INTERNAL_NEXUS_CODEGEN: 'true',
-      TS_NODE_CACHE: 'false',
     },
     ...process.platform === 'win32' ? { shell: true } : {},
   })

packages/icons/package.json

@@ -5,7 +5,7 @@
   "private": true,
   "main": "index.js",
   "scripts": {
-    "build": "ts-node ./scripts/build.ts && ts-node ./scripts/ico.ts",
+    "build": "tsx ./scripts/build.ts && tsx ./scripts/ico.ts",
     "check-ts": "tsc --noEmit && yarn -s tslint",
     "lint": "eslint --ext .js,.jsx,.ts,.tsx,.json, .",
     "test": "yarn test-unit",

packages/network/index.js

@@ -1,5 +1,5 @@
 if (process.env.CYPRESS_INTERNAL_ENV !== 'production') {
-  require('@packages/ts/register')
+  require('tsx/cjs')
 }
 
 module.exports = require('./lib')

packages/proxy/index.js

@@ -1,5 +1,5 @@
 if (process.env.CYPRESS_INTERNAL_ENV !== 'production') {
-  require('@packages/ts/register')
+  require('tsx/cjs')
 }
 
 module.exports = require('./lib')

packages/resolve-dist/index.js

@@ -1,5 +1,5 @@
 if (process.env.CYPRESS_INTERNAL_ENV !== 'production') {
-  require('@packages/ts/register')
+  require('tsx/cjs')
 }
 
 module.exports = require('./lib')