@naturalcycles/dev-lib 20.12.10 → 20.12.11

package/cfg/biome.jsonc

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://biomejs.dev/schemas/2.2.2/schema.json",
+  "$schema": "https://biomejs.dev/schemas/2.3.8/schema.json",
   "root": false,
   "files": {
     "includes": [

package/cfg/eslint.config.js

@@ -18,18 +18,18 @@ import eslintVueRules from './eslint-vue-rules.js'
 import eslintVitestRules from './eslint-vitest-rules.js'
 import eslintPrettierRules from './eslint-prettier-rules.js'
 import eslintBiomeRules from './eslint-biome-rules.js'
-import fs from 'node:fs'
 
 const defaultFiles = ['**/*.ts', '**/*.tsx', '**/*.cts', '**/*.mts']
 const srcFiles = ['src/**/*.ts', 'src/**/*.tsx', 'src/**/*.cts', 'src/**/*.mts']
 const scriptsFiles = ['scripts/**/*.ts', 'scripts/**/*.tsx', 'scripts/**/*.cts', 'scripts/**/*.mts']
 const e2eFiles = ['e2e/**/*.ts', 'e2e/**/*.tsx', 'e2e/**/*.cts', 'e2e/**/*.mts']
+const allFiles = [...srcFiles, ...scriptsFiles, ...e2eFiles]
 const testFiles = ['**/*.test.ts', '**/*.test.tsx', '**/*.test.cts', '**/*.test.mts']
 
-const cwd = process.cwd()
-const tsconfigSrcPath = `${cwd}/tsconfig.json`
-const tsconfigScriptsPath = `${cwd}/scripts/tsconfig.json`
-const tsconfigE2ePath = `${cwd}/e2e/tsconfig.json`
+// const cwd = process.cwd()
+// const tsconfigSrcPath = `${cwd}/tsconfig.json`
+// const tsconfigScriptsPath = `${cwd}/scripts/tsconfig.json`
+// const tsconfigE2ePath = `${cwd}/e2e/tsconfig.json`
 
 const config = getEslintConfigForDir()
 export default config
@@ -79,18 +79,22 @@ function getEslintConfigForDir() {
         ...eslintVitestRules.rules,
       },
     },
-    fs.existsSync(tsconfigSrcPath) && {
-      files: srcFiles,
-      ...getConfig(tsconfigSrcPath),
-    },
-    fs.existsSync(tsconfigScriptsPath) && {
-      files: scriptsFiles,
-      ...getConfig(tsconfigScriptsPath),
-    },
-    fs.existsSync(tsconfigE2ePath) && {
-      files: e2eFiles,
-      ...getConfig(tsconfigE2ePath),
+    {
+      files: allFiles,
+      ...getConfig(),
     },
+    // fs.existsSync(tsconfigSrcPath) && {
+    //   files: srcFiles,
+    //   ...getConfig(tsconfigSrcPath),
+    // },
+    // fs.existsSync(tsconfigScriptsPath) && {
+    //   files: scriptsFiles,
+    //   ...getConfig(tsconfigScriptsPath),
+    // },
+    // fs.existsSync(tsconfigE2ePath) && {
+    //   files: e2eFiles,
+    //   ...getConfig(tsconfigE2ePath),
+    // },
     {
       ignores: ['**/node_modules/**', '**/__exclude/**', '**/*.scss', '**/*.js'],
     },

package/cfg/lint-staged.config.js

@@ -109,6 +109,12 @@ export function runBiomeEslintStylelintPrettier(match) {
     .map(s => `${s} ${filesList}`)
 }
 
+export function runBiomeOxlintPrettier(match) {
+  const filesList = getFilesList(match)
+  if (!filesList) return []
+  return [biomeCmd, oxlintCmd, prettierCmd].filter(Boolean).map(s => `${s} ${filesList}`)
+}
+
 export function runOxlintPrettier(match) {
   const filesList = getFilesList(match)
   if (!filesList) return []

package/cfg/vitest.config.d.ts

@@ -11,7 +11,7 @@ import type { InlineConfig } from 'vitest/node'
  })
 
  */
-export function defineVitestConfig(config?: Partial<ViteUserConfig>): ViteUserConfig
+export function defineVitestConfig(config?: Partial<ViteUserConfig>, cwd?: string): ViteUserConfig
 
 export const sharedConfig: InlineConfig
 

package/cfg/vitest.config.js

@@ -8,7 +8,6 @@ export { CollectReporter } from './collectReporter.js'
 const runsInIDE = doesItRunInIDE()
 const testType = getTestType(runsInIDE)
 const silent = shouldBeSilent(runsInIDE)
-const setupFiles = getSetupFiles(testType)
 const { include, exclude } = getIncludeAndExclude(testType)
 const isCI = !!process.env['CI']
 const coverageEnabled = isCI && testType === 'unit'
@@ -37,11 +36,14 @@ if (silent) {
  *   // bail: 1,
  * })
  */
-export function defineVitestConfig(config) {
+export function defineVitestConfig(config, cwd) {
+  const setupFiles = getSetupFiles(testType, cwd)
+
   const mergedConfig = defineConfig({
     ...config,
     test: {
       ...sharedConfig,
+      setupFiles,
       ...config?.test,
     },
   })
@@ -58,6 +60,8 @@ export function defineVitestConfig(config) {
     pool,
     isolate,
     maxWorkers,
+    setupFiles,
+    cwd,
   })
 
   return mergedConfig
@@ -74,7 +78,7 @@ export const sharedConfig = {
   // dir: 'src',
   restoreMocks: true,
   silent,
-  setupFiles,
+  setupFiles: getSetupFiles(testType),
   logHeapUsage: true,
   testTimeout: 60_000,
   slowTestThreshold: isCI ? 500 : 300, // higher threshold in CI
@@ -180,13 +184,13 @@ function isRunningAllTests() {
   return !hasPositionalArgs
 }
 
-function getSetupFiles(testType) {
+function getSetupFiles(testType, cwd = '.') {
   // Set 'setupFiles' only if setup files exist
   const setupFiles = []
-  if (fs.existsSync(`./src/test/setupVitest.ts`)) {
+  if (fs.existsSync(`${cwd}/src/test/setupVitest.ts`)) {
     setupFiles.push('./src/test/setupVitest.ts')
   }
-  if (fs.existsSync(`./src/test/setupVitest.${testType}.ts`)) {
+  if (fs.existsSync(`${cwd}/src/test/setupVitest.${testType}.ts`)) {
     setupFiles.push(`./src/test/setupVitest.${testType}.ts`)
   }
   return setupFiles

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/dev-lib",
   "type": "module",
-  "version": "20.12.10",
+  "version": "20.12.11",
   "dependencies": {
     "@biomejs/biome": "^2",
     "@commitlint/cli": "^20",