Commit Graph
31 Commits
Author SHA1 Message Date
Ray Schamp 0bc0f3ae39 Only lint for React/ES6 in src 2016-10-23 11:53:17 -04:00
Ray Schamp ed63d5250b Update eslint to use shared eslint-config-scratch 2016-10-22 10:58:51 -04:00
Ray Schamp 534feb9fc2 Pin React devDependencies, add peerDependencies
When the package is installed as a dependency, it should warn the installer that React is a peerDependency.  When installed this way, the devDependencies won't be installed, so only one version of React will be present. However when it's installed as a standalone project, React should be installed automatically as a devDependency.

I think this gives us the best of both worlds — simple development setup as well as supporting usage as an installed package.
2016-10-21 10:57:37 -04:00
Tim Mickel bd900a937c Fix merge duplication of package.json 2016-10-20 13:46:52 -04:00
Tim Mickel 7a675cd82f Merge branch 'master' into feature/libraries
# Conflicts:
#	package.json
#	src/containers/gui.js
2016-10-20 13:10:23 -04:00
Tim Mickel 41c1765242 Initial rough sprite/costume/backdrop libraries 2016-10-19 18:03:42 -04:00
Ray Schamp a608d4a23f Update deploy script to match vm
Makes local deployment easier
2016-10-19 09:31:46 -04:00
Ray Schamp 8e5fe959ff Allow configuration of GUI subcomponent props
So that you can adjust them without redefining the entire GUI.
Also allow adjusting props passed to GUIComponent.
2016-10-19 09:26:30 -04:00
Ray Schamp 07f5cb4995 Fix scratch-* dependency version updates
`npm update` does what we want and is less hacky than removing the packages entirely first.  Specify latest as the version so we always get the latest version even though I erroneously installed scratch-blocks@0.1.0.
2016-10-19 08:36:23 -04:00
Ray Schamp 8a083cd658 Fix default port config 2016-10-17 11:04:54 -04:00
Ray Schamp 4ba4f21bac Opt in to git hooks 2016-10-17 00:07:46 -04:00
Ray Schamp 49d00636e7 Add git hooks to avoid pushing broken builds 2016-10-16 23:53:05 -04:00
Ray Schamp 75291e4ffe Move Makefile into npm scripts 2016-10-16 23:47:20 -04:00
Ray Schamp 51d5b7a992 Decoupling refactor
Use fewer refs, these had weird behavior that caused the order of components to matter.
Attach events eagerly, as soon as the necessary objects are available.
Make VMManager an actual class instantiated with a VM so we don't have to pass it to every method.
Use bindAll everywhere for convenience.
2016-10-14 00:37:48 -04:00
Ray Schamp edd09fa48a Install React as a dev dependency
Once another project uses this package, these should become peerDependencies.  Until then install automatically.
2016-10-13 16:48:40 -04:00
Ray Schamp 54548b5c0b Update project on hash change
While doing so:
- Use ProjectLoader for loading projects
- Stop using loadEmptyProject and supply empty project data
- Move project loading to App, GUI now receives data (as a string - the vm should receive an object eventually)
- Add logging
2016-10-12 23:22:15 -04:00
Ray Schamp 9abdc519a1 Add project loading 2016-09-28 10:53:37 -04:00
Ray Schamp ea5ebeb7ad Provide Blockly media to playground 2016-09-28 09:48:39 -04:00
Ray Schamp 627487fed3 Use travis_after_all fork for private repos 2016-09-28 09:47:58 -04:00
Ray Schamp 0bbc53706d Use semver-friendly version format for scratch-* 2016-09-27 10:46:22 -04:00
Ray Schamp 37843229ab Build in same node environments as scratch-* 2016-09-27 10:42:55 -04:00
Ray Schamp 9a0319d525 Don't be strict about the React dependencies
Because these are peer dependencies, we should be lenient about the required version of React required to use the components.

I didn't use the caret because the x's work and it's obvious what they mean, unlike ^ and ~.
2016-09-26 11:02:26 -04:00
Ray Schamp 2d9c93da26 Always use the most recent scratch-* packages 2016-09-26 10:21:39 -04:00
Ray Schamp 30aa510c7b Switch to published packages
Now they don't have to be built and rebuilt every npm install
2016-09-25 14:57:04 -04:00
Ray Schamp fe15041e2e Deploy to gh-pages 2016-09-23 11:19:22 -04:00
Ray Schamp 4a35375332 Make React a peer dependency
Multiple installations of React can cause issues if the package is used just for the components.
2016-09-19 17:07:19 -04:00
Ray Schamp 0911b50893 Un-shim scratch-blocks, it shims itself now 2016-09-16 18:25:44 -04:00
Ray Schamp 20778d8d05 The playground is the product 2016-09-15 16:50:10 -04:00
Ray Schamp 61ce1400fa Set up Travis 2016-09-15 12:55:58 -04:00
Ray Schamp 5169f97d8f Add default blocks options and validation
Add skeleton toolbox component
2016-09-15 12:49:07 -04:00
Ray Schamp a173405cc3 Initial commit 2016-09-15 00:50:28 -04:00