Merge branch 'main' into feat/703-minute-support-in-duration

package.json

@@ -13,9 +13,6 @@
       "globals": [
         "./build/globals.d.ts"
       ],
-      "experimental": [
-        "./build/experimental.d.ts"
-      ],
       "cli": [
         "./build/cli.d.ts"
       ],
@@ -27,7 +24,6 @@
   "exports": {
     ".": "./build/index.js",
     "./globals": "./build/globals.js",
-    "./experimental": "./build/experimental.js",
     "./cli": "./build/cli.js",
     "./core": "./build/core.js",
     "./package.json": "./package.json"
@@ -81,7 +77,6 @@
     "prettier": "^3.2.5",
     "tsd": "^0.30.7",
     "typescript": "^5.4.3",
-    "webpod": "^1",
     "which": "^4.0.0",
     "yaml": "^2.4.1",
     "zurk": "^0.0.32"

scripts/build-dts.mjs

@@ -32,7 +32,6 @@ const entry = {
       'node-fetch-native',
       'chalk',
       'globby',
-      'webpod',
       '@types/minimist',
       '@types/which',
       'zurk',

src/cli.ts

@@ -44,7 +44,6 @@ function printUsage() {
    --prefix=<command>   prefix all commands
    --eval=<js>, -e      evaluate script 
    --install, -i        install dependencies
-   --experimental       enable experimental features
    --version, -v        print current zx version
    --help, -h           print help
    --repl               start repl
@@ -53,15 +52,7 @@ function printUsage() {
 
 const argv = minimist(process.argv.slice(2), {
   string: ['shell', 'prefix', 'eval'],
-  boolean: [
-    'version',
-    'help',
-    'quiet',
-    'verbose',
-    'install',
-    'repl',
-    'experimental',
-  ],
+  boolean: ['version', 'help', 'quiet', 'verbose', 'install', 'repl'],
   alias: { e: 'eval', i: 'install', v: 'version', h: 'help' },
   stopEarly: true,
 })
@@ -73,9 +64,6 @@ await (async function main() {
   if (argv.quiet) $.verbose = false
   if (argv.shell) $.shell = argv.shell
   if (argv.prefix) $.prefix = argv.prefix
-  if (argv.experimental) {
-    Object.assign(global, await import('./experimental.js'))
-  }
   if (argv.version) {
     console.log(getVersion())
     return

src/globals.ts

@@ -42,7 +42,6 @@ declare global {
   var retry: typeof _.retry
   var sleep: typeof _.sleep
   var spinner: typeof _.spinner
-  var ssh: typeof _.ssh
   var stdin: typeof _.stdin
   var which: typeof _.which
   var within: typeof _.within

src/index.ts

@@ -16,7 +16,7 @@ import { ProcessPromise } from './core.js'
 
 export * from './core.js'
 export * from './goods.js'
-export { minimist, chalk, fs, which, YAML, ssh, ps } from './vendor.js'
+export { minimist, chalk, fs, which, YAML, ps } from './vendor.js'
 
 export { type Duration, quote, quotePowerShell } from './util.js'
 

src/vendor.ts

@@ -56,4 +56,3 @@ export { default as chalk, type ChalkInstance } from 'chalk'
 export { default as which } from 'which'
 export { default as minimist } from 'minimist'
 export { default as ps } from '@webpod/ps'
-export { ssh } from 'webpod'

test/all.test.js

@@ -15,7 +15,6 @@
 import './cli.test.js'
 import './core.test.js'
 import './deps.test.js'
-import './experimental.test.js'
 import './extra.test.js'
 import './global.test.js'
 import './goods.test.js'

test/index.test.js

@@ -29,7 +29,6 @@ import {
   fs,
   which,
   YAML,
-  ssh,
   ps,
   quote,
   quotePowerShell,
@@ -88,7 +87,6 @@ describe('index', () => {
     assert(fs)
     assert(which)
     assert(YAML)
-    assert(ssh)
     assert(ps)
 
     // utils