From 1375339f634197167a550231227c01507fe1487a Mon Sep 17 00:00:00 2001 From: bjoluc Date: Mon, 21 Nov 2022 09:25:51 +0100 Subject: [PATCH] Let TypeScript resolve JSON files in `jspsych` package --- packages/config/tsconfig.core.json | 3 +-- packages/jspsych/global.d.ts | 1 - packages/jspsych/tsconfig.json | 5 ++--- 3 files changed, 3 insertions(+), 6 deletions(-) delete mode 100644 packages/jspsych/global.d.ts diff --git a/packages/config/tsconfig.core.json b/packages/config/tsconfig.core.json index 50fedd53..b2be38c9 100644 --- a/packages/config/tsconfig.core.json +++ b/packages/config/tsconfig.core.json @@ -7,8 +7,7 @@ "jspsych": ["../jspsych/src"], "@jspsych/*": ["../*/src"] }, - // allow resolving json modules in tests (needed for transitive imports of jspsych in tests; - // the jspsych package itself uses https://stackoverflow.com/a/61426303 instead) + // allow resolving json modules in tests (needed for transitive imports of jspsych) "resolveJsonModule": true } } diff --git a/packages/jspsych/global.d.ts b/packages/jspsych/global.d.ts deleted file mode 100644 index 675741fa..00000000 --- a/packages/jspsych/global.d.ts +++ /dev/null @@ -1 +0,0 @@ -declare module "*.json"; // https://stackoverflow.com/a/61426303 diff --git a/packages/jspsych/tsconfig.json b/packages/jspsych/tsconfig.json index 87269ce9..d4c096a7 100644 --- a/packages/jspsych/tsconfig.json +++ b/packages/jspsych/tsconfig.json @@ -1,8 +1,7 @@ { "extends": "@jspsych/config/tsconfig.core.json", "compilerOptions": { - "baseUrl": ".", - "resolveJsonModule": false // using https://stackoverflow.com/a/61426303 instead + "baseUrl": "." }, - "include": ["src", "tests", "global.d.ts"] + "include": ["src", "tests", "package.json"] }