Commit graph

280 commits

Author SHA1 Message Date
Karishma Chadha
9d8602db93 Removing specific save-load branch dependency now that scratch-parser has been updated. 2018-03-05 15:16:06 -05:00
Karishma Chadha
605ce4b16d Configuring scratch-vm to use changes made to scratch-parser. 2018-03-05 15:16:06 -05:00
Karishma Chadha
e0b23cde31 Can load saved sb3 files (including sounds and costumes that were modified in the 3.0 editors and saved in the sb3 zip when the project was saved). Tests still need to be fixed. 2018-03-05 15:16:06 -05:00
Karishma Chadha
1169f5badd Hooking up vm to scratch-parser for sb2 validation. 2018-03-05 15:16:06 -05:00
Karishma Chadha
79169c81b3 Use scratch-parser to validate structure of project json files. 2018-02-26 22:43:55 -05:00
Eric Rosenbaum
063ac39019 Load music extension assets with require 2018-02-14 17:53:05 -05:00
Paul Kaplan
32e240f18a
Merge pull request #916 from LLK/greenkeeper/scratch-storage-0.4.0
Update scratch-storage to the latest version 🚀
2018-01-31 09:30:09 -05:00
greenkeeper[bot]
1be4565c4b chore(package): update scratch-storage to version 0.4.0 2018-01-23 18:38:45 +00:00
Andrew Sliwinski
a9dd658445
Merge branch 'develop' into greenkeeper/tap-11.0.1 2018-01-19 08:45:58 -05:00
Paul Kaplan
d649b2555b Require TextEncoder correctly 2018-01-17 11:41:24 -05:00
Ray Schamp
e83141e810
Revert "Use text-encoding library for text encoder" 2018-01-17 10:59:28 -05:00
DD
2c1412dda4 Use text-encoding library for text encoder 2018-01-16 17:41:18 -05:00
greenkeeper[bot]
2343e04ff9 chore(package): update tap to version 11.0.1
Closes #818
2017-12-21 22:28:11 +00:00
Ray Schamp
49aa363a30
Merge pull request #868 from LLK/greenkeeper/webpack-3.10.0
chore(package): update webpack to version 3.10.0
2017-12-19 09:50:29 -05:00
chrisgarrity
f51cf9877e
Preliminary localization (#777)
* localize the block and menu strings in the pen extension
* adds .tx/config to be able to push translations to transifex
* includes format-message to localize strings and extracting them.
* add setLocale function to VM to allow GUI to pass in locale data.
* refresh block definitions when the locale changes.

### Still to be decided
For now just extracting messages from the pen extension into their own file. We’ll need to decide if each category gets its own file, or group all the strings into one resource.
2017-12-11 15:41:45 -05:00
greenkeeper[bot]
48505fd7e2 chore(package): update webpack to version 3.10.0
Closes #620
2017-12-04 18:48:49 +00:00
Paul Kaplan
80b4dab104 Decode the encoded argument information 2017-11-29 10:34:59 -05:00
Christopher Willis-Ford
12acdefb5a Add "browser" field to package.json
This informs webpack (say, in `scratch-gui`) about the web-targeted
build output so that it can resolve dependencies correctly. This fixes
build problems that became evident after merging #805.
2017-11-27 19:15:05 -08:00
Andrew Sliwinski
519d41d966
Merge pull request #805 from thisandagain/bugfix/802
Replace 'got' module with 'nets'
2017-11-27 15:17:04 -05:00
Andrew Sliwinski
621087904d
Merge pull request #811 from LLK/greenkeeper/copy-webpack-plugin-4.2.1
chore(package): update copy-webpack-plugin to version 4.2.1
2017-11-21 12:30:44 -05:00
Andrew Sliwinski
51bd0349b0
Merge branch 'develop' into greenkeeper/expose-loader-0.7.4 2017-11-20 20:14:03 -05:00
Andrew Sliwinski
8395fffe52
Merge pull request #809 from LLK/greenkeeper/worker-loader-1.1.0
chore(package): update worker-loader to version 1.1.0
2017-11-20 20:12:45 -05:00
Andrew Sliwinski
8e154474b7
Merge branch 'develop' into greenkeeper/script-loader-0.7.2 2017-11-20 20:11:30 -05:00
Andrew Sliwinski
fef8f23a57
Merge pull request #690 from LLK/greenkeeper/eslint-config-scratch-5.0.0
Update eslint-config-scratch to the latest version 🚀
2017-11-20 20:09:24 -05:00
Andrew Sliwinski
a73ef6819f Resolve merge conflicts 2017-11-20 17:39:07 -05:00
Andrew Sliwinski
d5acdbe983
Merge pull request #727 from LLK/greenkeeper/socket.io-client-2.0.4
Update socket.io-client to the latest version
2017-11-20 17:08:33 -05:00
Andrew Sliwinski
ea63fee483
Merge pull request #804 from LLK/greenkeeper/promise-8.0.1
chore(package): update promise to version 8.0.1
2017-11-20 17:06:36 -05:00
Andrew Sliwinski
a8c629dc9b Replace 'got' module with 'nets'. Resolves GH-802 2017-11-20 17:04:17 -05:00
greenkeeper[bot]
e052f1d53b chore(package): update expose-loader to version 0.7.4 2017-11-18 07:41:49 +00:00
greenkeeper[bot]
0959c4dbd5 chore(package): update gh-pages to version 1.1.0
Closes #559
2017-11-17 21:59:41 +00:00
greenkeeper[bot]
8963d0222f chore(package): update copy-webpack-plugin to version 4.2.1
Closes #682
2017-11-17 14:24:32 +00:00
greenkeeper[bot]
54e19b2bb5 chore(package): update scratch-storage to version 0.3.0 2017-11-02 20:05:55 +00:00
Ray Schamp
dfd28fbc1f Merge pull request #679 from aeons/unqualified-paths
Use unqualified paths in package.json scripts
2017-10-26 09:21:43 -04:00
greenkeeper[bot]
5e4bdb2bc3 chore(package): update worker-loader to version 1.1.0
Closes #680
2017-10-24 02:08:45 +00:00
greenkeeper[bot]
b74c82a08a chore(package): update socket.io-client to version 2.0.4 2017-10-22 13:19:34 +00:00
greenkeeper[bot]
3614a208b6 chore(package): update eslint-config-scratch to version 5.0.0 2017-10-05 14:04:59 +00:00
Christopher Willis-Ford
dd20e09774 Extensions: escape HTML entities in default values
This prevents generation of invalid XML due to characters like '<' or
'>' in fields' default values. Unfortunately the value comes back in its
escaped form, so there's still more work to be done.
2017-10-04 13:00:45 -07:00
greenkeeper[bot]
59650b9dfd chore(package): update script-loader to version 0.7.2
Closes #678
2017-09-29 19:14:25 +00:00
Bjørn Madsen
157a527def Use unqualified paths in package.json scripts
This allows stuff like yarn workspaces to function with node_modules hoisted.
2017-09-22 11:41:08 +02:00
Christopher Willis-Ford
7fb7f0dc7b WIP Extension Manager
When asked to load an extension, the Extension Manager starts up a new
Worker. That worker runs the message dispatch system as well as an
instance of the new `ExtensionWorker` class, which will load the desired
extension and register it with the extension system.

Extensions, placed in `./src/extensions/*.js`, are now processed by
Webpack as separate entry points and packed into an `extensions`
subdirectory in the output.

Still to do: query an extension's information, including the blocks it
provides, and register that information with the VM, GUI, etc.
2017-09-06 00:57:03 -06:00
Ray Schamp
a4d634d84d Update lint dependencies 2017-08-26 13:24:05 -04:00
Christopher Willis-Ford
0fcc248ac1 Add tests for message dispatch system; fix bugs
The tests run using TinyWorker, which emulates web workers on Node.
There are quite a few quirks in that situation due to the differences
between Node and Webpack as well as the differences between TinyWorker
and real Web Workers.

The tests also exposed a few bugs in the dispatch system, which have now
been fixed. Most notably, if a method called through the dispatch system
throws an exception that exception will now be passed back to the
caller. Previously the exception would escape the dispatch system and
the caller would never hear any response at all.
2017-07-21 13:23:52 -07:00
greenkeeper[bot]
c5aa32b5bb chore(package): update promise to version 8.0.1
Closes #613
2017-07-12 20:38:41 +00:00
Ray Schamp
3431fb39c8 Don't run prepublish on install 2017-06-27 09:28:56 -04:00
Ray Schamp
28dae39ddd Use stages instead of travis-after-all
Also, parallelize tap tests
2017-06-27 09:26:40 -04:00
Ray Schamp
908c34bcf4 Merge branch 'develop' into bugfix/npm-install 2017-06-14 17:04:19 -04:00
Ray Schamp
ecf535f4c3 Merge pull request #579 from cwillisf/load-jpeg-backdrops
Specify dataFormat when loading asset for import
2017-06-02 09:06:37 -04:00
Ray Schamp
467b747283 Bump scratch-storage version
Now 0.2.0 is the lowest compatible version.
2017-06-02 08:57:21 -04:00
Ray Schamp
d3a4a7b81a Pin to latest for 3.0 modules
Reverts #551

Pinning to `^0.1.0.prerelease.0` is not equivalent to `latest`, since has the effect of not installing the latest version on `npm install`, you have to also do `npm update`. This hurts us ergonomically on `npm install`, and doesn't help us since we already are releasing breaking changes on `prerelease`.
2017-06-01 12:31:24 -04:00
DD Liu
809760b954 Merge branch 'develop' into immutableState 2017-05-26 13:50:50 -04:00
Chris Willis-Ford
3970883e45 Merge pull request #549 from cwillisf/device-manager-client
Device manager client
2017-05-24 14:43:28 -07:00
DD Liu
66c8d9550d add dep to package.json 2017-05-19 12:42:37 -04:00
Ray Schamp
6c9701f4b2 Merge branch 'develop' into feature/serialization 2017-05-11 13:04:27 -04:00
Ray Schamp
620a4bd57b Require scratch-storage minimum version of 0.1.0
This gives us the caching behavior required for serialization
2017-05-11 12:47:06 -04:00
Christopher Willis-Ford
35d0544ce0 Respond to review comments
- Pin `got` and `socket-io.client`
- Finish removing `removeSocket`-related code
2017-05-05 10:37:29 -07:00
Christopher Willis-Ford
44ae4fed54 Minor-pin all Scratch 3.0 prerelease modules
Pin these modules to 0.*-prerelease.* to avoid problems when we
eventually bump to 1.x
2017-05-01 15:24:07 -07:00
Christopher Willis-Ford
f3c6be2881 Add an I/O device to represent the Device Manager 2017-04-28 13:40:13 -07:00
greenkeeper[bot]
1cb4c33178 chore(package): update babel-loader to version 7.0.0
https://greenkeeper.io/
2017-04-21 20:25:30 +00:00
greenkeeper[bot]
306e62b8b1 chore(package): update webpack to version 2.4.1
Closes #509

https://greenkeeper.io/
2017-04-20 19:26:03 -04:00
Ray Schamp
9be29439b1 Fix webpack for ES6 2017-04-17 19:55:34 -04:00
Chris Willis-Ford
3d7f1187e5 Merge branch 'develop' into use-scratch-storage 2017-03-13 15:48:21 -07:00
Ray Schamp
b03768cad6 Remove filter toolbox utility (#496)
* Revert "Merge pull request #486 from rschamp/fix-filter-tests"

This reverts commit ba00db897f, reversing
changes made to 739c5deb63.

* Revert "Show Categories that use custom code to load (variables, procedures) (#483)"

This reverts commit 739c5deb63.

* Revert "Merge pull request #461 from rschamp/filter-toolbox"

This reverts commit 343b5bfe8e, reversing
changes made to 370f2c6a47.
2017-03-09 16:41:06 -05:00
Christopher Willis-Ford
c23e9c6bf8 Load projects & costumes through scratch-storage
This also sets up the framework to load sounds through scratch-storage,
to be finished in a later change.
2017-03-09 11:25:55 -08:00
Ray Schamp
6ea9b54539 Add filterToolbox unit tests 2017-02-27 12:58:18 -05:00
Ray Schamp
ed4b0080b6 Use caret ranges for dev dependencies
These packages don't affect the output of the built package, so don't require a specific version. This should quiet Greenkeeper down a bit about our dependencies.
2017-02-20 17:15:50 -05:00
Ray Schamp
6fba4c61e3 Merge pull request #474 from LLK/greenkeeper/expose-loader-0.7.3
chore(package): update expose-loader to version 0.7.3
2017-02-20 16:45:05 -05:00
Ray Schamp
47953ab58f Merge pull request #475 from LLK/greenkeeper/webpack-dev-server-2.4.1
chore(package): update webpack-dev-server to version 2.4.1
2017-02-20 16:44:45 -05:00
Ray Schamp
bee8c8d50d Merge pull request #473 from LLK/greenkeeper/eslint-3.16.0
Update eslint to the latest version 🚀
2017-02-20 16:25:21 -05:00
greenkeeper[bot]
867d3c79f5 chore(package): update eslint to version 3.16.0
https://greenkeeper.io/
2017-02-20 16:37:01 +00:00
greenkeeper[bot]
0118a19cd5 chore(package): update webpack-dev-server to version 2.4.1
Closes #470

https://greenkeeper.io/
2017-02-19 22:15:28 +00:00
greenkeeper[bot]
d7bff34a66 chore(package): update tap to version 10.2.0
https://greenkeeper.io/
2017-02-19 01:19:16 +00:00
greenkeeper[bot]
9f364b93eb chore(package): update tap to version 10.1.2
https://greenkeeper.io/
2017-02-18 02:13:29 +00:00
greenkeeper[bot]
fba054cc68 chore(package): update tap to version 10.1.1
https://greenkeeper.io/
2017-02-14 19:26:13 +00:00
greenkeeper[bot]
a69950add4 chore(package): update expose-loader to version 0.7.3
Closes #454

https://greenkeeper.io/
2017-02-14 18:57:35 +00:00
Ray Schamp
292a930aa7 Merge pull request #429 from LLK/greenkeeper/webpack-dev-server-2.3.0
Update webpack-dev-server to the latest version 🚀
2017-02-09 16:30:05 -05:00
greenkeeper[bot]
c12cc25e5f chore(package): update tap to version 10.1.0
https://greenkeeper.io/
2017-02-07 23:35:36 +00:00
greenkeeper[bot]
284357941b chore(package): update eslint to version 3.15.0
https://greenkeeper.io/
2017-02-03 22:04:26 +00:00
greenkeeper[bot]
30cdef5782 chore(package): update webpack-dev-server to version 2.3.0
https://greenkeeper.io/
2017-02-03 15:13:39 +00:00
greenkeeper[bot]
7612a46c61 chore(package): update tap to version 10.0.2
https://greenkeeper.io/
2017-02-02 23:33:29 +00:00
greenkeeper[bot]
6ca8814a2f chore(package): update tap to version 10.0.1
https://greenkeeper.io/
2017-02-02 06:26:51 +00:00
Ray Schamp
a6568c4bf2 Update webpack config for webpack 2
* `module.loaders` -> `module.rules`
* loaders need `-loader` suffix
* `json-loader` is enabled by default
* `UglifyJsPlugin`'s `compress.warning` setting is false by default
2017-02-01 16:27:55 -05:00
greenkeeper[bot]
82acfddeb5 chore(package): update dependencies
https://greenkeeper.io/
2017-02-01 15:19:46 +00:00
Chris Willis-Ford
9b04392211 Move build outputs into a dist/ subdirectory (#375)
* Move Node output: /dist.js => /dist/node/scratch-vm.js
* Move web output: /vm{.js,.min.js} => /dist/web/scratch-vm{.js,.min.js}
* Update build output references in package.json and the playground's index.html
* Move the VirtualMachine class out of index.js into its own file, referenced by index.js. The VirtualMachine class is otherwise unchanged.
* Add .gitattributes rules for new file types which were added to this repository without specifying their text/binary attributes
* Turn on source maps in webpack and add corresponding .gitignore rule
2017-01-13 13:34:26 -08:00
Eric Rosenbaum
dc9126e067 Merge pull request #373 from ericrosenbaum/sound
Integrate audio engine
2017-01-06 16:28:09 -05:00
Eric Rosenbaum
e1b6479e67 fix name of scratch-audio dependency 2017-01-06 15:18:30 -05:00
Andrew Sliwinski
dfc6614a5b Build out integration test SB2 files 2016-12-23 21:08:13 -05:00
Eric Rosenbaum
f2793a1d59 Merge branch 'develop' of https://github.com/LLK/scratch-vm into sound
# Conflicts:
#	package.json
#	src/engine/runtime.js
#	src/sprites/clone.js
2016-12-21 15:29:57 -05:00
Ray Schamp
867c08b495 Include dotfiles in gh-pages, so .nojekyll works 2016-11-10 14:31:45 -05:00
Ray Schamp
084148e353 Fix path to .nojekyll
The path on scratch-gui which this was copied from is different than the one for scratch-vm.
2016-11-09 13:41:57 -05:00
Tim Mickel
f5ee6a7e58 Prevent gh-pages from being processed with Jekyll
Thanks @rschamp
2016-11-09 10:50:32 -05:00
Andrew Sliwinski
1b4a1ca1bc Resolve merge conflicts 2016-10-24 15:53:42 -04:00
Andrew Sliwinski
50b896e935 Unify integration and unit tests to resolve issue with coverage reporting 2016-10-24 12:04:22 -04:00
Ray Schamp
9f0c4eb098 Update to eslint-config-scratch 2.0
We are on a fast release cycle here.
2016-10-24 11:39:39 -04:00
Ray Schamp
1bd1d8e8d1 Keep up with non-breaking lint changes 2016-10-23 22:21:59 -04:00
Ray Schamp
73edb65c4d Replace console with minilog 2016-10-23 22:20:30 -04:00
Ray Schamp
f6c0064235 All linting other than console statements 2016-10-23 22:20:29 -04:00
Ray Schamp
36e4683aa8 Install and use eslint-config-scratch 2016-10-23 12:03:59 -04:00
Eric Rosenbaum
f3f2fea3dd add watch command 2016-10-18 12:50:22 -04:00
Ray Schamp
1b9f9e63d6 Fix scratch-* dependency versions for npm update
The issues:
* The scratch-blocks@0.1.0 version exists because I accidentally published 0.1.0 (no -prerelease modifier) while setting up NPM
* I added a step that causes Travis to run `npm update` after installing
* The "0.1.0-prepublish" dependency version makes no sense

This made Travis install the old version of scratch-blocks that I published accidentally, which breaks the playground.
2016-10-18 12:00:52 -04:00
Eric Rosenbaum
ba84b6e34b move audioengine to its own module 2016-10-17 17:16:13 -04:00
Ray Schamp
3f4a244cbd Replace Makefile with npm scripts 2016-10-17 09:42:35 -04:00
TheBrokenRail
476221fc1b change second start to build 2016-10-12 21:00:10 -04:00
TheBrokenRail
cb4a75928e Add NPM Script 'build' 2016-10-04 20:25:06 -04:00
Ray Schamp
4c80e9a9b0 Use new version format for scratch-* dependencies 2016-09-27 10:23:12 -04:00
Ray Schamp
e31fc19a50 Update version format
-prerelease.[timestamp] is semver friendly. Move SHA info to package.json.
2016-09-27 09:20:55 -04:00
Ray Schamp
e4ec9c551f Use most recent version of scratch-* dependencies 2016-09-26 11:47:00 -04:00
Ray Schamp
6b1d2a8eb6 Update dev server to only serve the playground
Now that we don't rely on node_modules, we can update the content base to just `playground` and just look at it from http://localhost:8080/
2016-09-26 10:04:47 -04:00
Ray Schamp
7eb2e58a38 Publish to NPM
Authenticate with NPM via .npmrc and publish the package version + "-[git sha]".

Remove vm and vm.min.js, they'll be built before the package is published to NPM and available on installation. When installing from git, the build step will run on npm install.
2016-09-26 09:42:53 -04:00
Ray Schamp
89f751e651 Publish playground to gh-pages 2016-09-26 09:42:53 -04:00
Ray Schamp
a99f9ad5ff Provide playground dependencies with webpack
This confines all the files the playground needs to the playground directory.
2016-09-26 09:42:37 -04:00
Ray Schamp
e689664733 Build the module to be imported
This puts the details of the loaders needed to build index.js out of the concern of the packages that require it.
2016-09-20 16:35:11 -04:00
Ray Schamp
fa10a2279a Only expose VirtualMachine to window for bundles 2016-09-20 10:29:47 -04:00
TheBrokenRail
220d614a9d Better README! (#114)
Improve README
Implement "npm start"
2016-08-31 13:31:01 -07:00
Tim Mickel
6d773076c5 Update package.json 2016-08-24 14:03:42 -04:00
Tim Mickel
7a44dce816 Add stats.js meter to playground 2016-08-11 22:54:57 -04:00
Andrew Sliwinski
32b1d4ec61 Remove memoizee dependency and usage in adapter. Resolves GH-2 2016-08-08 17:07:50 -04:00
Tim Mickel
c47a061edb Updates for newly released scratch-render repo 2016-08-08 15:43:52 -04:00
Tim Mickel
19da0b0032 Add renderer demo using scratch-render-webgl 2016-06-30 18:59:47 -04:00
Tim Mickel
d72cc55c11 Example that uses promises instead of util.report 2016-06-30 18:56:23 -04:00
Tim Mickel
020bf1ef65 Use absolute version number for webpack-dev-server 2016-06-21 15:28:47 -04:00
Tim Mickel
b144ca7a2e Add dev server to help with WebWorker development 2016-06-21 14:42:24 -04:00
Tim Mickel
e92832772f Absolute version number for highlightjs dependency 2016-06-01 13:13:52 -04:00
Tim Mickel
6593c399c1 Update to use syntax highlighting in block explorer 2016-06-01 13:13:52 -04:00
Tim Mickel
1c253df3a2 Add a basic demo playground with scratch-blocks 2016-06-01 13:13:41 -04:00
Andrew Sliwinski
fe1340c4ab Update package version to 'pre release' 2016-05-10 12:15:27 -04:00
Andrew Sliwinski
389d112729 All tests passing 2016-04-26 09:54:14 -04:00
Andrew Sliwinski
981b85e78f AST create / change / move / delete from blockly 2016-04-26 09:49:52 -04:00
Andrew Sliwinski
f9f47ed103 WIP 2016-04-18 17:20:30 -04:00
Andrew Sliwinski
655556273a Initial commit 2016-04-08 13:10:37 -04:00
Andrew Sliwinski
9d5423f22a Initial commit 2016-03-28 12:53:44 -04:00