chore(node): Fix DEP0190 (#506)

Author: Tobbe

package.json

@@ -31,10 +31,14 @@
     "install:ci": "concurrently -g -c auto -n install:fw:ci \"yarn install --inline-builds\" npm:install:crwrsca:ci",
     "install:crwrsca": "yarn --cwd packages/create-cedar-rsc-app install",
     "install:crwrsca:ci": "yarn --cwd packages/create-cedar-rsc-app install --inline-builds",
-    "lint": "concurrently -c auto npm:lint:fw npm:lint:crwrsca",
+    "lint": "concurrently -c auto npm:lint:fw npm:lint:templates npm:lint:crwrsca",
     "lint:crwrsca": "yarn --cwd packages/create-cedar-rsc-app run lint",
-    "lint:fix": "yarn lint --fix",
-    "lint:fw": "cross-env RWJS_CWD=packages/create-cedar-app/templates/ts eslint --config .eslintrc.js --ignore-pattern Routes.jsx --ignore-pattern create-cedar-rsc-app packages",
+    "lint:crwrsca:fix": "yarn --cwd packages/create-cedar-rsc-app run lint --fix",
+    "lint:fix": "concurrently -c auto npm:lint:fw:fix npm:lint:templates:fix npm:lint:crwrsca:fix",
+    "lint:fw": "eslint --config .eslintrc.js --ignore-pattern Routes.jsx --ignore-pattern create-cedar-rsc-app --ignore-pattern packages/create-cedar-app/templates --no-eslintrc packages",
+    "lint:fw:fix": "eslint --config .eslintrc.js --ignore-pattern Routes.jsx --ignore-pattern create-cedar-rsc-app --ignore-pattern packages/create-cedar-app/templates --no-eslintrc packages --fix",
+    "lint:templates": "concurrently -c auto \"cd packages/create-cedar-app/templates/ts && npx eslint .\" \"cd packages/create-cedar-app/templates/js && npx eslint .\" \"cd packages/create-cedar-app/templates/esm-ts && npx eslint .\" \"cd packages/create-cedar-app/templates/esm-js && npx eslint .\"",
+    "lint:templates:fix": "concurrently -c auto \"cd packages/create-cedar-app/templates/ts && npx eslint . --fix\" \"cd packages/create-cedar-app/templates/js && npx eslint . --fix\" \"cd packages/create-cedar-app/templates/esm-ts && npx eslint . --fix\" \"cd packages/create-cedar-app/templates/esm-js && npx eslint . --fix\"",
     "project:copy": "node ./tasks/framework-tools/frameworkFilesToProject.mjs",
     "project:deps": "node ./tasks/framework-tools/frameworkDepsToProject.mjs",
     "project:sync": "node ./tasks/framework-tools/frameworkSyncToProject.mjs",

packages/cli/src/commands/__tests__/test.test.js

@@ -39,7 +39,8 @@ afterEach(() => {
 test('Runs tests for all available sides if no filter passed', async () => {
   await handler({})
 
-  expect(execa.mock.results[0].value.cmd).toBe('yarn jest')
+  expect(execa.mock.results[0].value.cmd).toBe('yarn')
+  expect(execa.mock.results[0].value.params).toContain('jest')
   expect(execa.mock.results[0].value.params).toContain('web')
   expect(execa.mock.results[0].value.params).toContain('api')
 })
@@ -50,9 +51,10 @@ test('Syncs or creates test database when the flag --db-push is set to true', as
     dbPush: true,
   })
 
-  expect(execa.mock.results[0].value.cmd).toBe('yarn jest')
-
-  expect(execa.mock.results[0].value.params).toContain('--projects', 'api')
+  expect(execa.mock.results[0].value.cmd).toBe('yarn')
+  expect(execa.mock.results[0].value.params).toContain('jest')
+  expect(execa.mock.results[0].value.params).toContain('--projects')
+  expect(execa.mock.results[0].value.params).toContain('api')
 })
 
 test('Skips test database sync/creation when the flag --db-push is set to false', async () => {
@@ -61,15 +63,17 @@ test('Skips test database sync/creation when the flag --db-push is set to false'
     dbPush: false,
   })
 
-  expect(execa.mock.results[0].value.cmd).toBe('yarn jest')
+  expect(execa.mock.results[0].value.cmd).toBe('yarn')
+  expect(execa.mock.results[0].value.params).toContain('jest')
 })
 
 test('Runs tests for all available sides if no side filter passed', async () => {
   await handler({
     filter: ['bazinga'],
   })
 
-  expect(execa.mock.results[0].value.cmd).toBe('yarn jest')
+  expect(execa.mock.results[0].value.cmd).toBe('yarn')
+  expect(execa.mock.results[0].value.params).toContain('jest')
   expect(execa.mock.results[0].value.params).toContain('bazinga')
   expect(execa.mock.results[0].value.params).toContain('web')
   expect(execa.mock.results[0].value.params).toContain('api')
@@ -83,7 +87,8 @@ test('Runs tests specified side if even with additional filters', async () => {
   expect(execa.mock.results[0].value.cmd).not.toBe('yarn rw')
   expect(execa.mock.results[0].value.params).not.toContain('api')
 
-  expect(execa.mock.results[0].value.cmd).toBe('yarn jest')
+  expect(execa.mock.results[0].value.cmd).toBe('yarn')
+  expect(execa.mock.results[0].value.params).toContain('jest')
   expect(execa.mock.results[0].value.params).toContain('bazinga')
   expect(execa.mock.results[0].value.params).toContain('web')
 })
@@ -93,15 +98,17 @@ test('Does not create db when calling test with just web', async () => {
     filter: ['web'],
   })
 
-  expect(execa.mock.results[0].value.cmd).toBe('yarn jest')
+  expect(execa.mock.results[0].value.cmd).toBe('yarn')
+  expect(execa.mock.results[0].value.params).toContain('jest')
 })
 
 test('Passes filter param to jest command if passed', async () => {
   await handler({
     filter: ['web', 'bazinga'],
   })
 
-  expect(execa.mock.results[0].value.cmd).toBe('yarn jest')
+  expect(execa.mock.results[0].value.cmd).toBe('yarn')
+  expect(execa.mock.results[0].value.params).toContain('jest')
   expect(execa.mock.results[0].value.params).toContain('bazinga')
 })
 
