feat: split @pkgr/utils into @pkgr/core and @pkgr/browser

close #352

package.json

@@ -10,7 +10,7 @@
   "workspaces": [
     "packages/**"
   ],
-  "packageManager": "[email protected].19",
+  "packageManager": "[email protected].21",
   "scripts": {
     "build": "run-s build:ts build:r",
     "build:r": "tsx packages/rollup/src/cli.ts -f cjs -d false",

packages/browser/package.json

@@ -0,0 +1,36 @@
+{
+  "name": "@pkgr/browser",
+  "version": "0.0.0",
+  "type": "module",
+  "description": "Shared browser utils for `@pkgr` packages or any package else",
+  "repository": "git+https://github.com/un-ts/pkgr.git",
+  "homepage": "https://github.com/un-ts/pkgr/blob/master/packages/browser",
+  "author": "JounQin (https://www.1stG.me) <[email protected]>",
+  "funding": "https://opencollective.com/unts",
+  "license": "MIT",
+  "engines": {
+    "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
+  },
+  "main": "./lib/index.cjs",
+  "module": "./lib/index.js",
+  "exports": {
+    "types": "./lib/index.d.ts",
+    "import": "./lib/index.js",
+    "require": "./lib/index.cjs"
+  },
+  "types": "./lib/index.d.ts",
+  "files": [
+    "lib",
+    "openChrome.applescript"
+  ],
+  "dependencies": {
+    "cross-spawn": "^7.0.3",
+    "open": "^9.1.0",
+    "picocolors": "^1.0.0",
+    "tslib": "^2.6.1"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "sideEffects": false
+}

packages/browser/tsconfig.json

@@ -0,0 +1,9 @@
+{
+  "extends": "@1stg/tsconfig/lib",
+  "compilerOptions": {
+    "composite": true,
+    "outDir": "lib",
+    "rootDir": "."
+  },
+  "exclude": ["lib", "test"]
+}

packages/core/package.json

@@ -0,0 +1,29 @@
+{
+  "name": "@pkgr/core",
+  "version": "0.0.0",
+  "type": "module",
+  "description": "Shared core module for `@pkgr` packages or any package else",
+  "repository": "git+https://github.com/un-ts/pkgr.git",
+  "homepage": "https://github.com/un-ts/pkgr/blob/master/packages/core",
+  "author": "JounQin (https://www.1stG.me) <[email protected]>",
+  "funding": "https://opencollective.com/unts",
+  "license": "MIT",
+  "engines": {
+    "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
+  },
+  "main": "./lib/index.cjs",
+  "module": "./lib/index.js",
+  "exports": {
+    "types": "./lib/index.d.ts",
+    "import": "./lib/index.js",
+    "require": "./lib/index.cjs"
+  },
+  "types": "./lib/index.d.ts",
+  "files": [
+    "lib"
+  ],
+  "publishConfig": {
+    "access": "public"
+  },
+  "sideEffects": false
+}

packages/core/src/constants.ts

@@ -0,0 +1,9 @@
+import { createRequire } from 'node:module'
+
+export const CWD = process.cwd()
+
+export const cjsRequire =
+  typeof require === 'undefined' ? createRequire(import.meta.url) : require
+
+// eslint-disable-next-line n/no-deprecated-api, sonar/deprecation
+export const EXTENSIONS = ['.ts', '.tsx', ...Object.keys(cjsRequire.extensions)]

packages/core/src/helpers.ts

@@ -0,0 +1,61 @@
+import fs from 'node:fs'
+import path from 'node:path'
+
+import { CWD, EXTENSIONS, cjsRequire } from './constants.js'
+
+export const tryPkg = (pkg: string) => {
+  try {
+    return cjsRequire.resolve(pkg)
+  } catch {}
+}
+
+export const isPkgAvailable = (pkg: string) => !!tryPkg(pkg)
+
+export const tryFile = (filePath?: string[] | string, includeDir = false) => {
+  if (typeof filePath === 'string') {
+    return fs.existsSync(filePath) &&
+      (includeDir || fs.statSync(filePath).isFile())
+      ? filePath
+      : ''
+  }
+
+  for (const file of filePath ?? []) {
+    if (tryFile(file, includeDir)) {
+      return file
+    }
+  }
+
+  return ''
+}
+
+export const tryExtensions = (filepath: string, extensions = EXTENSIONS) => {
+  const ext = [...extensions, ''].find(ext => tryFile(filepath + ext))
+  return ext == null ? '' : filepath + ext
+}
+
+export const findUp = (searchEntry: string, searchFile = 'package.json') => {
+  console.assert(path.isAbsolute(searchEntry))
+
+  if (
+    !tryFile(searchEntry, true) ||
+    (searchEntry !== CWD && !searchEntry.startsWith(CWD + path.sep))
+  ) {
+    return ''
+  }
+
+  searchEntry = path.resolve(
+    fs.statSync(searchEntry).isDirectory()
+      ? searchEntry
+      : path.resolve(searchEntry, '..'),
+  )
+
+  do {
+    const searched = tryFile(path.resolve(searchEntry, searchFile))
+    if (searched) {
+      return searched
+    }
+    searchEntry = path.resolve(searchEntry, '..')
+  } while (searchEntry === CWD || searchEntry.startsWith(CWD + path.sep))
+
+  return ''
+}

packages/core/src/index.ts

@@ -0,0 +1,2 @@
+export * from './constants.js'
+export * from './helpers.js'

packages/core/tsconfig.json

@@ -0,0 +1,9 @@
+{
+  "extends": "@1stg/tsconfig/lib",
+  "compilerOptions": {
+    "composite": true,
+    "outDir": "lib",
+    "rootDir": "src"
+  },
+  "exclude": ["lib", "test"]
+}

packages/utils/package.json

@@ -20,16 +20,12 @@
   },
   "types": "./lib/index.d.ts",
   "files": [
-    "lib",
-    "openChrome.applescript"
+    "lib"
   ],
   "dependencies": {
-    "cross-spawn": "^7.0.3",
+    "@pkgr/core": "^0.0.0",
     "fast-glob": "^3.3.1",
-    "is-glob": "^4.0.3",
-    "open": "^9.1.0",
-    "picocolors": "^1.0.0",
-    "tslib": "^2.6.1"
+    "is-glob": "^4.0.3"
   },
   "publishConfig": {
     "access": "public"

packages/utils/src/constants.ts

@@ -1,5 +1,3 @@
-import { createRequire } from 'node:module'
-
 export const DEV = 'development' as const
 export const PROD = 'production' as const
 
@@ -10,14 +8,6 @@ export const __PROD__ = NODE_ENV === PROD
 
 export const NODE_MODULES_REG = /[/\\]node_modules[/\\]/
 
-export const CWD = process.cwd()
-
-export const cjsRequire =
-  typeof require === 'undefined' ? createRequire(import.meta.url) : require
-
-// eslint-disable-next-line n/no-deprecated-api, sonar/deprecation
-export const EXTENSIONS = ['.ts', '.tsx', ...Object.keys(cjsRequire.extensions)]
-
 export const SCRIPT_RUNNERS = {
   npm: 'npx',
   pnpm: 'pnpm',

packages/utils/src/helpers.ts

@@ -1,21 +1,9 @@
-import fs from 'node:fs'
 import path from 'node:path'
 
+import { CWD, cjsRequire, isPkgAvailable, tryFile } from '@pkgr/core'
 import isGlob from 'is-glob'
 
-import {
-  CWD,
-  EXTENSIONS,
-  cjsRequire,
-  SCRIPT_RUNNERS,
-  SCRIPT_EXECUTORS,
-} from './constants.js'
-
-export const tryPkg = (pkg: string) => {
-  try {
-    return cjsRequire.resolve(pkg)
-  } catch {}
-}
+import { SCRIPT_RUNNERS, SCRIPT_EXECUTORS } from './constants.js'
 
 export const tryRequirePkg = <T>(pkg: string): T | undefined => {
   try {
@@ -24,8 +12,6 @@ export const tryRequirePkg = <T>(pkg: string): T | undefined => {
   } catch {}
 }
 
-export const isPkgAvailable = (pkg: string) => !!tryPkg(pkg)
-
 export const isTsAvailable = isPkgAvailable('typescript')
 
 export const isAngularAvailable = isPkgAvailable('@angular/core/package.json')
@@ -40,28 +26,6 @@ export const isSvelteAvailable = isPkgAvailable('svelte')
 
 export const isVueAvailable = isPkgAvailable('vue')
 
-export const tryFile = (filePath?: string[] | string, includeDir = false) => {
-  if (typeof filePath === 'string') {
-    return fs.existsSync(filePath) &&
-      (includeDir || fs.statSync(filePath).isFile())
-      ? filePath
-      : ''
-  }
-
-  for (const file of filePath ?? []) {
-    if (tryFile(file, includeDir)) {
-      return file
-    }
-  }
-
-  return ''
-}
-
-export const tryExtensions = (filepath: string, extensions = EXTENSIONS) => {
-  const ext = [...extensions, ''].find(ext => tryFile(filepath + ext))
-  return ext == null ? '' : filepath + ext
-}
-
 export const tryGlob = (
   paths: string[],
   options:
@@ -103,33 +67,6 @@ export const identify = <T>(
   '' | (T extends boolean ? false : boolean) | null | undefined
 > => !!_
 
-export const findUp = (searchEntry: string, searchFile = 'package.json') => {
-  console.assert(path.isAbsolute(searchEntry))
-
-  if (
-    !tryFile(searchEntry, true) ||
-    (searchEntry !== CWD && !searchEntry.startsWith(CWD + path.sep))
-  ) {
-    return ''
-  }
-
-  searchEntry = path.resolve(
-    fs.statSync(searchEntry).isDirectory()
-      ? searchEntry
-      : path.resolve(searchEntry, '..'),
-  )
-
-  do {
-    const searched = tryFile(path.resolve(searchEntry, searchFile))
-    if (searched) {
-      return searched
-    }
-    searchEntry = path.resolve(searchEntry, '..')
-  } while (searchEntry === CWD || searchEntry.startsWith(CWD + path.sep))
-
-  return ''
-}
-
 export const arrayify = <
   T,
   R = T extends Array<infer S> ? NonNullable<S> : NonNullable<T>,

packages/utils/src/index.ts

@@ -1,4 +1,4 @@
-export * from './browser.js'
 export * from './constants.js'
 export * from './helpers.js'
 export * from './monorepo.js'
+export * from '@pkgr/core'

tsconfig.json

@@ -4,6 +4,12 @@
     {
       "path": "packages/es-modules"
     },
+    {
+      "path": "packages/browser"
+    },
+    {
+      "path": "packages/core"
+    },
     {
       "path": "packages/utils"
     },