3703 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Josh de Leeuw	5611b3c19a	remove the overrides	2024-12-18 17:24:31 -05:00
Cherrie Chang	3948fdc0ac	add changeset	2024-12-18 17:19:38 -05:00
Cherrie Chang	8ffe64a97d	add changeset	2024-12-18 17:08:17 -05:00
Cherrie Chang	f8e454e4e7	delete console spies and mocks	2024-12-18 17:04:02 -05:00
Cherrie Chang	f3649319cc	change contributing.md	2024-12-18 16:53:13 -05:00
Cherrie Chang	90ee2c54eb	add prettier-ignore for IIFE builds	2024-12-18 16:52:06 -05:00
Cherrie Chang	ca6c4eb63b	add docstring in JsPsych.ts for getCitations()	2024-12-18 16:50:24 -05:00
Cherrie Chang	909ac917b0	update docs	2024-12-18 16:45:25 -05:00
Cherrie Chang	81e747313a	add prettier-ignore to jspsych.ts	2024-12-18 16:30:17 -05:00
Cherrie Chang	5b64a47138	change citations test to include default jspsych citation	2024-12-18 09:09:23 -05:00
Cherrie Chang	466b44c6ae	Merge branch 'add-citation-module' of github.com:jspsych/jsPsych into add-citation-module	2024-12-18 08:04:28 -05:00
Cherrie Chang	f2d1a03401	fix citation logic	2024-12-18 08:02:49 -05:00
Josh de Leeuw	e42ba99ecc	modifiy citation test to check for built version	2024-12-17 15:58:30 -05:00
Cherrie Chang	5e878d381f	update getCitations() to always print jsPsych + no duplicates; update citation tool docs	2024-12-09 11:58:58 -05:00
Cherrie Chang	1b0843876c	citation documentation + delete CITATION.cff files	2024-12-06 17:38:03 -05:00
Cherrie Chang	a28ca046c1	localize prettier to apply only to lines	2024-12-06 15:08:23 -05:00
Cherrie Chang	df588e9f29	change prettier to allow single quotes	2024-12-06 15:04:51 -05:00
Cherrie Chang	b63d8b6041	fix double quotes in plugin src to single quotes	2024-12-06 15:04:34 -05:00
Cherrie Chang	575346846c	update plugins index.ts	2024-11-01 17:45:19 -04:00
Cherrie Chang	f0bc8ae3ac	add jest tests for citation tool	2024-11-01 12:53:47 -04:00
Cherrie Chang	9d5215e554	clean up errors	2024-10-30 13:50:22 -04:00
Cherrie Chang	d02f62527b	delete console logs	2024-10-30 13:43:30 -04:00
Cherrie Chang	2cdf231f92	clean up dependencies	2024-10-30 13:38:08 -04:00
Cherrie Chang	99392b4c28	citation stuff done	2024-10-30 13:24:54 -04:00
Cherrie Chang	ef89a80650	define works now	2024-10-23 11:13:33 -07:00
Cherrie Chang	eace9bf393	merge with josh	2024-10-23 11:04:41 -07:00
Josh de Leeuw	81fd767fbc	fix some config options	2024-10-23 14:03:50 -04:00
Cherrie Chang	1365dcc082	just not replacing the var	2024-10-23 10:40:09 -07:00
Cherrie Chang	00d60fb7cf	remove generateCitation from node scripts and directly call	2024-10-23 10:25:18 -07:00
Cherrie Chang	8bbf9b73c8	move citation build logic from rollup to esbuild	2024-10-23 10:18:23 -07:00
cchang-vassar	a2e7918773	fix browser tool for citations	2024-09-19 14:03:45 -04:00
cchang-vassar	bceacab4ca	i really hate this library	2024-09-16 14:01:20 -04:00
cchang-vassar	909cb9a768	fix build citation rollup plugin to actually generate citation	2024-09-13 09:45:27 -04:00
cchang-vassar	bab33ead69	fix: error handling chain in building citations	2024-09-12 16:24:12 -04:00
cchang-vassar	7963fdcf21	move additionalPlugin out of outputOptions	2024-09-12 13:59:18 -04:00
cchang-vassar	715ed2a6c2	pull bjorn fixes	2024-09-12 13:14:08 -04:00
cchang-vassar	d2ae26c67e	pulling bjorn fixes	2024-09-12 13:09:36 -04:00
cchang-vassar	e2039c43fa	pulling bjorn fixes	2024-09-12 13:08:52 -04:00
bjoluc	fd07de6800	Merge branch 'update-config-dependencies' into add-citation-module	2024-09-12 01:02:54 +02:00
bjoluc	7b3c11b79e	Bump alias-hq to version 6.2.4	2024-09-12 00:45:54 +02:00
bjoluc	3f3d68bd42	Update rollup and the rollup plugins, including esbuild	2024-09-12 00:42:52 +02:00
bjoluc	e7abded635	Update package.json	2024-09-11 21:57:54 +02:00
bjoluc	c8ad1dbe29	Merge branch 'update-config-dependencies' into add-citation-module	2024-09-11 21:55:16 +02:00
bjoluc	9e823bfcd7	Merge branch 'main' into update-config-dependencies	2024-09-11 21:52:26 +02:00
Josh de Leeuw	62d34278a3	This fixes build errors, but warnings are still present. Adds rollup/json plugin back into build chain.	2024-09-11 13:57:02 -04:00
Josh de Leeuw	7ca68ea38d	Merge branch 'main' into add-citation-module	2024-09-11 13:12:54 -04:00
Josh de Leeuw	59ce0b316b	very broken :(	2024-08-31 16:22:58 -04:00
Josh de Leeuw	6e345b8dbd	Merge pull request #3384 from joshunrau/improve-randomization-typing ... improve randomization typing	2024-08-28 10:40:35 -04:00
cchang-vassar	bbd09e2ace	move citation rollup plugin to config folder	2024-08-27 13:43:12 -04:00
cchang-vassar	1c5f826fbe	add rollup plugin for building citation	2024-08-27 13:05:12 -04:00