wip changes post main merge

package.json

@@ -15,8 +15,6 @@
     "build:watch": "lerna run build:watch --parallel; tsc --build",
     "check": "yarn node ./tasks/check/check.mjs",
     "clean:prisma": "rimraf node_modules/.prisma/client && node node_modules/@prisma/client/scripts/postinstall.js",
-    "deps:dist": "cd ${INIT_CWD} && depcruise dist --config ${PROJECT_CWD}/.dependency-cruiser.mjs --output-type dot | dot -T svg > dependencyGraphDist.svg && echo \"Dependency graph written to ${INIT_CWD}/dependencyGraphDist.svg\"",
-    "deps:src": "cd ${INIT_CWD} && depcruise src --config ${PROJECT_CWD}/.dependency-cruiser.mjs --output-type dot --exclude \"^src/__tests__\" | dot -T svg > dependencyGraphSrc.svg && echo \"Dependency graph written to ${INIT_CWD}/dependencyGraphSrc.svg\"",
     "e2e": "node ./tasks/run-e2e",
     "generate-dependency-graph": "node ./tasks/generateDependencyGraph.mjs",
     "lint": "RWJS_CWD=packages/create-redwood-app/templates/ts eslint --config .eslintrc.js --ignore-pattern Routes.jsx packages",

packages/cli-packages/dataMigrate/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@redwoodjs/cli-data-migrate",
-  "bin": {
-    "up": "./dist/index.js"
-  },
-  "version": "5.0.0",
+  "version": "6.0.7",
   "repository": {
     "type": "git",
     "url": "https://github.com/redwoodjs/redwood.git",
     "directory": "packages/cli-packages/storybook"
   },
   "license": "MIT",
+  "bin": {
+    "up": "./dist/index.js"
+  },
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "files": [
@@ -24,9 +24,9 @@
     "prepack": "NODE_ENV=production yarn build"
   },
   "dependencies": {
-    "@redwoodjs/internal": "5.0.0",
-    "@redwoodjs/project-config": "5.0.0",
-    "@redwoodjs/telemetry": "5.0.0",
+    "@redwoodjs/internal": "6.0.7",
+    "@redwoodjs/project-config": "6.0.7",
+    "@redwoodjs/telemetry": "6.0.7",
     "chalk": "4.1.2",
     "execa": "5.1.1",
     "fs-extra": "11.1.1",
@@ -35,12 +35,12 @@
     "yargs": "17.7.2"
   },
   "devDependencies": {
-    "@prisma/client": "4.15.0",
+    "@prisma/client": "5.1.1",
     "@types/fs-extra": "11.0.1",
     "@types/yargs": "17.0.24",
-    "esbuild": "0.18.2",
-    "fast-glob": "3.2.12",
-    "typescript": "5.1.3"
+    "esbuild": "0.18.19",
+    "fast-glob": "3.3.1",
+    "typescript": "5.1.6"
   },
   "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
 }

packages/cli-packages/dataMigrate/src/commands/install.ts

@@ -1,6 +1,8 @@
 import terminalLink from 'terminal-link'
 import type { Argv } from 'yargs'
 
+import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
+
 export const command = 'install'
 export const description = 'Add the RW_DataMigration model to your schema'
 
@@ -14,8 +16,12 @@ export function builder(yargs: Argv): Argv {
 }
 
 export async function handler(): Promise<void> {
+  recordTelemetryAttributes({
+    command: 'data-migrate install',
+  })
+
   const { handler: dataMigrateInstallHandler } = await import(
     './installHandler.js'
   )
-  await dataMigrateInstallHandler
+  await dataMigrateInstallHandler()
 }

packages/cli-packages/dataMigrate/src/commands/up.ts

@@ -1,6 +1,7 @@
 import terminalLink from 'terminal-link'
 import type { Argv } from 'yargs'
 
+import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers'
 import { getPaths } from '@redwoodjs/project-config'
 
 import { DataMigrateUpYargsOptions } from '../types'
@@ -34,6 +35,11 @@ export function builder(yargs: Argv): Argv {
 export async function handler(
   options: DataMigrateUpYargsOptions
 ): Promise<void> {
+  recordTelemetryAttributes({
+    command: 'data-migrate up',
+    dbFromDist: options.importDbClientFromDist,
+  })
+
   const { handler: dataMigrateUpHandler } = await import('./upHandler.js')
   await dataMigrateUpHandler(options)
 }

packages/cli-packages/storybook/build.mjs

@@ -4,7 +4,7 @@ import * as esbuild from 'esbuild'
 import fg from 'fast-glob'
 
 // Get source files
-const sourceFiles = fg.sync(['./src/**/*.ts'], { ignore: ['./src/types.ts'] })
+const sourceFiles = fg.sync(['./src/**/*.ts'])
 
 // Build general source files
 const result = await esbuild.build({

packages/cli-packages/storybook/tsconfig.json

@@ -1,10 +1,10 @@
 {
   "extends": "../../../tsconfig.compilerOption.json",
   "compilerOptions": {
-    "emitDeclarationOnly": false,
-    "noEmit": true,
     "baseUrl": ".",
     "rootDir": "src",
+    "tsBuildInfoFile": "dist/tsconfig.tsbuildinfo",
+    "outDir": "dist"
   },
   "include": ["src"],
 }