diff --git a/.eslintrc.js b/.eslintrc.js index 50b7f07..c558c9a 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -62,7 +62,6 @@ module.exports = { './examples/*/tsconfig.json', './devEnv/tsconfig.json', './compat-tests/tsconfig.json', - './scripts/tsconfig.json', ], }, rules: { diff --git a/scripts/build.ts b/devEnv/scripts/build.ts similarity index 100% rename from scripts/build.ts rename to devEnv/scripts/build.ts diff --git a/scripts/clean.ts b/devEnv/scripts/clean.ts similarity index 100% rename from scripts/clean.ts rename to devEnv/scripts/clean.ts diff --git a/scripts/prerelease.ts b/devEnv/scripts/prerelease.ts similarity index 100% rename from scripts/prerelease.ts rename to devEnv/scripts/prerelease.ts diff --git a/scripts/release.ts b/devEnv/scripts/release.ts similarity index 100% rename from scripts/release.ts rename to devEnv/scripts/release.ts diff --git a/devEnv/typecheck-all-projects/tsconfig.all.json b/devEnv/typecheck-all-projects/tsconfig.all.json index 15e4ef8..12b0cdb 100644 --- a/devEnv/typecheck-all-projects/tsconfig.all.json +++ b/devEnv/typecheck-all-projects/tsconfig.all.json @@ -13,6 +13,6 @@ {"path": "../../packages/r3f"}, {"path": "../../examples/basic-dom"}, {"path": "../../compat-tests"}, - {"path": "../../scripts"} + {"path": "../../devEnv"} ] } diff --git a/jest.config.js b/jest.config.js index 269bfaf..68a9c35 100644 --- a/jest.config.js +++ b/jest.config.js @@ -3,6 +3,8 @@ module.exports = { testMatch: [ '/packages/*/src/**/*.test.ts', '/theatre/*/src/**/*.test.ts', + '/theatre/*/src/**/*.test.ts', + '/devEnv/**/*.test.ts', ], moduleNameMapper: { ...require('./devEnv/getAliasesFromTsConfig').getAliasesFromTsConfigForJest(), @@ -15,6 +17,7 @@ module.exports = { nanoid: '/node_modules/nanoid/index.cjs', 'nanoid/non-secure': '/node_modules/nanoid/non-secure/index.cjs', 'react-icons/(.*)': 'identity-obj-proxy', + 'react-merge-refs': 'identity-obj-proxy', }, setupFiles: ['./theatre/shared/src/setupTestEnv.ts'], automock: false, diff --git a/package.json b/package.json index 00e9156..cd91509 100644 --- a/package.json +++ b/package.json @@ -14,18 +14,18 @@ "test:e2e": "yarn workspace playground run test", "test:e2e:ci": "yarn workspace playground run test:ci", "typecheck": "yarn run build:ts", - "build": "node -r esbuild-register scripts/build.ts", - "clean": "node -r esbuild-register scripts/clean.ts", + "build": "node -r esbuild-register devEnv/scripts/build.ts", + "clean": "node -r esbuild-register devEnv/scripts/clean.ts", "build:ts": "tsc --build ./devEnv/typecheck-all-projects/tsconfig.all.json", "test": "jest", "test:compat:install": "yarn workspace @theatre/compat-tests run install-fixtures", "test:compat:run": "jest --config jest.compat-tests.config.js", "postinstall": "husky install", - "release": "node -r esbuild-register scripts/release.ts", + "release": "node -r esbuild-register devEnv/scripts/release.ts", "lint:all": "eslint . --ext ts,tsx --ignore-path=.gitignore --rulesdir ./devEnv/eslint/rules" }, "lint-staged": { - "(theatre|packages|scripts|compat-tests)/**/*.(t|j)s?(x)": [ + "(theatre|packages|devEnv|compat-tests)/**/*.(t|j)s?(x)": [ "eslint --rulesdir ./devEnv/eslint/rules --fix" ], "**/*.(t|j)s?(x)": [ diff --git a/scripts/tsconfig.json b/scripts/tsconfig.json deleted file mode 100644 index abe2b2c..0000000 --- a/scripts/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../tsconfig.base.json", - "compilerOptions": { - "noEmit": true, - "resolveJsonModule": true, - "types": ["node"], - "composite": true, - "target": "es6" - }, - "include": ["*.ts", "**/*.ts"] -}