From db7bcf82f6491ac8d02c7c4cf89e42d4ddcde1d9 Mon Sep 17 00:00:00 2001 From: jade <101148768+jadeddelta@users.noreply.github.com> Date: Sun, 22 Sep 2024 19:02:07 -0400 Subject: [PATCH 1/3] let contrib repo import json files as modules --- .changeset/eight-steaks-camp.md | 5 +++++ packages/config/tsconfig.contrib.json | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 .changeset/eight-steaks-camp.md diff --git a/.changeset/eight-steaks-camp.md b/.changeset/eight-steaks-camp.md new file mode 100644 index 0000000000..224ebac9ec --- /dev/null +++ b/.changeset/eight-steaks-camp.md @@ -0,0 +1,5 @@ +--- +"@jspsych/config": patch +--- + +allow JSON resolution in contrib repository for usage of package.json in versioning diff --git a/packages/config/tsconfig.contrib.json b/packages/config/tsconfig.contrib.json index 0706496372..14ee6b2aa2 100644 --- a/packages/config/tsconfig.contrib.json +++ b/packages/config/tsconfig.contrib.json @@ -5,6 +5,8 @@ "paths": { // map jspsych-contrib package imports directly to their source files "@jspsych-contrib/*": ["../*/src"] - } + }, + // allow json resolving to automatically pull package.json info + "resolveJsonModule": true } } From b420804203121a4ac13757333b03c5ebd87a12c9 Mon Sep 17 00:00:00 2001 From: jade <101148768+jadeddelta@users.noreply.github.com> Date: Sat, 19 Oct 2024 18:20:55 -0400 Subject: [PATCH 2/3] consolidate resolveJsonModule rule into main tsconfig.json --- packages/config/tsconfig.contrib.json | 2 -- packages/config/tsconfig.core.json | 2 -- packages/config/tsconfig.json | 4 +++- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/config/tsconfig.contrib.json b/packages/config/tsconfig.contrib.json index 14ee6b2aa2..eff2ae1ded 100644 --- a/packages/config/tsconfig.contrib.json +++ b/packages/config/tsconfig.contrib.json @@ -6,7 +6,5 @@ // map jspsych-contrib package imports directly to their source files "@jspsych-contrib/*": ["../*/src"] }, - // allow json resolving to automatically pull package.json info - "resolveJsonModule": true } } diff --git a/packages/config/tsconfig.core.json b/packages/config/tsconfig.core.json index b2be38c9b3..88b63087cf 100644 --- a/packages/config/tsconfig.core.json +++ b/packages/config/tsconfig.core.json @@ -7,7 +7,5 @@ "jspsych": ["../jspsych/src"], "@jspsych/*": ["../*/src"] }, - // allow resolving json modules in tests (needed for transitive imports of jspsych) - "resolveJsonModule": true } } diff --git a/packages/config/tsconfig.json b/packages/config/tsconfig.json index 8446400eb8..0af57f7749 100644 --- a/packages/config/tsconfig.json +++ b/packages/config/tsconfig.json @@ -16,6 +16,8 @@ "skipLibCheck": true, "forceConsistentCasingInFileNames": true, "noEmit": true, - "isolatedModules": true // required by Sucrase + "isolatedModules": true, // required by Sucrase + // required for automatic package versioning and needed for transitive imports of jspsych) + "resolveJsonModule": true, } } From 34c0e54423795e33c1daa3b3ddc8969c83847f60 Mon Sep 17 00:00:00 2001 From: jade <101148768+jadeddelta@users.noreply.github.com> Date: Tue, 29 Oct 2024 14:42:44 -0400 Subject: [PATCH 3/3] update comment style --- packages/config/tsconfig.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/config/tsconfig.json b/packages/config/tsconfig.json index 0af57f7749..473b69b5f9 100644 --- a/packages/config/tsconfig.json +++ b/packages/config/tsconfig.json @@ -17,7 +17,6 @@ "forceConsistentCasingInFileNames": true, "noEmit": true, "isolatedModules": true, // required by Sucrase - // required for automatic package versioning and needed for transitive imports of jspsych) - "resolveJsonModule": true, + "resolveJsonModule": true, // required for automatic package versioning and needed for transitive imports of jspsych } }