@@ -113,7 +120,8 @@ test('Passes other flags to jest', async () => {
     collectCoverage: true,
   })
 
-  expect(execa.mock.results[0].value.cmd).toBe('yarn jest')
+  expect(execa.mock.results[0].value.cmd).toBe('yarn')
+  expect(execa.mock.results[0].value.params).toContain('jest')
   expect(execa.mock.results[0].value.params).toContain('-u')
   expect(execa.mock.results[0].value.params).toContain('--debug')
   expect(execa.mock.results[0].value.params).toContain('--json')
@@ -127,7 +135,8 @@ test('Passes values of other flags to jest', async () => {
   })
 
   // Second command because api side runs
-  expect(execa.mock.results[0].value.cmd).toBe('yarn jest')
+  expect(execa.mock.results[0].value.cmd).toBe('yarn')
+  expect(execa.mock.results[0].value.params).toContain('jest')
 
   // Note that these below tests aren't the best, since they don't check for order
   // But I'm making sure only 2 extra params get passed

packages/cli/src/commands/__tests__/testEsm.test.js

@@ -28,7 +28,8 @@ afterEach(() => {
 test('Runs tests for all available sides if no filter passed', async () => {
   await handler({})
 
-  expect(execa.mock.results[0].value.cmd).toBe('yarn vitest')
+  expect(execa.mock.results[0].value.cmd).toBe('yarn')
+  expect(execa.mock.results[0].value.params).toContain('vitest')
   expect(execa.mock.results[0].value.params).toContain('web')
   expect(execa.mock.results[0].value.params).toContain('api')
 })
@@ -39,8 +40,9 @@ test('Syncs or creates test database when the flag --db-push is set to true', as
     dbPush: true,
   })
 
-  expect(execa.mock.results[0].value.cmd).toBe('yarn vitest')
+  expect(execa.mock.results[0].value.cmd).toBe('yarn')
 
+  expect(execa.mock.results[0].value.params).toContain('vitest')
   expect(execa.mock.results[0].value.params).toEqual(
     expect.arrayContaining(['--project', 'api']),
   )
@@ -52,15 +54,17 @@ test('Skips test database sync/creation when the flag --db-push is set to false'
     dbPush: false,
   })
 
