Merge branch 'develop' into issue-22128-certverifyprocbuiltin

Author: Rachel

.eslintrc.js

@@ -5,6 +5,7 @@ const { specifiedRules } = require('graphql')
 const graphqlOpts = {
   env: 'literal',
   tagName: 'gql',
+  // eslint-disable-next-line no-restricted-syntax
   schemaString: fs.readFileSync(
     path.join(__dirname, 'packages/graphql/schemas/schema.graphql'),
     'utf8',
@@ -33,6 +34,24 @@ module.exports = {
     'plugin:@cypress/dev/tests',
   ],
   parser: '@typescript-eslint/parser',
+  overrides: [
+    {
+      files: [
+        // ignore in tests and scripts
+        '**/scripts/**',
+        '**/test/**',
+        '**/system-tests/**',
+        'packages/{app,driver,frontend-shared,launchpad}/cypress/**',
+        '*.test.ts',
+        // ignore in packages that don't run in the Cypress process
+        'npm/create-cypress-tests/**',
+      ],
+      rules: {
+        'no-restricted-properties': 'off',
+        'no-restricted-syntax': 'off',
+      },
+    },
+  ],
   rules: {
     'no-duplicate-imports': 'off',
     'import/no-duplicates': 'off',
@@ -55,6 +74,16 @@ module.exports = {
         message: 'os.userInfo() will throw when there is not an `/etc/passwd` entry for the current user (like when running with --user 12345 in Docker). Do not use it unless you catch any potential errors.',
       },
     ],
+    'no-restricted-syntax': [
+      // esquery tool: https://estools.github.io/esquery/
+      'error',
+      {
+        // match sync FS methods except for `existsSync`
+        // examples: fse.readFileSync, fs.readFileSync, this.ctx.fs.readFileSync...
+        selector: `MemberExpression[object.name='fs'][property.name=/^[A-z]+Sync$/]:not(MemberExpression[property.name='existsSync']), MemberExpression[property.name=/^[A-z]+Sync$/]:not(MemberExpression[property.name='existsSync']):has(MemberExpression[property.name='fs'])`,
+        message: 'Synchronous fs calls should not be used in Cypress. Use an async API instead.',
+      },
+    ],
     'graphql/capitalized-type-name': ['warn', graphqlOpts],
     'graphql/no-deprecated-fields': ['error', graphqlOpts],
     'graphql/template-strings': ['error', { ...graphqlOpts, validators }],

circle.yml

@@ -27,8 +27,7 @@ mainBuildFilters: &mainBuildFilters
     branches:
       only:
         - develop
-        - 10.0-release
-        - linux-arm64
+        - issue-22147-nohoist
 
 # usually we don't build Mac app - it takes a long time
 # but sometimes we want to really confirm we are doing the right thing
@@ -129,7 +128,7 @@ commands:
       - run:
           name: Check current branch to persist artifacts
           command: |
-            if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "linux-arm64" ]]; then
+            if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "issue-22147-nohoist" ]]; then
               echo "Not uploading artifacts or posting install comment for this branch."
               circleci-agent step halt
             fi

cli/scripts/build.js

