Add pxt-blockly npm package, copy files (microsoft#5554)

* Pull pxt-blockly npm package, copy files * Add webapp/public/blockly to gitignore now that it"s being pulled in by npm
redwoodsteve · May 20, 2019 · c1a6ae8 · c1a6ae8
1 parent 0523f46
commit c1a6ae8
Show file tree

Hide file tree

Showing 29 changed files with 13 additions and 4,014 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,6 @@
 templater.sh
 web/_temp
-webapp/public/blockly/blockly_uncompressed.js
-webapp/public/blockly/core
+webapp/public/blockly
 webapp/public/closure-library
 node_modules
 *.sw?

diff --git a/Jakefile.js b/Jakefile.js
@@ -153,6 +153,17 @@ compileDir("cli", ["built/pxtlib.js", "built/pxtsim.js", "built/pxtcompiler.js",
 compileDir("backendutils", ['pxtlib/commonutil.ts', 'pxtlib/docsrender.ts'])
 file("built/web/pxtweb.js", expand(["docfiles/pxtweb"]), { async: true }, function () { tscIn(this, "docfiles/pxtweb", "built") })
 
+if (!fs.existsSync("webapp/public/blockly")) fs.mkdirSync("webapp/public/blockly");
+if (!fs.existsSync("webapp/public/blockly/msg")) fs.mkdirSync("webapp/public/blockly/msg");
+if (!fs.existsSync("webapp/public/blockly/msg/js")) fs.mkdirSync("webapp/public/blockly/msg/js");
+if (!fs.existsSync("webapp/public/blockly/msg/json")) fs.mkdirSync("webapp/public/blockly/msg/json");
+
+jake.cpR('node_modules/pxt-blockly/blocks_compressed.js', 'webapp/public/blockly/');
+jake.cpR('node_modules/pxt-blockly/blockly_compressed.js', 'webapp/public/blockly/');
+jake.cpR('node_modules/pxt-blockly/msg/js/en.js', 'webapp/public/blockly/msg/js/');
+jake.cpR('node_modules/pxt-blockly/msg/json/en.json', 'webapp/public/blockly/msg/json/');
+jake.cpR('node_modules/pxt-blockly/media', 'webapp/public/blockly/');
+
 task("karma", ["blocklycompilertest"], function () {
     runKarma(this, "");
 });

diff --git a/package.json b/package.json
@@ -80,6 +80,7 @@
   "devDependencies": {
     "monaco-editor": "0.10.0",
     "pxt-monaco-typescript": "2.3.5",
+    "pxt-blockly": "2.0.1",
     "react": "16.3.1",
     "react-dom": "16.3.1",
     "react-modal": "3.3.2",

diff --git a/webapp/public/blockly/blockly_compressed.js b/webapp/public/blockly/blockly_compressed.js
diff --git a/webapp/public/blockly/blocks_compressed.js b/webapp/public/blockly/blocks_compressed.js
diff --git a/webapp/public/blockly/media/1x1.gif b/webapp/public/blockly/media/1x1.gif
diff --git a/webapp/public/blockly/media/add.svg b/webapp/public/blockly/media/add.svg
diff --git a/webapp/public/blockly/media/c_arrow.svg b/webapp/public/blockly/media/c_arrow.svg
diff --git a/webapp/public/blockly/media/click.mp3 b/webapp/public/blockly/media/click.mp3
diff --git a/webapp/public/blockly/media/click.ogg b/webapp/public/blockly/media/click.ogg
diff --git a/webapp/public/blockly/media/click.wav b/webapp/public/blockly/media/click.wav
diff --git a/webapp/public/blockly/media/delete.mp3 b/webapp/public/blockly/media/delete.mp3
diff --git a/webapp/public/blockly/media/delete.ogg b/webapp/public/blockly/media/delete.ogg
diff --git a/webapp/public/blockly/media/delete.wav b/webapp/public/blockly/media/delete.wav
diff --git a/webapp/public/blockly/media/disconnect.mp3 b/webapp/public/blockly/media/disconnect.mp3
diff --git a/webapp/public/blockly/media/disconnect.ogg b/webapp/public/blockly/media/disconnect.ogg
diff --git a/webapp/public/blockly/media/disconnect.wav b/webapp/public/blockly/media/disconnect.wav
diff --git a/webapp/public/blockly/media/dropdown-arrow-dark.svg b/webapp/public/blockly/media/dropdown-arrow-dark.svg
diff --git a/webapp/public/blockly/media/dropdown-arrow.svg b/webapp/public/blockly/media/dropdown-arrow.svg
diff --git a/webapp/public/blockly/media/handclosed.cur b/webapp/public/blockly/media/handclosed.cur
diff --git a/webapp/public/blockly/media/handdelete.cur b/webapp/public/blockly/media/handdelete.cur
diff --git a/webapp/public/blockly/media/handopen.cur b/webapp/public/blockly/media/handopen.cur
diff --git a/webapp/public/blockly/media/quote0.svg b/webapp/public/blockly/media/quote0.svg
diff --git a/webapp/public/blockly/media/quote1.svg b/webapp/public/blockly/media/quote1.svg
diff --git a/webapp/public/blockly/media/remove.svg b/webapp/public/blockly/media/remove.svg
diff --git a/webapp/public/blockly/media/sprites.png b/webapp/public/blockly/media/sprites.png