From d01983a514c0a82e7cd7a7244ccc98efe644c70a Mon Sep 17 00:00:00 2001 From: "C. Fuhrman" Date: Sat, 14 Sep 2024 18:08:18 -0400 Subject: [PATCH] Get tests to run without TS1343 error (npm test) --- client/jest.config.cjs | 4 ++-- client/package-lock.json | 10 ++++++++++ client/package.json | 3 ++- client/src/constants.tsx | 2 +- client/tsconfig.json | 2 +- client/tsconfig.node.json | 2 +- client/vite.config.ts | 2 ++ 7 files changed, 19 insertions(+), 6 deletions(-) diff --git a/client/jest.config.cjs b/client/jest.config.cjs index fa1c0d8..84b514c 100644 --- a/client/jest.config.cjs +++ b/client/jest.config.cjs @@ -3,7 +3,7 @@ module.exports = { roots: ['/src'], transform: { - '^.+\\.(ts|tsx)$': 'ts-jest', + '^.+\\.(ts|tsx)$': ['ts-jest', { tsconfig: 'tsconfig.json' }], '^.+\\.(js|jsx)$': 'babel-jest' }, testRegex: '(/__tests__/.*|(\\.|/)(test|spec))\\.tsx?$', @@ -13,5 +13,5 @@ module.exports = { moduleNameMapper: { '\\.(css|less|scss|sass)$': 'identity-obj-proxy' }, - transformIgnorePatterns: ['node_modules/(?!nanoid/)'] + transformIgnorePatterns: ['node_modules/(?!nanoid/)'], }; diff --git a/client/package-lock.json b/client/package-lock.json index 7161ee3..250f056 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -58,6 +58,7 @@ "ts-jest": "^29.1.1", "typescript": "^5.0.2", "vite": "^4.4.5", + "vite-plugin-environment": "^1.1.3", "vite-plugin-rewrite-all": "^1.0.1" } }, @@ -12459,6 +12460,15 @@ "node": ">=8" } }, + "node_modules/vite-plugin-environment": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/vite-plugin-environment/-/vite-plugin-environment-1.1.3.tgz", + "integrity": "sha512-9LBhB0lx+2lXVBEWxFZC+WO7PKEyE/ykJ7EPWCq95NEcCpblxamTbs5Dm3DLBGzwODpJMEnzQywJU8fw6XGGGA==", + "dev": true, + "peerDependencies": { + "vite": ">= 2.7" + } + }, "node_modules/vite-plugin-rewrite-all": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/vite-plugin-rewrite-all/-/vite-plugin-rewrite-all-1.0.2.tgz", diff --git a/client/package.json b/client/package.json index 3f064a4..25488cc 100644 --- a/client/package.json +++ b/client/package.json @@ -8,7 +8,7 @@ "build": "tsc && vite build", "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0", "preview": "vite preview", - "test": "jest", + "test": "jest --colors", "test:watch": "jest --watch" }, "dependencies": { @@ -62,6 +62,7 @@ "ts-jest": "^29.1.1", "typescript": "^5.0.2", "vite": "^4.4.5", + "vite-plugin-environment": "^1.1.3", "vite-plugin-rewrite-all": "^1.0.1" } } diff --git a/client/src/constants.tsx b/client/src/constants.tsx index 2384427..15f9199 100644 --- a/client/src/constants.tsx +++ b/client/src/constants.tsx @@ -1,7 +1,7 @@ // constants.tsx const ENV_VARIABLES = { MODE: 'production', - VITE_BACKEND_URL: import.meta.env.VITE_BACKEND_URL || "" + VITE_BACKEND_URL: process.env.VITE_BACKEND_URL || "" }; export { ENV_VARIABLES }; diff --git a/client/tsconfig.json b/client/tsconfig.json index 5324e80..c9c40d8 100644 --- a/client/tsconfig.json +++ b/client/tsconfig.json @@ -3,7 +3,7 @@ "target": "ESNext", "useDefineForClassFields": true, "lib": ["ES2020", "DOM", "DOM.Iterable"], - "module": "ESNext", + "module": "ES2020", "skipLibCheck": true, /* Bundler mode */ diff --git a/client/tsconfig.node.json b/client/tsconfig.node.json index f62f879..e226904 100644 --- a/client/tsconfig.node.json +++ b/client/tsconfig.node.json @@ -3,7 +3,7 @@ "compilerOptions": { "composite": true, "skipLibCheck": true, - "module": "ESNext", + "module": "ES2020", "moduleResolution": "bundler", "allowSyntheticDefaultImports": true }, diff --git a/client/vite.config.ts b/client/vite.config.ts index b5ff1b6..3a2b59e 100644 --- a/client/vite.config.ts +++ b/client/vite.config.ts @@ -1,6 +1,7 @@ import { defineConfig } from 'vite'; import react from '@vitejs/plugin-react-swc'; import pluginChecker from 'vite-plugin-checker'; +import EnvironmentPlugin from 'vite-plugin-environment'; // https://vitejs.dev/config/ export default defineConfig({ @@ -8,6 +9,7 @@ export default defineConfig({ plugins: [ react(), pluginChecker({ typescript: true }), + EnvironmentPlugin('all'), ], preview: { port: 5173,