-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Move changes to main #131
Draft
becky-gilbert
wants to merge
7
commits into
main
Choose a base branch
from
develop
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Move changes to main #131
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ng jsPsych recorder initialization, and get mime type value from jsPsych recorder when a new recorder is set up
…mment about updating mime type list
Fix video recording playback issues
🦋 Changeset detectedLatest commit: a77526f The changes in this PR will be included in the next version bump. This PR includes changesets to release 1 package
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
* add jspsych as dependency for lookit-initjspsych * extend TrialDescription type from jsPsych to create ChsTrialDescription type and replace Timeline type * extend JsPsychPlugin to include chsData and use that type in dependent types/interfaces (trial description, timeline description, timeline array) * modify UndefinedTrialType error to return element instead of index (because of recursive search in timeline) * add new UndefinedTimelineError for other timeline array/node cases * remove nth function (used for returning timeline array index in error, no longer used) * add TestPlugin class for testing * ignore TestPlugin in test coverage * add import mapping for jspsych src files for Jest tests * recursively search the jspsych timeline for objects with a type key for processing, import the TimelineArray type from jspsych src, custom CHS types and additional error * update and add tests * invoke rollup log handler to log anything other than the circular dependencies in data package * update package-lock * extend jsPsych interface to overwrite argument types in jsPsych.run * use extended jsPsych interface to fix types in jspsych.run, add type assertions * use ChsJsPsych and ChsTimelineArray types in tests * remove unknown type assertions * mark type imports with import type * Fixed TS errors in spec file --------- Co-authored-by: CJ Green <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR moves recent changes on the develop branch into main: