attempts

.gitmodules

@@ -5,4 +5,8 @@
 [submodule "scratch-packages/scratch-vm"]
 	path = scratch-packages/scratch-vm
 	url = [email protected]:mitmedialab/prg-raise-playground-scratch-vm.git
-	branch = main
+	branch = main
+[submodule "scratch-packages/scratch-blocks"]
+	path = scratch-packages/scratch-blocks
+	url = [email protected]:gonfunko/scratch-blocks.git
+	branch = blockly-changes

extensions/paths.tsconfig.json

@@ -32,6 +32,12 @@
       ],
       "$scratch-vm/*": [
         "../scratch-packages/scratch-vm/src/*"
+      ],
+      "$scratch-blocks": [
+        "../scratch-packages/scratch-blocks/src"
+      ],
+      "$scratch-blocks/*": [
+        "../scratch-packages/scratch-blocks/src/*"
       ]
     }
   }

extensions/scripts/utils/aliases.ts

@@ -1,17 +1,19 @@
 import fs from "fs";
 
-import { vmSrc } from "$root/scripts/paths";
+import { vmSrc, blocksSrc } from "$root/scripts/paths";
 import { commonDirectory } from "./fileSystem";
 
 export const commonAlias = "$common";
 export const scratchVmAlias = "$scratch-vm";
+export const scratchBlocksAlias = "$scratch-blocks"
 
 const getCommonAliasEntry = () => getAlias(commonDirectory, commonAlias);
 const getScratchVmAliasEntry = () => getAlias(vmSrc, scratchVmAlias);
+const getScratchBlocksAliasEntry = () => getAlias(blocksSrc, scratchBlocksAlias);
 
 const getAlias = (location: string, alias: string) => {
   if (!fs.existsSync(location)) throw new Error(`Could not form alias '${alias}' because location didn't exist: ${location}`);
   return { [alias]: location };
 }
 
-export const getAliasEntries = () => ({ ...getCommonAliasEntry(), ...getScratchVmAliasEntry() });
+export const getAliasEntries = () => ({ ...getCommonAliasEntry(), ...getScratchVmAliasEntry(), ...getScratchBlocksAliasEntry() });

scripts/paths.ts

@@ -9,10 +9,12 @@ const getPackage = (name: string) => path.join(root, "scratch-packages", `scratc
 export const scratchPackages = {
   gui: getPackage("gui"),
   vm: getPackage("vm"),
+  blocks: getPackage("blocks")
 }
 
 export const vmSrc = path.join(scratchPackages.vm, "src");
 export const guiSrc = path.join(scratchPackages.gui, "src");
+export const blocksSrc = path.join(scratchPackages.blocks, "src");
 export const extensionsFolder = path.join(root, "extensions");