fix: add dotenv-defaults, start plugging into cli

redwoodjs · Aug 30, 2023 · 4dc4e35 · 4dc4e35
1 parent 2d6b93d
commit 4dc4e35
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 16 deletions.
diff --git a/packages/cli-packages/dataMigrate/e2eTest.mjs b/packages/cli-packages/dataMigrate/e2eTest.mjs
@@ -118,8 +118,6 @@ await execa.command('yarn rw g data-migration test', {
   stdio: 'inherit',
 })
 
-await execa.command('yarn rw data-migrate up', {
-  stdio: 'inherit',
-})
+await execa.command(command)
 
 // check that up worked...
diff --git a/packages/cli-packages/dataMigrate/package.json b/packages/cli-packages/dataMigrate/package.json
@@ -29,6 +29,7 @@
     "@redwoodjs/project-config": "6.0.7",
     "@redwoodjs/telemetry": "6.0.7",
     "chalk": "4.1.2",
+    "dotenv-defaults": "5.0.2",
     "execa": "5.1.1",
     "fs-extra": "11.1.1",
     "listr2": "6.6.0",

diff --git a/packages/cli-packages/dataMigrate/src/bin.ts b/packages/cli-packages/dataMigrate/src/bin.ts
@@ -1,9 +1,21 @@
+import path from 'path'
+
+// @ts-expect-error other packages use this and don't provide the types
+import { config } from 'dotenv-defaults'
 import { hideBin } from 'yargs/helpers'
 import yargs from 'yargs/yargs'
 
+import { getPaths } from '@redwoodjs/project-config'
+
 import { description, builder } from './commands/up'
 import { handler } from './commands/upHandler'
 
+config({
+  path: path.join(getPaths().base, '.env'),
+  defaults: path.join(getPaths().base, '.env.defaults'),
+  multiline: true,
+})
+
 yargs(hideBin(process.argv))
   .scriptName('data-migrate')
   // @ts-expect-error not sure why

diff --git a/packages/cli-packages/dataMigrate/src/index.ts b/packages/cli-packages/dataMigrate/src/index.ts
@@ -1,3 +1,6 @@
+import terminalLink from 'terminal-link'
+import type { Argv } from 'yargs'
+
 import {
   command as installCommand,
   description as installDescription,
@@ -11,17 +14,28 @@ import {
   handler as upHandler,
 } from './commands/up'
 
+const command = 'data-migrate <command>'
+const aliases = ['dataMigrate', 'dm']
+const description = 'Migrate the data in your database'
+
+function builder(yargs: Argv) {
+  yargs
+    .command(installCommand, installDescription, installBuilder, installHandler)
+    // @ts-expect-error wip
+    .command(upCommand, upDescription, upBuilder, upHandler)
+    .epilogue(
+      `Also see the ${terminalLink(
+        'Redwood CLI Reference',
+        'https://redwoodjs.com/docs/cli-commands#datamigrate'
+      )}`
+    )
+}
+
 export const commands = [
   {
-    command: installCommand,
-    description: installDescription,
-    builder: installBuilder,
-    handler: installHandler,
-  },
-  {
-    command: upCommand,
-    description: upDescription,
-    builder: upBuilder,
-    handler: upHandler,
+    command,
+    aliases,
+    description,
+    builder,
   },
 ]
diff --git a/packages/cli/src/plugin.js b/packages/cli/src/plugin.js
@@ -19,6 +19,12 @@ const PLUGIN_CACHE_DEFAULT = {
         'Launch Storybook: a tool for building UI components and pages in isolation',
     },
   },
+  '@redwoodjs/cli-data-migrate': {
+    'data-migrate': {
+      aliases: ['dataMigrate', 'dm'],
+      description: 'Migrate the data in your database',
+    },
+  },
 }
 
 const PLUGIN_CACHE_BUILTIN = [
@@ -27,9 +33,6 @@ const PLUGIN_CACHE_BUILTIN = [
   'diagnostics',
   'console',
   'c',
-  'data-migrate',
-  'dm',
-  'dataMigrate',
   'deploy',
   'destroy',
   'd',

diff --git a/yarn.lock b/yarn.lock
@@ -7876,6 +7876,7 @@ __metadata:
     "@types/fs-extra": 11.0.1
     "@types/yargs": 17.0.24
     chalk: 4.1.2
+    dotenv-defaults: 5.0.2
     esbuild: 0.18.19
     execa: 5.1.1
     fast-glob: 3.3.1