Added goog resolver webpack loader, kemp only compressed pxt files, moved arduino files to client

Author: filipbudisa

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "pxt-blockly"]
-	path = pxt-blockly
-	url = https://github.com/microsoft/pxt-blockly.git

client/config/goog-loader/index.js

@@ -0,0 +1,125 @@
+const path = require("path");
+const paths = require("../paths");
+const ProvideCollector = require("./provideCollector");
+
+const sources = [
+  path.join(paths.appSrc, "blockly")
+];
+
+let provideMap = [];
+(function collectProvides(){
+  let collector = new ProvideCollector(sources);
+  provideMap = collector.collect();
+})();
+
+const googRegex = new RegExp("\\s*goog\\.(provide|require)\\(\\s*[\"'](.*)[\"']\\s*\\)");
+const googLibRegex = new RegExp(".*goog\\..*", "g");
+const dotRegex = new RegExp("\\.", "g");
+const strictRegex = new RegExp("\\s*[\"']use strict[\"'].*", "g");
+
+let output = "";
+function appendLine(line){
+  output += line + "\n";
+}
+function append(code){
+  if(Array.isArray(code)){
+    code.forEach(appendLine);
+  }else{
+    appendLine(code);
+  }
+}
+
+const googs = { provide: gProvide, require: gRequire };
+
+let libIncluded = false;
+
+function processLine(line){
+  if(line.match(strictRegex) !== null) return;
+
+  let result = line.match(googRegex);
+
+  if(line.startsWith("//") || result === null){
+    append(line);
+    return;
+  }
+
+  let goog = result[1];
+  let module = result[2];
+
+  if(googs.hasOwnProperty(goog)){
+    googs[goog](module); // Yay for overcomplicating things ;)
+  }else{
+    append(line);
+  }
+}
+
+let provides = [];
+function gProvide(module){
+  provides.push(module);
+  buildup(module).forEach(object => append(optionalObject(object)));
+  append(optionalObject(module));
+}
+
+function gRequire(module){
+  let basename = module.split(".")[0];
+  if(basename === "goog") return;
+
+  let file = (typeof provideMap[module] === "undefined") ? module : provideMap[module];
+  let imp = "require('" + file + "')";
+  append("var " + basename + " = typeof " + basename + " === 'undefined' ? " + imp + " : Object.assign(" + basename + ", " + imp + ");");
+}
+
+function printProvides(){
+  if(provides.length === 0) return;
+
+  let mapped = [];
+
+  provides.forEach(provide => {
+    let renamed = rename(provide);
+    mapped.push(renamed + ": " + provide);
+  });
+
+  //append("module.exports = { " + mapped.join(", ") + " }");
+  append("module.exports = " + provides[0].split(".")[0] + ";");
+}
+
+function rename(module){
+  return module.replace(dotRegex, "___");
+}
+
+function optionalObject(object){
+  let addVar = object.split(".").length === 1;
+
+  return (addVar ? "var " : "") + object + " = typeof " + object + " === 'undefined' ? {} : " + object + ";";
+}
+
+function buildup(namespace){
+  let objects = [];
+
+  let parts = namespace.split(".");
+
+  for(let i = 0; i < parts.length-1; i++){
+    let upTo = parts.slice(0, i+1);
+    objects.push(upTo.join("."));
+  }
+
+  return objects;
+}
+
+function init(){
+  output = "";
+  provides = [];
+  libIncluded = false;
+}
+
+module.exports = function(content, map, meta) {
+
+  return function(source){
+    init();
+
+    source.split("\n").forEach(processLine);
+    printProvides();
+
+    return output;
+  }(content);
+};

client/config/goog-loader/provideCollector.js

@@ -0,0 +1,59 @@
+const path = require("path");
+const walker = require("walk");
+const fs = require('fs');
+
+class ProvideCollector {
+
+  constructor(roots){
+    if(Array.isArray(roots)){
+      this.roots = roots;
+    }else{
+      this.roots = [ roots ];
+    }
+
+    this.regex = new RegExp("goog\\.provide\\(\\s*[\"'](.*)[\"']\\s*\\)", "g");
+
+    let context = this;
+
+    this.walkOptions = {
+      followLinks: false,
+      mask: "*.js",
+
+      listeners: {
+        file: (root, fileStats, next) => {
+          let extension = path.extname(fileStats.name).toLowerCase();
+          if(extension !== ".js") next();
+
+          context.checkFile(path.join(root, fileStats.name), () => next());
+        }
+      }
+    };
+  }
+
+  checkFile(filepath, callback){
+    let regex = this.regex;
+    let map = this.provides;
+
+    let data = fs.readFileSync(filepath, { encoding: "UTF-8" });
+    data.split("\n").forEach(line => {
+      let match = regex.exec(line);
+      while(match !== null){
+        let provide = match[1];
+        map[provide] = filepath;
+        match = regex.exec(line);
+      }
+    });
+
+    callback();
+  }
+
+  collect(){
+    this.provides = {};
+
+    this.roots.forEach(root => walker.walkSync(root, this.walkOptions));
+
+    return this.provides;
+  }
+}
+
+module.exports = ProvideCollector;

client/config/webpack.config.js

@@ -334,6 +334,13 @@ module.exports = function(webpackEnv) {
           ],
           include: paths.appSrc,
         },
+        // Goog
+        {
+          test: /\.(js|mjs|jsx|ts|tsx)$/,
+          include: path.join(paths.appSrc, "blockly"),
+          loader: require.resolve('./goog-loader'),
+          enforce: 'pre'
+        },
         {
           // "oneOf" will traverse all following loaders until one will
           // match the requirements. When no loader matches it will fall

client/package.json

@@ -65,6 +65,7 @@
     "ts-pnp": "1.1.2",
     "typescript": "3.5.3",
     "url-loader": "2.1.0",
+    "walk": "^2.3.14",
     "webpack": "4.39.1",
     "webpack-dev-server": "3.2.1",
     "webpack-manifest-plugin": "2.0.4",