-  expect(execa.mock.results[0].value.cmd).toBe('yarn vitest')
+  expect(execa.mock.results[0].value.cmd).toBe('yarn')
+  expect(execa.mock.results[0].value.params).toContain('vitest')
 })
 
 test('Runs tests for all available sides if no side filter passed', async () => {
   await handler({
     filter: ['bazinga'],
   })
 
-  expect(execa.mock.results[0].value.cmd).toBe('yarn vitest')
+  expect(execa.mock.results[0].value.cmd).toBe('yarn')
+  expect(execa.mock.results[0].value.params).toContain('vitest')
   expect(execa.mock.results[0].value.params).toContain('bazinga')
   expect(execa.mock.results[0].value.params).toContain('web')
   expect(execa.mock.results[0].value.params).toContain('api')
@@ -74,7 +78,8 @@ test('Runs tests specified side even with additional filters', async () => {
   expect(execa.mock.results[0].value.cmd).not.toBe('yarn rw')
   expect(execa.mock.results[0].value.params).not.toContain('api')
 
-  expect(execa.mock.results[0].value.cmd).toBe('yarn vitest')
+  expect(execa.mock.results[0].value.cmd).toBe('yarn')
+  expect(execa.mock.results[0].value.params).toContain('vitest')
   expect(execa.mock.results[0].value.params).toContain('bazinga')
   expect(execa.mock.results[0].value.params).toContain('web')
 })
@@ -84,15 +89,17 @@ test('Does not create db when calling test with just web', async () => {
     filter: ['web'],
   })
 
-  expect(execa.mock.results[0].value.cmd).toBe('yarn vitest')
+  expect(execa.mock.results[0].value.cmd).toBe('yarn')
+  expect(execa.mock.results[0].value.params).toContain('vitest')
 })
 
 test('Passes filter param to vitest command if passed', async () => {
   await handler({
     filter: ['web', 'bazinga'],
   })
 
-  expect(execa.mock.results[0].value.cmd).toBe('yarn vitest')
+  expect(execa.mock.results[0].value.cmd).toBe('yarn')
+  expect(execa.mock.results[0].value.params).toContain('vitest')
   expect(execa.mock.results[0].value.params).toContain('bazinga')
 })
 
@@ -105,7 +112,8 @@ test('Passes other flags to vitest', async () => {
     watch: true,
   })
 
-  expect(execa.mock.results[0].value.cmd).toBe('yarn vitest')
+  expect(execa.mock.results[0].value.cmd).toBe('yarn')
+  expect(execa.mock.results[0].value.params).toContain('vitest')
   expect(execa.mock.results[0].value.params).toContain('-u')
   expect(execa.mock.results[0].value.params).toContain('--debug')
   expect(execa.mock.results[0].value.params).toContain('--json')
@@ -120,7 +128,8 @@ test('Passes values of other flags to vitest', async () => {
   })
 
   // Second command because api side runs
-  expect(execa.mock.results[0].value.cmd).toBe('yarn vitest')
+  expect(execa.mock.results[0].value.cmd).toBe('yarn')
+  expect(execa.mock.results[0].value.params).toContain('vitest')
 
   // Note that these below tests aren't the best, since they don't check for order
   // But I'm making sure only 2 extra params get passed

packages/cli/src/commands/generate.js

