@xylabs/ts-scripts-yarn3 2.5.143 → 2.5.146

package/package.json

@@ -59,7 +59,7 @@
     "@babel/preset-env": "^7.18.10",
     "@types/jest": "^28.1.6",
     "@types/node": "^18.6.5",
-    "@xylabs/eslint-config": "^2.5.143",
+    "@xylabs/eslint-config": "^2.5.146",
     "chalk": "^4.1.2",
     "cpy": "8.1.2",
     "depcheck": "^1.4.3",
@@ -86,7 +86,7 @@
   "devDependencies": {
     "@types/node": "^18.6.5",
     "@types/parse-git-config": "^3.0.1",
-    "@xylabs/tsconfig": "^2.5.143",
+    "@xylabs/tsconfig": "^2.5.146",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.2.1"
   },
@@ -128,5 +128,5 @@
     "node": ">=14.16"
   },
   "sideEffects": false,
-  "version": "2.5.143"
+  "version": "2.5.146"
 }

package/src/actions/compile-cjs.ts

@@ -4,6 +4,6 @@ export const compileCjs = () => {
   const proj = process.env.PROJECT_CWD
   runSteps('Compile [CJS]', [
     ['yarn', ['tsconfig-gen:cjs']],
-    ['yarn', `workspaces foreach -ptRA exec ${proj}/node_modules/@xylabs/ts-scripts-yarn3/dist/cjs/bin/package/compile-cjs.js`],
+    ['yarn', `workspaces foreach -ptA exec ${proj}/node_modules/@xylabs/ts-scripts-yarn3/dist/cjs/bin/package/compile-cjs.js`],
   ])
 }

package/src/actions/compile-esm.ts

@@ -2,8 +2,11 @@ import { runSteps } from '../lib'
 
 export const compileEsm = () => {
   const proj = process.env.PROJECT_CWD
+  const pkgName = process.env.npm_package_name
+  console.log(`compileEsm [${pkgName}] - Start`)
   runSteps('Compile [ESM]', [
     ['yarn', ['tsconfig-gen:esm']],
-    ['yarn', `workspaces foreach -ptRA exec ${proj}/node_modules/@xylabs/ts-scripts-yarn3/dist/cjs/bin/package/compile-esm.js`],
+    ['yarn', `workspaces foreach -ptA exec ${proj}/node_modules/@xylabs/ts-scripts-yarn3/dist/cjs/bin/package/compile-esm.js`],
   ])
+  console.log(`compileEsm [${pkgName}] - End`)
 }

package/src/actions/package/clean.ts

@@ -6,6 +6,6 @@ export const packageClean = () => {
   const pkg = process.env.INIT_CWD
   const proj = process.env.PROJECT_CWD
   const dist = `${pkg}/dist`
-  const steps: ScriptStep[] = existsSync(dist) ? [[`${proj}/node_modules/rimraf/bin.js`, ['-q', `${dist}`]]] : []
+  const steps: ScriptStep[] = existsSync(dist) ? [['node', [`${proj}/node_modules/rimraf/bin.js`, '-q', `${dist}`]]] : []
   runSteps('Package Clean', steps)
 }

package/src/actions/package/compile-cjs.ts

@@ -5,11 +5,14 @@ import { runSteps, ScriptStep } from '../../lib'
 export const packageCompileCjs = () => {
   const pkg = process.env.INIT_CWD
   const proj = process.env.PROJECT_CWD
-  const steps: ScriptStep[] = [['tsc', ['-p', `${pkg}/.tsconfig.build.cjs.json`]]]
+  const pkgName = process.env.npm_package_name
+  console.log(`packageCompileCjs [${pkgName}] - Start`)
+  const steps: ScriptStep[] = [['yarn', ['tsc', '-p', `${pkg}/.tsconfig.build.cjs.json`]]]
   const dist = `${pkg}/dist/cjs`
   if (existsSync(dist)) {
     console.log(`Cleaning [${dist}]`)
-    steps.unshift([`${proj}/node_modules/rimraf/bin.js`, ['-q', `${dist}`]])
+    steps.unshift(['node', [`${proj}/node_modules/rimraf/bin.js`, '-q', `${dist}`]])
   }
   runSteps('Package Compile [CJS]', steps)
+  console.log(`packageCompileCjs [${pkgName}] - End`)
 }

package/src/actions/package/compile-esm.ts

@@ -5,11 +5,14 @@ import { runSteps, ScriptStep } from '../../lib'
 export const packageCompileEsm = () => {
   const pkg = process.env.INIT_CWD
   const proj = process.env.PROJECT_CWD
-  const steps: ScriptStep[] = [['tsc', ['-p', `${pkg}/.tsconfig.build.esm.json`]]]
+  const pkgName = process.env.npm_package_name
+  console.log(`packageCompileEsm [${pkgName}] - Start`)
+  const steps: ScriptStep[] = [['yarn', ['tsc', '-p', `${pkg}/.tsconfig.build.esm.json`]]]
   const dist = `${pkg}/dist/esm`
   if (existsSync(dist)) {
     console.log(`Cleaning [${dist}]`)
-    steps.unshift([`${proj}/node_modules/rimraf/bin.js`, ['-q', `${dist}`]])
+    steps.unshift(['node', [`${proj}/node_modules/rimraf/bin.js`, '-q', `${dist}`]])
   }
   runSteps('Package Compile [ESM]', steps)
+  console.log(`packageCompileEsm [${pkgName}] - End`)
 }

package/src/actions/tsconfig-gen-clean.ts

@@ -1,5 +1,5 @@
 import { runSteps } from '../lib'
 
 export const tsconfigGenClean = () => {
-  runSteps('Clean Configs', [['./node_modules/rimraf/bin.js', ['-q', '**/.tsconfig*']]])
+  runSteps('Clean Configs', [['node', ['./node_modules/rimraf/bin.js', '-q', '**/.tsconfig*']]])
 }

package/src/lib/runSteps.ts

@@ -4,11 +4,11 @@ import { spawnSync, SpawnSyncOptionsWithBufferEncoding } from 'child_process'
 import { safeExit } from './safeExit'
 
 export type ScriptStep =
-  | [/*command*/ string, /*arg*/ string | string[]]
+  | [/*command*/ 'yarn' | 'node' | 'ts-node-script', /*arg*/ string | string[]]
   | [/*command*/ string, /*arg*/ string | string[], /*config*/ SpawnSyncOptionsWithBufferEncoding]
 
 export const runSteps = (name: string, steps: ScriptStep[], exitOnFail = true, messages?: string[]) => {
-  safeExit(() => {
+  return safeExit(() => {
     const pkgName = process.env.npm_package_name
     console.log(chalk.green(`${name} [${pkgName}]`))
     for (let i = 0; i < steps.length; i++) {

package/src/lib/safeExit.ts

@@ -4,7 +4,7 @@ import { processEx } from './processEx'
 
 const safeExit = (func: () => number | null | undefined | void) => {
   try {
-    process.exit(func() ?? 0)
+    return func()
   } catch (ex) {
     processEx(ex)
   }