Merge branch 'main' into zx-lite-publish

Author: antongolub

.size-limit.json

@@ -37,7 +37,7 @@
   {
     "name": "vendor",
     "path": "build/vendor-*",
-    "limit": "767.1 kB",
+    "limit": "767.12 kB",
     "brotli": false,
     "gzip": false
   },

docs/api.md

@@ -268,6 +268,7 @@ The [globby](https://github.com/sindresorhus/globby) package.
 
 ```js
 const packages = await glob(['package.json', 'packages/*/package.json'])
+const markdowns = glob.sync('*.md') // sync API shortcut
 ```
 
 ## `which()`

src/cli.ts

@@ -89,7 +89,7 @@ export const argv: minimist.ParsedArgs = parseArgv(process.argv.slice(2), {
   stopEarly: true,
   parseBoolean: true,
   camelCase: true,
-})
+}, resolveDefaults({} as any, 'ZX_', process.env, new Set(['env', 'eval', 'install', 'registry'])))
 
 export async function main(): Promise<void> {
   await import('./globals.js')

src/core.ts

@@ -75,6 +75,19 @@ const EOL = Buffer.from(_EOL)
 const BR_CC = '\n'.charCodeAt(0)
 const SIGTERM = 'SIGTERM'
 const ENV_PREFIX = 'ZX_'
+const ENV_ALLOWED: Set<string> = new Set([
+  'cwd',
+  'preferLocal',
+  'detached',
+  'verbose',
+  'quiet',
+  'timeout',
+  'timeoutSignal',
+  'killSignal',
+  'prefix',
+  'postfix',
+  'shell',
+])
 const storage = new AsyncLocalStorage<Options>()
 
 function getStore() {
@@ -931,22 +944,9 @@ const promisifyStream = <S extends Writable>(
 export function resolveDefaults(
   defs: Options = defaults,
   prefix: string = ENV_PREFIX,
-  env = process.env
+  env = process.env,
+  allowed = ENV_ALLOWED
 ): Options {
-  const allowed = new Set([
-    'cwd',
-    'preferLocal',
-    'detached',
-    'verbose',
-    'quiet',
-    'timeout',
-    'timeoutSignal',
-    'killSignal',
-    'prefix',
-    'postfix',
-    'shell',
-  ])
-
   return Object.entries(env).reduce<Options>((m, [k, v]) => {
     if (v && k.startsWith(prefix)) {
       const _k = toCamelCase(k.slice(prefix.length))

src/goods.ts

@@ -35,7 +35,8 @@ type ArgvOpts = minimist.Opts & { camelCase?: boolean; parseBoolean?: boolean }
 
 export const parseArgv = (
   args: string[] = process.argv.slice(2),
-  opts: ArgvOpts = {}
+  opts: ArgvOpts = {},
+  defs: Record<string, any> = {}
 ): minimist.ParsedArgs =>
   Object.entries(minimist(args, opts)).reduce<minimist.ParsedArgs>(
     (m, [k, v]) => {
@@ -45,7 +46,7 @@ export const parseArgv = (
       m[_k] = _v
       return m
     },
-    {} as minimist.ParsedArgs
+    { ...defs } as minimist.ParsedArgs
   )
 
 export function updateArgv(args?: string[], opts?: ArgvOpts) {

src/vendor-extra.ts

@@ -41,6 +41,7 @@ export const createRequire = _createRequire as unknown as (
 export const globbyModule = {
   convertPathToPattern,
   globby,
+  sync: globbySync,
   globbySync,
   globbyStream,
   generateGlobTasksSync,

test/goods.test.js

@@ -156,6 +156,9 @@ describe('goods', () => {
           camelCase: true,
           parseBoolean: true,
           alias: { a: 'aaa' },
+        },
+        {
+          def: 'def',
         }
       ),
       {
@@ -170,6 +173,7 @@ describe('goods', () => {
         b4: false,
         b5: true,
         b6: true,
+        def: 'def',
       }
     )
   })

test/vendor.test.js

@@ -33,6 +33,7 @@ describe('vendor API', () => {
 
   test('globby() works', async () => {
     assert.deepEqual(await glob('*.md'), ['README.md'])
+    assert.deepEqual(glob.sync('*.md'), ['README.md'])
   })
 
   test('fetch() works', async () => {