build: split vendor chunk

Author: antongolub

.github/workflows/test.yml

@@ -12,7 +12,9 @@ jobs:
         with:
           node-version: 20.x
       - run: npm ci
-      - run: npm run build
+      - run: |
+          npm run build
+          cd build && ls -l
       - uses: actions/upload-artifact@v4
         with:
           name: build

package.json

@@ -65,7 +65,7 @@
     "build": "npm run build:js && npm run build:dts",
     "build:check": "tsc",
     "build:js": "node scripts/build-js.mjs --format=cjs --hybrid --entry=src/*.ts && npm run build:vendor",
-    "build:vendor": "node scripts/build-js.mjs --format=cjs --entry=src/vendor.ts --bundle=all",
+    "build:vendor": "node scripts/build-js.mjs --format=cjs --entry='src/core-vendor.ts:src/vendor.ts' --bundle=all",
     "build:dts": "tsc --project tsconfig.prod.json && node scripts/build-dts.mjs",
     "pretest": "npm run build",
     "test": "npm run test:unit && npm run test:types && npm run test:license",

scripts/build-js.mjs

@@ -56,7 +56,7 @@ const {
 const formats = format.split(',')
 const plugins = []
 const cwd = Array.isArray(_cwd) ? _cwd[_cwd.length - 1] : _cwd
-const entries = entry.split(/,\s?/)
+const entries = entry.split(/:\s?/)
 const entryPoints = entry.includes('*')
   ? await glob(entries, { absolute: false, onlyFiles: true, cwd, root: cwd })
   : entries.map((p) => path.relative(cwd, path.resolve(cwd, p)))

src/core-vendor.ts

@@ -0,0 +1,22 @@
+// Copyright 2024 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+export { exec, buildCmd, type TSpawnStore } from 'zurk/spawn'
+
+export type RequestInfo = Parameters<typeof fetch>[0]
+export type RequestInit = Parameters<typeof fetch>[1]
+
+export { default as chalk, type ChalkInstance } from 'chalk'
+export { default as which } from 'which'
+export { default as ps } from '@webpod/ps'

src/core.ts

@@ -34,7 +34,7 @@ import {
   type RequestInfo,
   type RequestInit,
   type TSpawnStore,
-} from './vendor.js'
+} from './core-vendor.js'
 import {
   type Duration,
   errnoMessage,

src/util.ts

@@ -14,7 +14,8 @@
 
 import os from 'node:os'
 import path from 'node:path'
-import { chalk, parseLine, fs } from './vendor.js'
+import fs from 'node:fs'
+import { chalk } from './core-vendor.js'
 
 export function tempdir(prefix = `zx-${randomId()}`) {
   const dirpath = path.join(os.tmpdir(), prefix)
@@ -68,22 +69,22 @@ export function preferNmBin(
   }
 }
 
-export function normalizeMultilinePieces(
-  pieces: TemplateStringsArray
-): TemplateStringsArray {
-  return Object.assign(
-    pieces.map((p, i) =>
-      p.trim()
-        ? pad(p[0]) +
-          parseLine(p)
-            .words.map(({ w }) => (w === '\\' ? '' : w.trim()))
-            .join(' ') +
-          pad(p[p.length - 1])
-        : pieces[i]
-    ),
-    { raw: pieces.raw }
-  )
-}
+// export function normalizeMultilinePieces(
+//   pieces: TemplateStringsArray
+// ): TemplateStringsArray {
+//   return Object.assign(
+//     pieces.map((p, i) =>
+//       p.trim()
+//         ? pad(p[0]) +
+//           parseLine(p)
+//             .words.map(({ w }) => (w === '\\' ? '' : w.trim()))
+//             .join(' ') +
+//           pad(p[p.length - 1])
+//         : pieces[i]
+//     ),
+//     { raw: pieces.raw }
+//   )
+// }
 
 export function quote(arg: string) {
   if (/^[a-z0-9/_.\-@:=]+$/i.test(arg) || arg === '') {

src/vendor.ts

@@ -27,22 +27,19 @@ import {
 } from 'globby'
 import * as yaml from 'yaml'
 import * as _fs from 'fs-extra'
+import _createRequire from 'create-require'
 import { type fetch, AbortController } from 'node-fetch-native'
 
-export { exec, buildCmd, type TSpawnStore } from 'zurk/spawn'
+export * from './core-vendor.js'
 
-import _createRequire from 'create-require'
+export { fetch as nodeFetch } from 'node-fetch-native'
+
+global.AbortController = global.AbortController || AbortController
 
 export const createRequire = _createRequire as unknown as (
   filename: string | URL
 ) => NodeRequire
 
-global.AbortController = global.AbortController || AbortController
-
-export { fetch as nodeFetch } from 'node-fetch-native'
-export type RequestInfo = Parameters<typeof fetch>[0]
-export type RequestInit = Parameters<typeof fetch>[1]
-
 export const globbyModule = {
   convertPathToPattern,
   globby,
@@ -70,8 +67,4 @@ export const YAML: {
 export const fs: typeof import('fs-extra') = _fs
 
 export { depseekSync as depseek } from 'depseek'
-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 { parseLine } from '@webpod/ingrid'

test/util.test.js

@@ -25,7 +25,7 @@ import {
   quote,
   quotePowerShell,
   randomId,
-  normalizeMultilinePieces,
+  // normalizeMultilinePieces,
   getCallerLocationFromString,
   tempdir,
   tempfile,
@@ -98,12 +98,12 @@ describe('util', () => {
     )
   })
 
-  test('normalizeMultilinePieces()', () => {
-    assert.equal(
-      normalizeMultilinePieces([' a ', 'b    c    d', ' e']).join(','),
-      ' a ,b c d, e'
-    )
-  })
+  // test('normalizeMultilinePieces()', () => {
+  //   assert.equal(
+  //     normalizeMultilinePieces([' a ', 'b    c    d', ' e']).join(','),
+  //     ' a ,b c d, e'
+  //   )
+  // })
 })
 
 test('getCallerLocation: empty', () => {