Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1871 commits
Select commit Hold shift + click to select a range
ac730dd
got tests passing
benjiwheeler Dec 18, 2018
f5e2d3d
set title correctly
benjiwheeler Dec 18, 2018
b3e97ad
Merge pull request #4134 from benjiwheeler/save-before-upload
benjiwheeler Dec 18, 2018
b9dc953
Derive isScratchDesktop state from a GUI prop
Dec 19, 2018
3f4e969
push history on modal mount, if current history ref is not this same …
benjiwheeler Dec 19, 2018
6647eb9
Merge pull request #4115 from towerofnix/fix-touchevent-error
paulkaplan Dec 19, 2018
12ea49b
Open the editor view of the required project
paulkaplan Dec 19, 2018
67074ed
added back button test
benjiwheeler Dec 19, 2018
b5b3f33
Merge pull request #4081 from paulkaplan/more-beefers
paulkaplan Dec 19, 2018
aa253d7
Implement list import and export from files
paulkaplan Dec 19, 2018
8f9793c
Update scratch-storage package
ktbee Dec 19, 2018
75053b5
Don't use Object.keys()
Dec 19, 2018
829616d
Sprite and costume library fixes
ericrosenbaum Dec 19, 2018
af50ac7
Remove ready check from isScratchDesktop()
Dec 19, 2018
0544641
Merge pull request #4113 from cwillisf/isScratchDesktop
cwillisf Dec 19, 2018
400fc67
More fixes
ericrosenbaum Dec 19, 2018
010078d
Yet more fixes
ericrosenbaum Dec 19, 2018
2c7ffe9
Fixifications
ericrosenbaum Dec 19, 2018
ba06a64
Fixilations
ericrosenbaum Dec 19, 2018
0f83046
Zebrafixes
ericrosenbaum Dec 19, 2018
6355abe
Merge pull request #4149 from ericrosenbaum/bugfix/library-update-fixes
ericrosenbaum Dec 19, 2018
40ca680
Show error ID if available from Raven
paulkaplan Dec 19, 2018
5ed340c
Fix typo
paulkaplan Dec 19, 2018
8263a73
Add city and bedroom assets
ericrosenbaum Dec 19, 2018
9b3c847
Merge pull request #4151 from paulkaplan/show-error-id
paulkaplan Dec 19, 2018
28f6b5e
Merge pull request #4150 from ktbee/update-scratch-storage
paulkaplan Dec 19, 2018
8a19bab
Merge pull request #4152 from ericrosenbaum/feature/add-city-and-bedr…
paulkaplan Dec 19, 2018
faadda3
Make remixing/saving faster by marking all assets as clean to start.
paulkaplan Dec 19, 2018
c799541
Ignore projectChange updates from the VM when not in editor mode
paulkaplan Dec 19, 2018
c492602
Do not remove the window beforeunload handler in componentWillUnmount.
paulkaplan Dec 19, 2018
4a2f22f
chore(package): update scratch-vm to version 0.2.0-prerelease.2018121…
greenkeeper[bot] Dec 19, 2018
8a9996b
refactored font loading state to be in redux
benjiwheeler Dec 20, 2018
8e075eb
removed elementIsNotVisible, since it doesn't really work
benjiwheeler Dec 20, 2018
39e1229
translate form validation string
benjiwheeler Dec 20, 2018
8f554a7
Merge pull request #4158 from paulkaplan/fix-unload-alert
paulkaplan Dec 20, 2018
ef43a17
Merge pull request #4156 from paulkaplan/only-trigger-saves-from-editor
paulkaplan Dec 20, 2018
ca7e4e5
Merge pull request #4157 from LLK/greenkeeper/scratch-vm-0.2.0-prerel…
paulkaplan Dec 20, 2018
54c8588
Merge pull request #4153 from paulkaplan/enfasten-remix
paulkaplan Dec 20, 2018
fc28a72
Add txt import so file can be imported/exported from symmetrically
paulkaplan Dec 20, 2018
80df9d6
Fix issue with undefineds in the CSV
paulkaplan Dec 20, 2018
19f5b19
Merge pull request #4160 from benjiwheeler/load-fonts-in-redux
benjiwheeler Dec 20, 2018
50a9172
Use new sentry API provided by www, and use analytics ID from www
paulkaplan Dec 20, 2018
77fb9b6
Merge pull request #4165 from paulkaplan/use-new-sentry-api
paulkaplan Dec 20, 2018
4df56e4
Include the action in the sentry report
paulkaplan Dec 20, 2018
54eea42
Remove most of the analytics.pageview events, keeping the search queries
paulkaplan Dec 20, 2018
6fe27f7
Remove the error logging to GA, augment Sentry with the action prop
paulkaplan Dec 20, 2018
ce7e652
Merge pull request #4166 from paulkaplan/reduce-analytics-events
paulkaplan Dec 20, 2018
d76b74e
Merge pull request #4144 from benjiwheeler/library-history2
benjiwheeler Dec 20, 2018
6c9ae25
Fix linting
paulkaplan Dec 20, 2018
57e841b
Merge pull request #4146 from paulkaplan/list-import
paulkaplan Dec 20, 2018
d80746b
Update preserve spaces on stage
fsih Dec 20, 2018
75d8ffb
Merge pull request #4171 from fsih/updateNewlines
fsih Dec 20, 2018
ea54953
The file uploader file input should accept .sb files as well.
kchadha Dec 18, 2018
ba9d02f
update scratch vm to pull in sb1 import
kchadha Dec 20, 2018
46b5e41
Merge pull request #4136 from kchadha/accept-sb
kchadha Dec 20, 2018
ee80e07
Add telemetry opt-in/opt-out dialog
Dec 20, 2018
f4daec5
Don't bundle telemetry modal event handlers
Dec 20, 2018
fb6da98
More library updates
ericrosenbaum Dec 20, 2018
3ba85eb
Merge pull request #4172 from ericrosenbaum/bugfix/another-library-up…
thisandagain Dec 20, 2018
e3c205a
Update telemetry image placeholder
Dec 20, 2018
8aade78
chore(package): update scratch-l10n to version 3.1.20181220222259
greenkeeper[bot] Dec 21, 2018
744076b
Merge pull request #4162 from cwillisf/telemetry-opt-in
cwillisf Dec 21, 2018
543d239
Merge pull request #4169 from benjiwheeler/translate-validation
chrisgarrity Dec 21, 2018
5f71c34
chore(package): update scratch-vm to version 0.2.0-prerelease.2018122…
greenkeeper[bot] Dec 21, 2018
410ea07
Merge pull request #4175 from LLK/greenkeeper/scratch-vm-0.2.0-prerel…
kchadha Dec 21, 2018
5b4bef0
Merge pull request #4176 from LLK/greenkeeper/scratch-l10n-3.1.201812…
chrisgarrity Dec 21, 2018
67aeb50
chore(package): update scratch-blocks to version 0.1.0-prerelease.154…
greenkeeper[bot] Dec 21, 2018
1ea945f
Merge pull request #4178 from LLK/greenkeeper/scratch-blocks-0.1.0-pr…
chrisgarrity Dec 21, 2018
3c53bac
Revert "Make remixing/saving faster by marking all assets as clean to…
paulkaplan Dec 21, 2018
0465332
Merge pull request #4181 from LLK/revert-4153-enfasten-remix
paulkaplan Dec 21, 2018
be37452
Update to storage 1.2.2 for clean asset flag fix
paulkaplan Dec 21, 2018
daeec8f
Merge pull request #4182 from LLK/paulkaplan-patch-1
paulkaplan Dec 21, 2018
259d079
Update scratch-vm to pull in changes from scratch-sb1-converter
kchadha Dec 21, 2018
9b65910
Merge pull request #4183 from kchadha/update-vm
kchadha Dec 21, 2018
9c866e2
chore(package): update scratch-vm to version 0.2.0-prerelease.2018122…
greenkeeper[bot] Dec 21, 2018
135e521
Merge pull request #4185 from LLK/greenkeeper/scratch-vm-0.2.0-prerel…
kchadha Dec 21, 2018
6b2cf97
Fix regex for extracting the project title from a .sb file
kchadha Dec 25, 2018
41d9100
Update unit test that was checking that .sb files don't get project t…
kchadha Dec 26, 2018
8e69ea7
Remove Vivaldi block
Cqoicebordel Dec 26, 2018
d028b93
Remove Vivaldi block text
Cqoicebordel Dec 26, 2018
2a6d798
Merge pull request #4195 from kchadha/fix-filename-regex
kchadha Dec 26, 2018
4d0eb63
chore(package): update scratch-render to version 0.1.0-prerelease.201…
greenkeeper[bot] Dec 26, 2018
4a8a976
Update gui.unsupportedBrowser.description text to be less precise
Cqoicebordel Dec 26, 2018
faf73c9
chore(package): update scratch-vm to version 0.2.0-prerelease.2018122…
greenkeeper[bot] Dec 26, 2018
77df4e8
Merge pull request #4200 from LLK/greenkeeper/scratch-vm-0.2.0-prerel…
kchadha Dec 26, 2018
c50bb3c
Merge pull request #4199 from LLK/greenkeeper/scratch-render-0.1.0-pr…
kchadha Dec 26, 2018
9cd4119
Fix #4203 by checking whether a target exists before asking whether i…
picklesrus Dec 26, 2018
57751e9
Merge pull request #4204 from picklesrus/sensing-target-bug
kchadha Dec 26, 2018
f05a7d1
chore(package): update scratch-vm to version 0.2.0-prerelease.2018122…
greenkeeper[bot] Dec 26, 2018
0ce0e48
Merge pull request #4205 from LLK/greenkeeper/scratch-vm-0.2.0-prerel…
kchadha Dec 26, 2018
31730cc
Change WebGL link
apple502j Dec 27, 2018
70eb240
Use the loading screen in player mode
paulkaplan Dec 27, 2018
afc8ffc
Merge pull request #4210 from paulkaplan/stage-loading
paulkaplan Dec 27, 2018
a9280c9
Merge pull request #4208 from apple502j/patch-9
thisandagain Dec 27, 2018
51b72b2
Pin eslint-plugin-react because v7.12 has a bug causing erroneous fails
paulkaplan Dec 28, 2018
83a1bab
Merge pull request #4215 from paulkaplan/pin-eslint-plugin-react
paulkaplan Dec 28, 2018
34d712a
Bump scratch-vm
rschamp Jan 2, 2019
72730d1
Merge pull request #4223 from LLK/rschamp-patch-1
rschamp Jan 2, 2019
c6a2da7
Fixed blurry stage
adroitwhiz Jan 3, 2019
98f5210
Remove package-lock.json and add to .gitignore
adroitwhiz Jan 3, 2019
50b7d3a
Round off getStageDimensions()
adroitwhiz Jan 3, 2019
e23e29b
whitespace tweak
adroitwhiz Jan 3, 2019
0b22843
whitespace tweak 2: electric boogaloo
adroitwhiz Jan 3, 2019
d05e8f0
Merge pull request #4232 from adroitwhiz/develop
paulkaplan Jan 3, 2019
87a9feb
chore(package): update scratch-render to version 0.1.0-prerelease.201…
greenkeeper[bot] Jan 3, 2019
95381f2
Merge pull request #4246 from LLK/greenkeeper/scratch-render-0.1.0-pr…
paulkaplan Jan 3, 2019
97b9f5c
Stop waiting for non scratch fonts to load.
picklesrus Jan 3, 2019
3a4d934
Merge pull request #4247 from picklesrus/fix-font-loading
paulkaplan Jan 3, 2019
8de8c02
Merge pull request #4196 from Cqoicebordel/Cqoicebordel-patch-1
thisandagain Jan 4, 2019
cb401ec
Make the sprite drop area from the backpack highlight and large
paulkaplan Jan 7, 2019
67b9d97
Merge pull request #4277 from paulkaplan/fix-sprite-drop-area
paulkaplan Jan 7, 2019
3081f0b
chore(package): update scratch-vm to version 0.2.0-prerelease.2019010…
greenkeeper[bot] Jan 7, 2019
6879635
chore(package): update scratch-render to version 0.1.0-prerelease.201…
greenkeeper[bot] Jan 7, 2019
e3345ca
Merge pull request #4023 from epicfaace/features/sound-editor-buttons
ericrosenbaum Jan 7, 2019
cb04bb1
Merge pull request #4279 from LLK/greenkeeper/scratch-vm-0.2.0-prerel…
paulkaplan Jan 7, 2019
821afa8
chore(package): update scratch-vm to version 0.2.0-prerelease.2019010…
greenkeeper[bot] Jan 7, 2019
33fa07e
Merge pull request #4281 from LLK/greenkeeper/scratch-vm-0.2.0-prerel…
paulkaplan Jan 7, 2019
d05dc39
Merge pull request #4280 from LLK/greenkeeper/scratch-render-0.1.0-pr…
paulkaplan Jan 7, 2019
2da6ebc
chore(package): update scratch-vm to version 0.2.0-prerelease.2019010…
greenkeeper[bot] Jan 7, 2019
69aa8c0
Merge pull request #4282 from LLK/greenkeeper/scratch-vm-0.2.0-prerel…
paulkaplan Jan 7, 2019
933bdd7
Save project state before storing assets instead of after.
kchadha Jan 7, 2019
2472ca1
Merge pull request #4284 from kchadha/save-project-state-before-stori…
paulkaplan Jan 8, 2019
b129c1e
Check for minimum versions of recommended browsers
chrisgarrity Jan 8, 2019
33232b9
chore(package): update scratch-render to version 0.1.0-prerelease.201…
greenkeeper[bot] Jan 8, 2019
88b0094
chore(package): update scratch-audio to version 0.1.0-prerelease.2019…
greenkeeper[bot] Jan 8, 2019
379c676
Merge pull request #4289 from LLK/greenkeeper/scratch-render-0.1.0-pr…
paulkaplan Jan 8, 2019
fe03673
Merge pull request #4290 from LLK/greenkeeper/scratch-audio-0.1.0-pre…
paulkaplan Jan 8, 2019
4af0e92
Merge pull request #4287 from chrisgarrity/issue/unsupported-versions
paulkaplan Jan 8, 2019
e1f1b9d
Revert "Update scratch-render to the latest version 🚀"
paulkaplan Jan 8, 2019
73d19d0
Merge pull request #4295 from LLK/revert-4289-greenkeeper/scratch-ren…
paulkaplan Jan 8, 2019
d3608ea
Revert "Check for minimum versions of recommended browsers"
paulkaplan Jan 8, 2019
123b0a6
Merge pull request #4296 from LLK/revert-4287-issue/unsupported-versions
paulkaplan Jan 8, 2019
213ef4b
check for non-null flyout
chrisgarrity Jan 8, 2019
5cb41ef
chore(package): update scratch-render to version 0.1.0-prerelease.201…
greenkeeper[bot] Jan 8, 2019
4a66ead
chore(package): update scratch-vm to version 0.2.0-prerelease.2019010…
greenkeeper[bot] Jan 9, 2019
3940214
QualityTutorHOC wip
peeratham Jan 9, 2019
cf5183a
Revise how unsupported browsers are handled
chrisgarrity Jan 9, 2019
35ad4cc
Merge pull request #4304 from chrisgarrity/feature/catch-unsupported-…
paulkaplan Jan 9, 2019
62440ec
Merge pull request #4299 from LLK/greenkeeper/scratch-render-0.1.0-pr…
paulkaplan Jan 9, 2019
4dcf909
Merge pull request #4305 from LLK/greenkeeper/scratch-vm-0.2.0-prerel…
paulkaplan Jan 9, 2019
0ad5cda
chore(package): update scratch-vm to version 0.2.0-prerelease.2019010…
greenkeeper[bot] Jan 9, 2019
9e220df
chore(package): update scratch-render to version 0.1.0-prerelease.201…
greenkeeper[bot] Jan 9, 2019
2050440
Merge pull request #4308 from LLK/greenkeeper/scratch-render-0.1.0-pr…
paulkaplan Jan 9, 2019
17b6e37
chore(package): update scratch-svg-renderer to version 0.2.0-prerelea…
greenkeeper[bot] Jan 9, 2019
ba6313f
Merge pull request #4307 from LLK/greenkeeper/scratch-vm-0.2.0-prerel…
paulkaplan Jan 9, 2019
3b59dd9
Merge branch 'develop' into greenkeeper/scratch-svg-renderer-0.2.0-pr…
paulkaplan Jan 9, 2019
e649530
Merge pull request #4309 from LLK/greenkeeper/scratch-svg-renderer-0.…
paulkaplan Jan 9, 2019
a7bd23f
chore(package): update scratch-render to version 0.1.0-prerelease.201…
greenkeeper[bot] Jan 9, 2019
4aef0e0
add support for onProjectLoaded
chrisgarrity Jan 10, 2019
5330a07
Merge pull request #4298 from chrisgarrity/issue/null-flyout
chrisgarrity Jan 10, 2019
86a51bd
Merge pull request #4312 from chrisgarrity/feature/support-onprojectl…
chrisgarrity Jan 10, 2019
7d9d41b
Merge pull request #4310 from LLK/greenkeeper/scratch-render-0.1.0-pr…
paulkaplan Jan 10, 2019
07eb519
Make whole stage clickable for green flag overlay
chrisgarrity Jan 10, 2019
40de587
Allow putting mp3 sounds in the backpack.
kchadha Jan 10, 2019
b98577d
chore(package): update scratch-l10n to version 3.1.20190110195702
greenkeeper[bot] Jan 10, 2019
d419058
chore(package): update scratch-svg-renderer to version 0.2.0-prerelea…
greenkeeper[bot] Jan 10, 2019
95b11a7
resolve function name conflict by renaming onProjectLoaded in project…
benjiwheeler Jan 10, 2019
2da3048
Merge pull request #4319 from benjiwheeler/rename-on-project-loaded
benjiwheeler Jan 11, 2019
15c9c1f
Pass isRTL to the stage wrapper in both player and editor modes.
paulkaplan Jan 11, 2019
ae8ba47
Cover the fullscreen player mode stage with a loading screen
paulkaplan Jan 11, 2019
c89d452
Merge pull request #4314 from chrisgarrity/clickable-flag-overlay
chrisgarrity Jan 11, 2019
db946df
Merge pull request #4322 from paulkaplan/show-loading-fullscreen
paulkaplan Jan 11, 2019
d0a30ab
Merge pull request #4318 from LLK/greenkeeper/scratch-svg-renderer-0.…
paulkaplan Jan 11, 2019
214393f
Merge pull request #4315 from kchadha/fix-backpack-mp3
kchadha Jan 14, 2019
f3c15c4
Prevent auto-trim from producing invalid start and stop points
paulkaplan Jan 14, 2019
3f51775
Only stop recording if we have collected some samples.
paulkaplan Jan 14, 2019
329a6b5
Fix typo in alert message
paulkaplan Jan 14, 2019
395b3d9
Prevent 0 sample sounds while trimming #715
paulkaplan Jan 14, 2019
2e30f1d
Limit the size of sounds coming from effects.
paulkaplan Jan 14, 2019
1c9f4c6
Fix tests now that the alert actually works
paulkaplan Jan 14, 2019
6fa6b02
Fix mock audio buffer
paulkaplan Jan 14, 2019
b2117d7
Force deny getUserMedia in tests, see if that works on travis
paulkaplan Jan 14, 2019
71e6478
chore(package): update scratch-vm to version 0.2.0-prerelease.2019011…
greenkeeper[bot] Jan 14, 2019
bed2d5b
Merge pull request #4341 from LLK/greenkeeper/scratch-vm-0.2.0-prerel…
paulkaplan Jan 14, 2019
b40f8e5
Merge pull request #4317 from LLK/greenkeeper/scratch-l10n-3.1.201901…
paulkaplan Jan 14, 2019
2603588
chore(package): update scratch-paint to version 0.2.0-prerelease.2019…
greenkeeper[bot] Jan 14, 2019
6044926
chore(package): update scratch-audio to version 0.1.0-prerelease.2019…
greenkeeper[bot] Jan 14, 2019
7546a4e
Merge pull request #4343 from LLK/greenkeeper/scratch-audio-0.1.0-pre…
paulkaplan Jan 14, 2019
3383b07
Merge pull request #4342 from LLK/greenkeeper/scratch-paint-0.2.0-pre…
paulkaplan Jan 14, 2019
1f5383d
chore(package): update scratch-blocks to version 0.1.0-prerelease.154…
greenkeeper[bot] Jan 15, 2019
b869a6c
chore(package): update scratch-blocks to version 0.1.0-prerelease.154…
greenkeeper[bot] Jan 15, 2019
793cab6
chore(package): update scratch-vm to version 0.2.0-prerelease.2019011…
greenkeeper[bot] Jan 15, 2019
9d98d76
Merge pull request #4349 from LLK/greenkeeper/scratch-blocks-0.1.0-pr…
picklesrus Jan 15, 2019
b69c5ab
Merge branch 'develop' into greenkeeper/scratch-blocks-0.1.0-prerelea…
picklesrus Jan 15, 2019
50a9541
Merge pull request #4338 from paulkaplan/fix-sound-recorder-issues
paulkaplan Jan 15, 2019
4d136c7
Merge pull request #4339 from paulkaplan/prevent-large-sounds
paulkaplan Jan 15, 2019
6ffab82
Merge pull request #4351 from LLK/greenkeeper/scratch-vm-0.2.0-prerel…
paulkaplan Jan 15, 2019
5c8818a
chore(package): update scratch-render to version 0.1.0-prerelease.201…
greenkeeper[bot] Jan 15, 2019
16994e3
Allow drop event in sortableHOC even when there are no items to sort.
paulkaplan Jan 15, 2019
5d19849
Merge pull request #4352 from LLK/greenkeeper/scratch-blocks-0.1.0-pr…
paulkaplan Jan 15, 2019
3fe7502
Merge pull request #4353 from LLK/greenkeeper/scratch-render-0.1.0-pr…
paulkaplan Jan 15, 2019
8e69310
Build vernier module using babel preset to make sure it works for www
paulkaplan Jan 15, 2019
68af0af
Merge pull request #4355 from paulkaplan/fix-loading-vernier
paulkaplan Jan 15, 2019
512915b
Fix vernier extension loader
paulkaplan Jan 15, 2019
dc9f24c
Revert "Fix vernier extension loader"
paulkaplan Jan 15, 2019
d4e1cfc
Revert "Merge pull request #4355 from paulkaplan/fix-loading-vernier"
paulkaplan Jan 15, 2019
71ec34a
Merge pull request #4356 from paulkaplan/remove-vernier-kludge
paulkaplan Jan 15, 2019
a2cc320
Clear trim handles if trim cannot be completed.
paulkaplan Jan 15, 2019
ce67673
chore(package): update scratch-vm to version 0.2.0-prerelease.2019011…
greenkeeper[bot] Jan 15, 2019
4217c7f
Merge pull request #4358 from LLK/greenkeeper/scratch-vm-0.2.0-prerel…
paulkaplan Jan 15, 2019
97f2241
Adds BorderedMenuItem and use it for delete menu
apple502j Jan 16, 2019
2fe3f27
chore(package): update scratch-l10n to version 3.1.20190116142721
greenkeeper[bot] Jan 16, 2019
7b217c6
Make sprite selector item absolutely position images to prevent layouts
paulkaplan Jan 16, 2019
1945a72
Update snapshots for component unit tests
paulkaplan Jan 16, 2019
8e5e7b0
Merge pull request #4361 from LLK/greenkeeper/scratch-l10n-3.1.201901…
paulkaplan Jan 16, 2019
1c621b7
Merge pull request #4357 from paulkaplan/fix-sound-trimming
paulkaplan Jan 16, 2019
deeef2a
chore(package): update scratch-l10n to version 3.1.20190116193006
greenkeeper[bot] Jan 16, 2019
6f543ae
Refactored the css for sprite context menu items a bit to separate cl…
benjiwheeler Jan 16, 2019
2e017f0
Merge pull request #4359 from apple502j/delete-select
benjiwheeler Jan 16, 2019
97f8eb6
Merge pull request #4354 from paulkaplan/fix-backpack-sprite
kchadha Jan 16, 2019
d2f834d
Merge pull request #4362 from paulkaplan/layout-perf
kchadha Jan 16, 2019
e71547e
chore(package): update scratch-vm to version 0.2.0-prerelease.2019011…
greenkeeper[bot] Jan 16, 2019
4ece92a
chore(package): update scratch-render to version 0.1.0-prerelease.201…
greenkeeper[bot] Jan 16, 2019
946e819
Merge pull request #4368 from LLK/greenkeeper/scratch-vm-0.2.0-prerel…
paulkaplan Jan 16, 2019
db99971
Merge pull request #4366 from LLK/greenkeeper/scratch-render-0.1.0-pr…
paulkaplan Jan 16, 2019
0b2df9d
Merge pull request #4364 from LLK/greenkeeper/scratch-l10n-3.1.201901…
paulkaplan Jan 16, 2019
8ff397a
Update scratch-blocks
kchadha Jan 16, 2019
6adabe3
Merge pull request #4369 from kchadha/update-scratch-blocks
kchadha Jan 16, 2019
d72d2c5
Adding a new runtime event for peripheral disconnects that are intent…
evhan55 Dec 1, 2018
c1ad2b5
Changes to event names to clarify them.
evhan55 Jan 17, 2019
980a6ac
Revert "Adds BorderedMenuItem and use it for delete menu"
paulkaplan Jan 17, 2019
f4c1887
Merge pull request #4374 from LLK/revert-4359-delete-select
paulkaplan Jan 17, 2019
dfc13e2
Fix ordering to allow close button to be clicked.
paulkaplan Jan 17, 2019
8485a47
Add an integration test for using the X button to delete a sprite
paulkaplan Jan 17, 2019
cc81cc7
Fix snapshot tests
paulkaplan Jan 17, 2019
9cc8d54
Merge pull request #4376 from paulkaplan/fix-delete-button
paulkaplan Jan 17, 2019
1b9d52f
update scratch-blocks for languages.
chrisgarrity Jan 17, 2019
5aca970
Merge pull request #4377 from chrisgarrity/update-blocks
chrisgarrity Jan 17, 2019
c97a072
chore(package): update scratch-l10n to version 3.1.20190117191816
greenkeeper[bot] Jan 17, 2019
97319fd
Merge pull request #4379 from LLK/greenkeeper/scratch-l10n-3.1.201901…
chrisgarrity Jan 17, 2019
8be41dd
Fix backpack squishing
paulkaplan Jan 17, 2019
4af8fd3
Merge pull request #4380 from paulkaplan/fix-backpack-squishes
paulkaplan Jan 17, 2019
1d28f52
Revert "Revert "Adds BorderedMenuItem and use it for delete menu""
benjiwheeler Jan 18, 2019
3bbfe94
reduced size, color intensity of sprite context menu separator
benjiwheeler Jan 17, 2019
5e2055f
Revert "Merge pull request #4354 from paulkaplan/fix-backpack-sprite"
paulkaplan Jan 18, 2019
1146689
Fix sound reorder bug.
paulkaplan Jan 18, 2019
eb87463
Merge pull request #4389 from paulkaplan/fix-sound-reord
paulkaplan Jan 18, 2019
7fb57a0
use error-primary color rather than error-light
benjiwheeler Jan 18, 2019
4498ba3
Merge pull request #4385 from LLK/revert-4374-revert-4359-delete-select
benjiwheeler Jan 18, 2019
ff473e8
Merge pull request #3922 from evhan55/extensions/disconnect-errors
ericrosenbaum Jan 18, 2019
f45b3a3
wip show hint example
peeratham Jan 22, 2019
0837318
listen for HintClick event
peeratham Jan 22, 2019
4f2ad53
Merge remote-tracking branch 'LLK/develop' into develop
peeratham Jan 22, 2019
d9b91f0
QualityTutorHOC wip
peeratham Jan 9, 2019
3c300f4
wip show hint example
peeratham Jan 22, 2019
f192975
listen for HintClick event
peeratham Jan 22, 2019
35362fa
Merge remote-tracking branch 'origin/quality-tutor' into quality-tutor
peeratham Jan 22, 2019
c79f4a8
analyze after user becomes inactive
peeratham Jan 23, 2019
513d48a
populate hints and allow applying transformation
peeratham Jan 23, 2019
9194e99
add productionMode
peeratham Jan 23, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
11 changes: 7 additions & 4 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
{
"plugins": [
"syntax-dynamic-import",
"transform-async-to-generator",
"transform-object-rest-spread",
"@babel/plugin-syntax-dynamic-import",
"@babel/plugin-transform-async-to-generator",
"@babel/plugin-proposal-object-rest-spread",
["react-intl", {
"messagesDir": "./translations/messages/"
}]],
"presets": [["env", {"targets": {"browsers": ["last 3 versions", "Safari >= 8", "iOS >= 8"]}}], "react"]
"presets": [
["@babel/preset-env", {"targets": {"browsers": ["last 3 versions", "Safari >= 8", "iOS >= 8"]}}],
"@babel/preset-react"
]
}
5 changes: 5 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@

