Make scratch-blocks depend on Blockly rather than forking it

.eslintrc

@@ -57,5 +57,8 @@
         "Blockly": true, # Blockly global
         "goog": true, # goog closure libraries/includes
     },
-    "extends": "eslint:recommended"
+    "extends": "eslint:recommended",
+    "parserOptions": {
+        "sourceType": "module",
+    }
 }

.github/workflows/deploy.yml

@@ -6,7 +6,6 @@ jobs:
     setup:
       runs-on: ubuntu-latest
       env:
-        JVM_OPTS: -Xmx3200m
         PROJECT_PATH: ./scratch-blocks
       steps:
         - run: |
@@ -16,32 +15,24 @@ jobs:
         - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
         - name: Check Python version
           run: python --version
-        - name: Setup Java
-          uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3
-          with:
-            distribution: 'temurin'
-            java-version: 17
         - name: Setup Node
           uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # v3
           with:
             node-version-file: '.nvmrc'
+        # TODO: tests
         - name: Install Node Dependencies
-          run: npm ci
-        - name: Lint
-          run: npm run test:lint
-        - name: Run Tests
-          run: npm run test:messages
-        - name: Run Unit Tests
-          run: DISPLAY=:99 npm run test:unit
-        - name: Remove Closure App
-          run: rm -rf gh-pages/closure-library/scripts/ci/CloseAdobeDialog.exe
-        - name: Deploy playground to GitHub Pages
-          uses: peaceiris/actions-gh-pages@373f7f263a76c20808c831209c920827a82a2847 # v3
-          with:
-            github_token: ${{ secrets.GITHUB_TOKEN }}
-            publish_dir: ./gh-pages
-            full_commit_message: "Build for ${{ github.sha }} ${{ github.event.head_commit.message }}"
-            enable_jekyll: true
+          # The --legacy-peer-deps flag is a TEMPORARY fix during the Blockly 12 beta.
+          # It should be removed once the @blockly/* packages support Blockly 12.
+          run: npm ci --legacy-peer-deps
+        - name: Build
+          run: npm run build
+        # - name: Deploy playground to GitHub Pages
+        #   uses: peaceiris/actions-gh-pages@373f7f263a76c20808c831209c920827a82a2847 # v3
+        #   with:
+        #     github_token: ${{ secrets.GITHUB_TOKEN }}
+        #     publish_dir: ./gh-pages
+        #     full_commit_message: "Build for ${{ github.sha }} ${{ github.event.head_commit.message }}"
+        #     enable_jekyll: true
         - name: Run semantic-release
           env:
             NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

.gitignore

@@ -24,6 +24,7 @@ python_compressed.js
 .vscode
 
 /accessible/*
+/build
 /dist
 /msg/js/*
 !/msg/js/en.js

.husky/commit-msg

@@ -1,4 +1 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
 npx --no-install commitlint --edit "$1"

TODO.md

@@ -0,0 +1,16 @@
+# To-Do list for scratch-blocks un-fork
+
+Before this un-forked version of `scratch-blocks` is fully ready for release, we need to:
+
+- [ ] Hook up i18n / l10n
+- [x] Fix or remove Husky
+- [x] Set up CI & CD
+- [ ] Wait for Blockly v12 release, then update Blockly dependencies accordingly
+
+Things we need to do before we consider this project "done" but could wait until after the initial release:
+
+- [ ] Decide what we want to do about tests, then do it
+- [ ] Pick linting rules, apply them, and enforce them
+- [ ] Make sure the gh-pages setup is doing what we want, or remove it
+- [ ] ???
+- [ ] Remove this TODO file once it's empty :)