@robotical/martyblocksjr 3.5.28 → 3.5.30

package/editions/free/src/localizations/en.json

@@ -517,8 +517,8 @@
   "BLOCK_DESC_MOVE_MARTY_DANCE": "Dance",
   "BLOCK_DESC_MOVE_MARTY_FORWARD": "Move Forward",
   "BLOCK_DESC_MOVE_MARTY_BACK": "Move Back",
-  "BLOCK_DESC_MOVE_MARTY_RIGHT": "Move Forward",
-  "BLOCK_DESC_MOVE_MARTY_LEFT": "Move Back",
+  "BLOCK_DESC_MOVE_MARTY_RIGHT": "Move Right",
+  "BLOCK_DESC_MOVE_MARTY_LEFT": "Move Left",
   "BLOCK_DESC_MOVE_MARTY_UP": "Move Up",
   "BLOCK_DESC_MOVE_MARTY_DOWN": "Move Down",
   "BLOCK_DESC_GO_MARTY_HOME": "Go Home",
@@ -1122,4 +1122,4 @@
   "MARTY_JRBLOCKS5_STEP_22_TEXT": "Almost done! Finally, add another green flag block to the soccer net code",
   "MARTY_JRBLOCKS5_STEP_23_TEXT": "Finish this off with a <b/>start/stop counter</b> block, so your score resets every time you start a new game.",
   "MARTY_JRBLOCKS5_END": "You did it! Press the green flag and play Marty's goal shooter!"
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@robotical/martyblocksjr",
-  "version": "3.5.28",
+  "version": "3.5.30",
   "description": "ScratchJr",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
@@ -27,6 +27,7 @@
   "homepage": "https://github.com/llk/scratchjr",
   "devDependencies": {
     "@babel/polyfill": "^7.10.4",
+    "@babel/preset-env": "^7.25.4",
     "babel-core": "^6.4.0",
     "babel-eslint": "^4.1.6",
     "babel-loader": "^8.2.5",
@@ -40,6 +41,7 @@
     "esformatter-semicolons": "^1.1.2",
     "eslint": "^1.10.3",
     "expose-loader": "^3.0.0",
+    "puppeteer": "^2.1.1",
     "strip-sourcemap-loader": "0.0.1",
     "vitest": "^4.0.14",
     "webpack": "^5.73.0",

package/tests/e2e/chromium-79-smoke.test.js

@@ -0,0 +1,69 @@
+import { afterAll, beforeAll, describe, expect, it } from "vitest";
+import puppeteer from "puppeteer";
+import { spawn } from "child_process";
+import http from "http";
+
+const PORT = 3011;
+const HOST = `http://localhost:${PORT}`;
+
+let server;
+
+async function waitForServer(maxAttempts = 20) {
+  for (let attempt = 0; attempt < maxAttempts; attempt += 1) {
+    const ok = await new Promise((resolve) => {
+      const req = http.get(`${HOST}/`, (res) => {
+        res.destroy();
+        resolve(true);
+      });
+      req.on("error", () => resolve(false));
+    });
+    if (ok) {
+      return;
+    }
+    await new Promise((resolve) => setTimeout(resolve, 500));
+  }
+  throw new Error("Local server did not start in time");
+}
+
+beforeAll(async () => {
+  server = spawn("python3", ["-m", "http.server", `${PORT}`, "--directory", "editions/free/src"], {
+    stdio: "ignore",
+  });
+  await waitForServer();
+}, 30_000);
+
+afterAll(() => {
+  if (server) {
+    server.kill();
+  }
+});
+
+describe("Chromium 79 smoke test", () => {
+  it(
+    "loads home page without console errors",
+    async () => {
+      const browser = await puppeteer.launch({
+        headless: true,
+        args: ["--no-sandbox"],
+      });
+      const page = await browser.newPage();
+      const errors = [];
+
+      page.on("pageerror", (err) => errors.push(err.message || String(err)));
+      page.on("console", (msg) => {
+        if (msg.type() === "error") {
+          errors.push(msg.text());
+        }
+      });
+
+      await page.goto(`${HOST}/home.html`, { waitUntil: "networkidle2", timeout: 30_000 });
+      const title = await page.title();
+
+      await browser.close();
+
+      expect(title.toLowerCase()).toContain("scratch");
+      expect(errors).toEqual([]);
+    },
+    60_000
+  );
+});

package/webpack.config.js

@@ -1,8 +1,23 @@
 var WebpackNotifierPlugin = require("webpack-notifier");
+const path = require("path");
 // const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
 
 const mode = process.argv.find(arg => arg.startsWith('--mode=')).split('=')[1];
 const isProduction = mode === 'production';
+const sqlJsPath = path.dirname(require.resolve("sql.js/package.json"));
+
+const babelLoaderOptions = {
+  presets: [
+    ["@babel/preset-env", {
+      targets: {
+        chrome: "60",
+        firefox: "60",
+        safari: "11"
+      },
+      bugfixes: true,
+    }]
+  ]
+};
 
 module.exports = {
   resolve: {
@@ -44,16 +59,20 @@ module.exports = {
         //   },
       },
       {
-        loader: "babel-loader",
-        exclude: /node_modules/,
         test: /\.jsx?$/,
-        // options: {
-        //     // For `underscore` library, it can be `_.map map` or `_.map|map`
-        //     exposes: "babel-loader",
-        //   },
-        // query: {
-        //     presets: ['es2015', 'stage-3']
-        // }
+        exclude: /node_modules/,
+        use: {
+          loader: "babel-loader",
+          options: babelLoaderOptions,
+        },
+      },
+      {
+        test: /\.js$/,
+        include: [sqlJsPath],
+        use: {
+          loader: "babel-loader",
+          options: babelLoaderOptions,
+        },
       },
     ],
   },