# File types which we know are binary

# Treat SVG files as binary so that their contents don't change due to line
# endings. The contents of SVGs must not change from the way they're stored
# on assets.scratch.mit.edu so that MD5 calculations don't change.
*.svg binary

# Prefer LF for most file types
*.frag text eol=lf
*.htm text eol=lf
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
# NPM
/node_modules
npm-*
/package-lock.json

# Testing
/.nyc_output
Expand Down
2 changes: 2 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@ npm-*
# Testing
/.nyc_output
/coverage
/test

# Build
/.opt-in
/build

# generated translation files
/translations
28 changes: 19 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,13 @@ before_deploy:
export BEFORE_DEPLOY_RAN=true
fi
deploy:
- provider: script
on:
all_branches: true
skip_cleanup: true
script: npm run deploy -- -x -e $TRAVIS_BRANCH -r https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git
- provider: script
on:
all_branches: true
script: npm run prune -- https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git
- provider: npm
on:
branch:
- master
- develop
- smoke
condition: $TRAVIS_EVENT_TYPE != cron
skip_cleanup: true
email: $NPM_EMAIL
api_key: $NPM_TOKEN
Expand All @@ -53,11 +45,29 @@ deploy:
branch:
- master
- $PREVIEW_BRANCH
condition: $TRAVIS_EVENT_TYPE != cron
access_key_id: $AWS_ACCESS_KEY_ID
secret_access_key: $AWS_SECRET_ACCESS_KEY
bucket: $AWS_BUCKET_NAME
acl: public_read
skip_cleanup: true
local_dir: build
- provider: script
on:
all_branches: true
condition: $TRAVIS_EVENT_TYPE != cron
skip_cleanup: true
script: npm run deploy -- -x -e $TRAVIS_BRANCH -r https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git
- provider: script
on:
all_branches: true
condition: $TRAVIS_EVENT_TYPE != cron
script: npm run prune -- https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git
- provider: script
on:
branch: develop
condition: $TRAVIS_EVENT_TYPE == cron
skip_cleanup: true
script: npm run i18n:src && npm run i18n:push
after_deploy:
- 'curl -X POST -H "Fastly-Key: $FASTLY_TOKEN" -H "Accept: application/json" https://api.fastly.com/service/$FASTLY_SERVICE_ID/purge_all'
89 changes: 78 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ npm install https://github.com/LLK/scratch-gui.git
```
If you want to edit/play yourself:
```bash
git clone git@github.com:LLK/scratch-gui.git
git clone https://github.com/LLK/scratch-gui.git
cd scratch-gui
npm install
```
Expand All @@ -28,33 +28,100 @@ npm start
```
Then go to [http://localhost:8601/](http://localhost:8601/) - the playground outputs the default GUI component

## Developing alongside other Scratch repositories

### Linking this code to another project's `node_modules/scratch-gui`

#### Configuration

If you wish to develop scratch-gui alongside other scratch repositories that depend on it, you may wish
to have the other repositories use your local scratch-gui build instead of fetching the current production
version of the scratch-gui that is found by default using `npm install`.

To do this:
1. Make sure you have run `npm install` from this (scratch-gui) repository's top level
2. Make sure you have run `npm install` from the top level of each repository (such as scratch-www) that depends on scratch-gui
3. From this (scratch-gui) repository's top level, build the `dist` directory by running `BUILD_MODE=dist npm run build`
4. From this (scratch-gui) repository's top level, establish a link to this repository by running `npm link`
5. From the top level of each repository that depends on scratch-gui, run `npm link scratch-gui`
6. Build or run the repositories that depend on scratch-gui

Instead of `BUILD_MODE=dist npm run build` you can also use `BUILD_MODE=dist npm run watch`, however this may be unreliable.

#### Oh no! It didn't work!
* Follow the recipe above step by step and don't change the order. It is especially important to run npm first because installing after the linking will reset the linking.
* Make sure the repositories are siblings on your machine's file tree.
* If you have multiple Terminal tabs or windows open for the different Scratch repositories, make sure to use the same node version in all of them.
* In the worst case unlink the repositories by running `npm unlink` in both, and start over.

## Testing
NOTE: If you're a windows user, please run these scripts in Windows `cmd.exe` instead of Git Bash/MINGW64.
### Documentation

You may want to review the documentation for [Jest](https://facebook.github.io/jest/docs/en/api.html) and [Enzyme](http://airbnb.io/enzyme/docs/api/) as you write your tests.

Run linter, unit tests, build, and integration tests.
See [jest cli docs](https://facebook.github.io/jest/docs/en/cli.html#content) for more options.

### Running tests

*NOTE: If you're a windows user, please run these scripts in Windows `cmd.exe` instead of Git Bash/MINGW64.*

Before running any test, make sure you have run `npm install` from this (scratch-gui) repository's top level.

#### Main testing command

To run linter, unit tests, build, and integration tests, all at once:
```bash
npm test
```

Run unit tests in isolation.
#### Running unit tests

To run unit tests in isolation:
```bash
npm run unit-test
npm run test:unit
```

Run unit tests in watch mode (watches for code changes and continuously runs tests). See [jest cli docs](https://facebook.github.io/jest/docs/en/cli.html#content) for more options.
To run unit tests in watch mode (watches for code changes and continuously runs tests):
```bash
npm run unit-test -- --watch
npm run test:unit -- --watch
```

Run integration tests in isolation.
You can run a single file of integration tests (in this example, the `button` tests):

```bash
npm run integration-test
$(npm bin)/jest --runInBand test/unit/components/button.test.jsx
```

You may want to review the documentation for [Jest](https://facebook.github.io/jest/docs/en/api.html) and [Enzyme](http://airbnb.io/enzyme/docs/api/) as you write your tests.
#### Running integration tests

## Publishing to GitHub Pages
Integration tests use a headless browser to manipulate the actual html and javascript that the repo
produces. You will not see this activity (though you can hear it when sounds are played!).

Note that integration tests require you to first create a build that can be loaded in a browser:

```bash
npm run build
```

Then, you can run all integration tests:

```bash
npm run test:integration
```

Or, you can run a single file of integration tests (in this example, the `backpack` tests):

```bash
$(npm bin)/jest --runInBand test/integration/backpack.test.js
```

If you want to watch the browser as it runs the test, rather than running headless, use:

```bash
USE_HEADLESS=no $(npm bin)/jest --runInBand test/integration/backpack.test.js
```

## Publishing to GitHub Pages
You can publish the GUI to github.io so that others on the Internet can view it.
[Read the wiki for a step-by-step guide.](https://github.com/LLK/scratch-gui/wiki/Publishing-to-GitHub-Pages)

Expand Down
88 changes: 48 additions & 40 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"clean": "rimraf ./build && mkdirp build && rimraf ./dist && mkdirp dist",
"deploy": "touch build/.nojekyll && gh-pages -t -d build -m \"Build for $(git log --pretty=format:%H -n1)\"",
"prune": "./prune-gh-pages.sh",
"i18n:src": "babel src > tmp.js && rimraf tmp.js && build-i18n-src ./translations/messages/src ./translations/",
"i18n:push": "tx-push-src scratch-editor interface translations/en.json",
"i18n:src": "rimraf ./translations/messages/src && babel src > tmp.js && rimraf tmp.js && build-i18n-src ./translations/messages/src ./translations/ && npm run i18n:push",
"start": "webpack-dev-server",
"test": "npm run test:lint && npm run test:unit && npm run build && npm run test:integration",
"test:integration": "jest --runInBand test[\\\\/]integration",
Expand All @@ -29,91 +30,98 @@
"react-dom": "^16.0.0"
},
"devDependencies": {
"arraybuffer-loader": "^1.0.3",
"autoprefixer": "^8.1.0",
"babel-core": "^6.23.1",
"babel-eslint": "^8.0.1",
"babel-loader": "^7.1.0",
"babel-plugin-syntax-dynamic-import": "^6.18.0",
"babel-plugin-transform-async-to-generator": "^6.24.1",
"babel-plugin-transform-object-rest-spread": "^6.22.0",
"babel-preset-env": "^1.6.1",
"babel-preset-react": "^6.22.0",
"@babel/cli": "^7.1.2",
"@babel/core": "^7.1.2",
"@babel/plugin-proposal-object-rest-spread": "^7.0.0",
"@babel/plugin-syntax-dynamic-import": "^7.0.0",
"@babel/plugin-transform-async-to-generator": "^7.1.0",
"@babel/preset-env": "^7.1.0",
"@babel/preset-react": "^7.0.0",
"arraybuffer-loader": "^1.0.6",
"autoprefixer": "^9.0.1",
"babel-core": "7.0.0-bridge.0",
"babel-eslint": "^10.0.1",
"babel-loader": "^8.0.4",
"base64-loader": "1.0.0",
"bowser": "1.9.3",
"chromedriver": "2.40.0",
"bowser": "1.9.4",
"chromedriver": "2.44.1",
"classnames": "2.2.6",
"computed-style-to-inline-style": "3.0.0",
"copy-webpack-plugin": "^4.5.1",
"core-js": "2.5.7",
"css-loader": "^0.28.11",
"enzyme": "^3.1.0",
"enzyme-adapter-react-16": "1.1.1",
"css-loader": "^1.0.0",
"enzyme": "^3.5.0",
"enzyme-adapter-react-16": "1.3.0",
"es6-object-assign": "1.1.0",
"eslint": "^5.0.1",
"eslint-config-scratch": "^5.0.0",
"eslint-plugin-import": "^2.8.0",
"eslint-plugin-react": "^7.5.1",
"file-loader": "1.1.11",
"eslint-plugin-react": "7.11.1",
"file-loader": "2.0.0",
"get-float-time-domain-data": "0.1.0",
"get-user-media-promise": "1.1.4",
"gh-pages": "github:rschamp/gh-pages#publish-branch-to-subfolder",
"html-webpack-plugin": "^3.2.0",
"immutable": "3.8.2",
"intl": "1.2.5",
"jest": "^21.0.0",
"js-base64": "2.4.9",
"keymirror": "0.1.1",
"lodash.bindall": "4.4.0",
"lodash.debounce": "4.0.8",
"lodash.defaultsdeep": "4.6.0",
"lodash.isequal": "4.5.0",
"lodash.omit": "4.5.0",
"lodash.pick": "4.4.0",
"lodash.throttle": "4.0.1",
"minilog": "3.1.0",
"mkdirp": "^0.5.1",
"postcss-import": "^11.0.0",
"postcss-loader": "^2.1.4",
"postcss-simple-vars": "^4.0.0",
"papaparse": "4.6.2",
"postcss-import": "^12.0.0",
"postcss-loader": "^3.0.0",
"postcss-simple-vars": "^5.0.1",
"prop-types": "^15.5.10",
"query-string": "^5.1.1",
"raf": "^3.4.0",
"raw-loader": "^0.5.1",
"react": "16.2.0",
"react-contextmenu": "2.9.2",
"react-contextmenu": "2.9.4",
"react-dom": "16.2.0",
"react-draggable": "3.0.5",
"react-ga": "2.5.3",
"react-intl": "2.4.0",
"react-modal": "3.4.4",
"react-popover": "0.5.7",
"react-modal": "3.6.1",
"react-popover": "0.5.10",
"react-redux": "5.0.7",
"react-responsive": "4.1.0",
"react-style-proptype": "3.2.1",
"react-tabs": "2.2.2",
"react-responsive": "5.0.0",
"react-style-proptype": "3.2.2",
"react-tabs": "2.3.0",
"react-test-renderer": "16.2.0",
"react-tooltip": "3.6.1",
"react-virtualized": "9.20.0",
"react-tooltip": "3.8.0",
"react-virtualized": "9.20.1",
"redux": "3.7.2",
"redux-mock-store": "^1.2.3",
"redux-throttle": "0.1.1",
"rimraf": "^2.6.1",
"scratch-audio": "0.1.0-prerelease.20180625202813",
"scratch-blocks": "0.1.0-prerelease.1531482946",
"scratch-l10n": "3.0.20180712200642",
"scratch-paint": "0.2.0-prerelease.20180712195436",
"scratch-render": "0.1.0-prerelease.20180618173030",
"scratch-storage": "0.5.1",
"scratch-svg-renderer": "0.2.0-prerelease.20180712223402",
"scratch-vm": "0.1.0-prerelease.1531486395",
"scratch-audio": "0.1.0-prerelease.20190114210212",
"scratch-blocks": "0.1.0-prerelease.1547735159",
"scratch-l10n": "3.1.20190117191816",
"scratch-paint": "0.2.0-prerelease.20190114205252",
"scratch-render": "0.1.0-prerelease.20190116202853",
"scratch-storage": "1.2.2",
"scratch-svg-renderer": "0.2.0-prerelease.20190110205335",
"scratch-vm": "0.2.0-prerelease.20190116202234",
"selenium-webdriver": "3.6.0",
"startaudiocontext": "1.2.1",
"style-loader": "^0.21.0",
"style-loader": "^0.23.0",
"svg-to-image": "1.1.3",
"text-encoding": "0.6.4",
"text-encoding": "0.7.0",
"to-style": "1.3.3",
"uglifyjs-webpack-plugin": "^1.2.5",
"wav-encoder": "1.3.0",
"web-audio-test-api": "^0.5.2",
"webpack": "^4.6.0",
"webpack-cli": "^2.0.15",
"webpack-cli": "^3.1.0",
"webpack-dev-server": "^3.1.3",
"xhr": "2.5.0"
},
Expand Down
5 changes: 4 additions & 1 deletion src/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ module.exports = {
'import/no-commonjs': 'error',
'import/no-amd': 'error',
'import/no-nodejs-modules': 'error',
'react/jsx-no-literals': 'error'
'react/jsx-no-literals': 'error',
'no-confusing-arrow': ['error', {
'allowParens': true
}]
},
settings: {
react: {
Expand Down
Loading