diff --git a/.fallowrc.jsonc b/.fallowrc.jsonc index c61c8dd1f2..08598d5b39 100644 --- a/.fallowrc.jsonc +++ b/.fallowrc.jsonc @@ -1,7 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/fallow-rs/fallow/main/schema.json", "entry": [ - "vitest.config.ts", "apps/*/app.config.{js,ts}", "apps/*/babel.config.{js,cjs,mjs,ts}", "apps/*/metro.config.{js,cjs,mjs,ts}", @@ -34,21 +33,6 @@ "packages/tests/playwright-report/**", "packages/tests/test-results/**" ], - "ignoreDependencies": [ - "@elevenlabs/__mocks__", - "@expo/__mocks__", - "@happier-dev/__mocks__", - "@huggingface/__mocks__", - "@pierre/__mocks__", - "@playwright/__mocks__", - "@react-native-async-storage/__mocks__", - "@react-navigation/__mocks__", - "@sentry/__mocks__", - "@shopify/__mocks__", - "@socket.io/__mocks__", - "@xterm/__mocks__", - "node:sqlite" - ], "duplicates": { "ignoreImports": true, "ignore": [ @@ -70,8 +54,5 @@ }, "audit": { "gate": "new-only" - }, - "rules": { - "feature-flags": "off" } } diff --git a/package.json b/package.json index cf0c43cd9c..8eb70e3e3f 100644 --- a/package.json +++ b/package.json @@ -51,15 +51,15 @@ "tailscale:disable": "node ./apps/stack/scripts/repo_local.mjs tailscale disable", "tailscale:url": "node ./apps/stack/scripts/repo_local.mjs tailscale url", "env": "node ./apps/stack/scripts/repo_local.mjs env", - "fallow": "npx --yes fallow@2.62.0", - "fallow:changed": "npx --yes fallow@2.62.0 audit --base origin/dev", - "fallow:changed:json": "npx --yes fallow@2.62.0 audit --base origin/dev --format json --quiet", - "fallow:dead": "npx --yes fallow@2.62.0 dead-code", - "fallow:dupes": "npx --yes fallow@2.62.0 dupes", - "fallow:health": "npx --yes fallow@2.62.0 health", - "fallow:fix:dry": "npx --yes fallow@2.62.0 fix --dry-run", - "fallow:baseline:save": "node -e \"require('fs').mkdirSync('.fallow',{recursive:true})\" && npx --yes fallow@2.62.0 --save-regression-baseline .fallow/regression-baseline.json", - "fallow:baseline:check": "npx --yes fallow@2.62.0 --fail-on-regression --regression-baseline .fallow/regression-baseline.json", + "fallow": "npx --yes fallow@2.84.0", + "fallow:changed": "npx --yes fallow@2.84.0 audit --base origin/dev", + "fallow:changed:json": "npx --yes fallow@2.84.0 audit --base origin/dev --format json --quiet", + "fallow:dead": "npx --yes fallow@2.84.0 dead-code", + "fallow:dupes": "npx --yes fallow@2.84.0 dupes", + "fallow:health": "npx --yes fallow@2.84.0 health", + "fallow:fix:dry": "npx --yes fallow@2.84.0 fix --dry-run", + "fallow:baseline:save": "node -e \"require('fs').mkdirSync('.fallow',{recursive:true})\" && npx --yes fallow@2.84.0 --save-regression-baseline .fallow/regression-baseline.json", + "fallow:baseline:check": "npx --yes fallow@2.84.0 --fail-on-regression --regression-baseline .fallow/regression-baseline.json", "ci:act": "bash scripts/ci/run-act-tests.sh", "test": "yarn -s test:unit", "test:unit": "yarn workspace @happier-dev/protocol test && yarn workspace @happier-dev/transfers test && yarn workspace @happier-dev/agents test && yarn workspace @happier-dev/cli-common test && yarn workspace @happier-dev/connection-supervisor test && yarn workspace @happier-dev/bootstrap test && yarn workspace @happier-dev/app test && yarn workspace @happier-dev/cli test:unit && yarn --cwd apps/server test:unit && yarn --cwd packages/relay-server test && yarn --cwd apps/stack test:unit", diff --git a/scripts/testing/lib/fallowLocalTooling.test.ts b/scripts/testing/lib/fallowLocalTooling.test.ts index 0221e9a748..59f66c587a 100644 --- a/scripts/testing/lib/fallowLocalTooling.test.ts +++ b/scripts/testing/lib/fallowLocalTooling.test.ts @@ -9,7 +9,6 @@ type PackageJson = Readonly<{ type FallowConfig = Readonly<{ $schema?: string; entry?: readonly string[]; - ignoreDependencies?: readonly string[]; duplicates?: Readonly<{ ignoreImports?: boolean; }>; @@ -18,7 +17,7 @@ type FallowConfig = Readonly<{ }>; }>; -const FALLOW_VERSION = '2.62.0'; +const FALLOW_VERSION = '2.84.0'; function readJsonFile(path: string): T { assert.equal(existsSync(path), true, `${path} must exist`); @@ -55,6 +54,5 @@ test('Fallow config is checked in while generated local state stays ignored', () assert.equal(config.duplicates?.ignoreImports, true); assert.ok(config.entry?.includes('scripts/**/*.{js,mjs,cjs,ts,tsx}')); assert.ok(config.entry?.includes('apps/*/scripts/**/*.{js,mjs,cjs,ts,tsx}')); - assert.ok(config.ignoreDependencies?.includes('node:sqlite')); assert.match(gitignore, /^\/\.fallow\/$/m); });