@@ -28,11 +28,10 @@ export const description = 'Generate boilerplate code and type definitions'
 export const builder = (yargs) =>
   yargs
     .command('types', 'Generate supplementary code', {}, () => {
-      recordTelemetryAttributes({
-        command: 'generate types',
-      })
+      recordTelemetryAttributes({ command: 'generate types' })
+
       try {
-        execa.sync('yarn rw-gen', { shell: true, stdio: 'inherit' })
+        execa.sync('yarn', ['rw-gen'], { stdio: 'inherit' })
       } catch (error) {
         // rw-gen is responsible for logging its own errors but we need to
         // make sure we exit with a non-zero exit code

packages/cli/src/commands/generate/directive/directiveHandler.js

@@ -153,15 +153,10 @@ export const handler = async (args) => {
         task: () => {
           // Regenerate again at the end if we rollback changes
           addFunctionToRollback(async () => {
-            await execa('yarn rw-gen', [], {
-              stdio: 'pipe',
-              shell: true,
-            })
+            await execa('yarn', ['rw-gen'], { stdio: 'pipe' })
           }, true)
-          return execa('yarn rw-gen', [], {
-            stdio: 'inherit',
-            shell: true,
-          })
+
+          return execa('yarn', ['rw-gen'], { stdio: 'inherit' })
         },
       },
       {

packages/cli/src/commands/lint.js

@@ -40,24 +40,23 @@ export const handler = async ({ path, fix, format }) => {
   try {
     const pathString = path?.join(' ')
     const sbPath = getPaths().web.storybook
-    const result = await execa(
-      'yarn eslint',
-      [
-        fix && '--fix',
-        `--format ${format}`,
-        !pathString && fs.existsSync(getPaths().web.src) && 'web/src',
-        !pathString && fs.existsSync(getPaths().web.config) && 'web/config',
-        !pathString && fs.existsSync(sbPath) && 'web/.storybook',
-        !pathString && fs.existsSync(getPaths().scripts) && 'scripts',
-        !pathString && fs.existsSync(getPaths().api.src) && 'api/src',
-        pathString,
-      ].filter(Boolean),
-      {
-        cwd: getPaths().base,
-        shell: true,
-        stdio: 'inherit',
-      },
-    )
+    const args = [
+      'eslint',
+      fix && '--fix',
+      '--format',
+      format,
+      !pathString && fs.existsSync(getPaths().web.src) && 'web/src',
+      !pathString && fs.existsSync(getPaths().web.config) && 'web/config',
+      !pathString && fs.existsSync(sbPath) && 'web/.storybook',
+      !pathString && fs.existsSync(getPaths().scripts) && 'scripts',
+      !pathString && fs.existsSync(getPaths().api.src) && 'api/src',
+      pathString,
+    ].filter(Boolean)
+
+    const result = await execa('yarn', args, {
+      cwd: getPaths().base,
+      stdio: 'inherit',
+    })
 
     process.exitCode = result.exitCode
   } catch (error) {

packages/cli/src/commands/prismaHandler.js

@@ -70,16 +70,12 @@ export const handler = async ({ _, $0, commands = [], ...options }) => {
   console.log()
 
   try {
-    execa.sync(
-      `"${path.join(rwjsPaths.base, 'node_modules/.bin/prisma')}"`,
-      args,
-      {
-        shell: true,
-        cwd: rwjsPaths.base,
-        stdio: 'inherit',
-        cleanup: true,
-      },
-    )
+    const prismaBin = path.join(rwjsPaths.base, 'node_modules/.bin/prisma')
+    execa.sync(prismaBin, args, {
+      cwd: rwjsPaths.base,
+      stdio: 'inherit',
+      cleanup: true,
+    })
 
     if (hasHelpOption || commands.length === 0) {
       printWrapInfo()

packages/cli/src/commands/serveBothHandler.js

@@ -25,7 +25,6 @@ export const bothServerFileHandler = async (argv) => {
     await execa('yarn', ['rw-serve-fe'], {
       cwd: getPaths().web.base,
       stdio: 'inherit',
-      shell: true,
     })
   } else {
     argv.apiPort ??= getAPIPort()
@@ -91,7 +90,6 @@ export const bothSsrRscServerHandler = async (argv, rscEnabled) => {
   const fePromise = execa('yarn', ['rw-serve-fe'], {
     cwd: getPaths().web.base,
     stdio: 'inherit',
-    shell: true,
     env: rscEnabled
       ? {
           // TODO (RSC): Is this how we want to do it? If so, we need to find a way

packages/cli/src/commands/serveWebHandler.js

@@ -6,7 +6,6 @@ export const webSsrServerHandler = async (rscEnabled) => {
   await execa('yarn', ['rw-serve-fe'], {
     cwd: getPaths().web.base,
     stdio: 'inherit',
-    shell: true,
     env: rscEnabled
       ? {
           // TODO (RSC): Is this how we want to do it? If so, we need to find a way

packages/cli/src/commands/testHandler.js

@@ -151,9 +151,8 @@ export const handler = async ({
     // so we're running it via execa, since `jest.run()` is a bit unstable.
     // https://github.com/facebook/jest/issues/5048
     const runCommand = async () => {
-      await execa('yarn jest', jestArgs, {
+      await execa('yarn', ['jest', ...jestArgs], {
         cwd: rwjsPaths.base,
-        shell: true,
         stdio: 'inherit',
         env: { DATABASE_URL },
       })