@trpc/upgrade 0.0.0-alpha.12 → 0.0.0-alpha.14

package/dist/cli.cjs

@@ -1,19 +1,14 @@
 #!/usr/bin/env node
-var path = require('path');
 var cli$1 = require('@effect/cli');
 var platform = require('@effect/platform');
 var platformNode = require('@effect/platform-node');
 var effect = require('effect');
 var typescript = require('typescript');
 
-function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
-
-var path__default = /*#__PURE__*/_interopDefault(path);
-
-var version = "0.0.0-alpha.11";
+var version = "0.0.0-alpha.14";
 
 const MakeCommand = (command, ...args)=>{
-    return platform.Command.workingDirectory(process.cwd())(platform.Command.make(command, ...args));
+    return platform.Command.make(command, ...args).pipe(platform.Command.workingDirectory(process.cwd()), platform.Command.runInShell(true));
 };
 const assertCleanGitTree = platform.Command.string(MakeCommand('git', 'status')).pipe().pipe(effect.Effect.filterOrFail(effect.String.includes('nothing to commit'), ()=>'Git tree is not clean, please commit your changes and try again, or run with `--force`'));
 const getPackageManager = ()=>effect.Match.value(process.env.npm_config_user_agent ?? 'npm').pipe(effect.Match.when(effect.String.startsWith('pnpm'), ()=>'pnpm'), effect.Match.when(effect.String.startsWith('yarn'), ()=>'yarn'), effect.Match.when(effect.String.startsWith('bun'), ()=>'bun'), effect.Match.orElse(()=>'npm'));
@@ -27,11 +22,11 @@ const uninstallPackage = (packageName)=>{
     return platform.Command.streamLines(MakeCommand(packageManager, uninstallCmd, packageName)).pipe(effect.Stream.mapEffect(effect.Console.log), effect.Stream.runDrain);
 };
 const filterIgnored = (files)=>effect.Effect.gen(function*() {
-        const ignores = yield* platform.Command.string(MakeCommand('git check-ignore **/*')).pipe(effect.Effect.tap((_)=>effect.Effect.logDebug('Ignored files output:', _)), effect.Effect.map((_)=>_.split('\n')));
+        const ignores = yield* platform.Command.string(MakeCommand('git', 'check-ignore', '**/*').pipe(platform.Command.runInShell(true))).pipe(effect.Effect.tap((_)=>effect.Effect.logDebug('Ignored files output:', _)), effect.Effect.map((_)=>_.split('\n')));
         yield* effect.Effect.logDebug('All files in program:', files.map((_)=>_.fileName));
         yield* effect.Effect.logDebug('Ignored files:', ignores);
         // Ignore "common files"
-        const filteredSourcePaths = files.filter((source)=>source.fileName.startsWith(path__default.default.resolve()) && // only look ahead of current directory
+        const filteredSourcePaths = files.filter((source)=>source.fileName.startsWith(process.cwd()) && // only look ahead of current directory
             !source.fileName.includes('/trpc/packages/') && // relative paths when running codemod locally
             !ignores.includes(source.fileName)).map((source)=>source.fileName);
         yield* effect.Effect.logDebug('Filtered files:', filteredSourcePaths);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/upgrade",
-  "version": "0.0.0-alpha.12",
+  "version": "0.0.0-alpha.14",
   "description": "Upgrade scripts for tRPC",
   "author": "juliusmarminge",
   "license": "MIT",

package/src/bin/cli.ts

@@ -27,8 +27,9 @@ import {
 import { version } from '../../package.json';
 
 const MakeCommand = (command: string, ...args: string[]) => {
-  return Command.workingDirectory(process.cwd())(
-    Command.make(command, ...args),
+  return Command.make(command, ...args).pipe(
+    Command.workingDirectory(process.cwd()),
+    Command.runInShell(true),
   );
 };
 
@@ -67,7 +68,7 @@ const uninstallPackage = (packageName: string) => {
 const filterIgnored = (files: readonly SourceFile[]) =>
   Effect.gen(function* () {
     const ignores = yield* Command.string(
-      MakeCommand('git check-ignore **/*'),
+      MakeCommand('git', 'check-ignore', '**/*').pipe(Command.runInShell(true)),
     ).pipe(
       Effect.tap((_) => Effect.logDebug('Ignored files output:', _)),
       Effect.map((_) => _.split('\n')),
@@ -83,7 +84,7 @@ const filterIgnored = (files: readonly SourceFile[]) =>
     const filteredSourcePaths = files
       .filter(
         (source) =>
-          source.fileName.startsWith(path.resolve()) && // only look ahead of current directory
+          source.fileName.startsWith(process.cwd()) && // only look ahead of current directory
           !source.fileName.includes('/trpc/packages/') && // relative paths when running codemod locally
           !ignores.includes(source.fileName), // ignored files
       )