@@ -31,6 +31,7 @@ function preparePackageForNpmRelease (json) {
   delete json['private']
   // no need to include "nyc" code coverage settings
   delete json.nyc
+  delete json.workspaces
 
   _.extend(json, {
     version,

npm/eslint-plugin-dev/lib/custom-rules/index.js

@@ -2,6 +2,7 @@ const fs = require('fs')
 const path = require('path')
 
 module.exports =
+  // eslint-disable-next-line no-restricted-syntax
   Object.assign({}, ...fs.readdirSync(__dirname)
   .filter((filename) => filename.endsWith('.js') && filename !== 'index.js')
   .map((filename) => ({ [filename.replace(/\.js$/u, '')]: require(path.resolve(__dirname, filename)) })))

npm/vite-dev-server/cypress/e2e/vite-dev-server.cy.ts

@@ -38,7 +38,7 @@ describe('Config options', () => {
     cy.startAppServer('component')
 
     cy.withCtx(async (ctx, { specWithWhitespace }) => {
-      ctx.actions.file.writeFileInProject(
+      await ctx.actions.file.writeFileInProject(
         ctx.path.join('src', specWithWhitespace),
         await ctx.file.readFileInProject(ctx.path.join('src', 'App.cy.jsx')),
       )

npm/vite-dev-server/src/plugins/cypress.ts

@@ -38,6 +38,8 @@ export const Cypress = (
   const indexHtmlFile = options.cypressConfig.indexHtmlFile
 
   let specsPathsSet = getSpecsPathsSet(specs)
+  // TODO: use async fs methods here
+  // eslint-disable-next-line no-restricted-syntax
   let loader = fs.readFileSync(INIT_FILEPATH, 'utf8')
 
   devServerEvents.on('dev-server:specs:changed', (specs: Spec[]) => {

npm/webpack-dev-server/src/CypressCTWebpackPlugin.ts

@@ -99,13 +99,15 @@ export class CypressCTWebpackPlugin {
    * has been "updated on disk", causing a recompliation (and pulling the new specs in as
    * dependencies).
    */
-  private onSpecsChange = (specs: Cypress.Cypress['spec'][]) => {
+  private onSpecsChange = async (specs: Cypress.Cypress['spec'][]) => {
     if (!this.compilation || _.isEqual(specs, this.files)) {
       return
     }
 
     this.files = specs
     const inputFileSystem = this.compilation.inputFileSystem
+    // TODO: don't use a sync fs method here
+    // eslint-disable-next-line no-restricted-syntax
     const utimesSync: UtimesSync = inputFileSystem.fileSystem.utimesSync ?? fs.utimesSync
 
     utimesSync(path.resolve(__dirname, 'browser.js'), new Date(), new Date())

npm/webpack-dev-server/src/helpers/nextHandler.ts

@@ -69,7 +69,7 @@ async function loadWebpackConfig (devServerConfig: WebpackDevServerConfig): Prom
       buildId: `@cypress/react-${Math.random().toString()}`,
       config: nextConfig,
       dev: true,
-      pagesDir: findPagesDir(devServerConfig.cypressConfig.projectRoot),
+      pagesDir: await findPagesDir(devServerConfig.cypressConfig.projectRoot),
       entrypoints: {},
       rewrites: { fallback: [], afterFiles: [], beforeFiles: [] },
       ...runWebpackSpan,
@@ -106,9 +106,9 @@ function checkSWC (
   return false
 }
 
-const existsSync = (file: string) => {
+const exists = async (file: string) => {
   try {
-    fs.accessSync(file, fs.constants.F_OK)
+    await fs.promises.access(file, fs.constants.F_OK)
 
     return true
   } catch (_) {
@@ -121,16 +121,16 @@ const existsSync = (file: string) => {
  * `${projectRoot}/pages` or `${projectRoot}/src/pages`.
  * If neither is found, return projectRoot
  */
-function findPagesDir (projectRoot: string) {
+async function findPagesDir (projectRoot: string) {
   // prioritize ./pages over ./src/pages
   let pagesDir = path.join(projectRoot, 'pages')
 
-  if (existsSync(pagesDir)) {
+  if (await exists(pagesDir)) {
     return pagesDir
   }
 
   pagesDir = path.join(projectRoot, 'src', 'pages')
-  if (existsSync(pagesDir)) {
+  if (await exists(pagesDir)) {
     return pagesDir
   }
 

npm/webpack-dev-server/src/measureWebpackPerformance.ts

@@ -1,3 +1,4 @@
+/* eslint-disable no-restricted-syntax */
 /* eslint-disable no-console */
 import path from 'path'
 import fs from 'fs'

npm/webpack-preprocessor/package.json

@@ -11,7 +11,7 @@
     "secure": "nsp check",
     "semantic-release": "semantic-release",
     "size": "npm pack --dry",
-    "test": "node ./test-webpack-5.js",
+    "test": "node ./scripts/test-webpack-5.js",
     "test-debug": "node --inspect --debug-brk ./node_modules/.bin/_mocha",
     "test-e2e": "mocha test/e2e/*.spec.*",
     "test-unit": "mocha test/unit/*.spec.*",