Dev

Dockerfile

@@ -0,0 +1,21 @@
+# ベースイメージに Node.js 18 を使用
+FROM node:18-slim
+
+# 作業ディレクトリを /app に設定
+WORKDIR /app
+
+# 依存関係のみ先にコピーしてインストール（キャッシュを効かせるため）
+COPY package.json package-lock.json ./
+# パッチファイルとスクリプトを先にコピー（postinstallとprepublishスクリプトのため）
+COPY patches ./patches
+COPY scripts ./scripts
+RUN npm install
+
+# ソースコード全体をコピー
+COPY . .
+
+# ポート開放（scratch-gui がデフォルトで8601を使う設定だった）
+EXPOSE 8601
+
+# デフォルトコマンドは開発サーバー起動
+CMD ["npm", "start"]

package.json

@@ -24,6 +24,7 @@
     "test:lint": "eslint . --ext .js,.jsx",
     "test:unit": "jest test[\\\\/]unit",
     "test:smoke": "jest --runInBand test[\\\\/]smoke",
+    "postinstall": "patch-package",
     "watch": "webpack --watch"
   },
   "config": {
@@ -71,6 +72,7 @@
     "react-contextmenu": "^2.9.4",
     "react-draggable": "^3.0.5",
     "react-ga": "^2.5.3",
+    "react-icons": "^5.5.0",
     "react-intl": "^2.9.0",
     "react-modal": "^3.9.1",
     "react-popover": "^0.5.10",
@@ -129,6 +131,7 @@
     "husky": "8.0.3",
     "jest": "21.2.1",
     "jest-junit": "7.0.0",
+    "patch-package": "^8.0.0",
     "raf": "3.4.1",
     "react-test-renderer": "16.14.0",
     "redux-mock-store": "1.5.5",

patches/scratch-storage+4.0.172.patch

@@ -0,0 +1,81 @@
+diff --git a/node_modules/scratch-storage/dist/node/scratch-storage.js b/node_modules/scratch-storage/dist/node/scratch-storage.js
+index ff3ac05..a04bd98 100644
+--- a/node_modules/scratch-storage/dist/node/scratch-storage.js
++++ b/node_modules/scratch-storage/dist/node/scratch-storage.js
+@@ -4414,11 +4414,16 @@ class ProxyTool {
+     let filter = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : ProxyTool.TOOL_FILTER.ALL;
+     ProxyTool_defineProperty(this, "tools", void 0);
+     let tools;
+-    if (filter === ProxyTool.TOOL_FILTER.READY) {
+-      tools = [new FetchTool()];
+-    } else {
+-      tools = [new PublicFetchWorkerTool(), new FetchTool()];
+-    }
++
++    // Always use FetchTool to avoid worker-based fetch failures:
++    tools = [new FetchTool()];
++    // Legacy:
++    // if (filter === ProxyTool.TOOL_FILTER.READY) {
++    //   tools = [new FetchTool()];
++    // } else {
++    //     tools = [new FetchWorkerTool(), new FetchTool()];
++    // }
++
+     /**
+      * Sequence of tools to proxy.
+      * @type {Array.<Tool>}
+diff --git a/node_modules/scratch-storage/dist/web/scratch-storage.js b/node_modules/scratch-storage/dist/web/scratch-storage.js
+index 1e2aa25..f77f134 100644
+--- a/node_modules/scratch-storage/dist/web/scratch-storage.js
++++ b/node_modules/scratch-storage/dist/web/scratch-storage.js
+@@ -5294,11 +5294,16 @@ class ProxyTool {
+     let filter = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : ProxyTool.TOOL_FILTER.ALL;
+     ProxyTool_defineProperty(this, "tools", void 0);
+     let tools;
+-    if (filter === ProxyTool.TOOL_FILTER.READY) {
+-      tools = [new FetchTool()];
+-    } else {
+-      tools = [new PublicFetchWorkerTool(), new FetchTool()];
+-    }
++
++    // Always use FetchTool to avoid worker-based fetch failures:
++    tools = [new FetchTool()];
++    // Legacy:
++    // if (filter === ProxyTool.TOOL_FILTER.READY) {
++    //   tools = [new FetchTool()];
++    // } else {
++    //     tools = [new FetchWorkerTool(), new FetchTool()];
++    // }
++    
+     /**
+      * Sequence of tools to proxy.
+      * @type {Array.<Tool>}
+diff --git a/node_modules/scratch-storage/dist/web/scratch-storage.min.js b/node_modules/scratch-storage/dist/web/scratch-storage.min.js.backup
+similarity index 100%
+rename from node_modules/scratch-storage/dist/web/scratch-storage.min.js
+rename to node_modules/scratch-storage/dist/web/scratch-storage.min.js.backup
+diff --git a/node_modules/scratch-storage/src/ProxyTool.ts b/node_modules/scratch-storage/src/ProxyTool.ts
+index e6626f4..08432bd 100644
+--- a/node_modules/scratch-storage/src/ProxyTool.ts
++++ b/node_modules/scratch-storage/src/ProxyTool.ts
+@@ -36,11 +36,15 @@ export default class ProxyTool implements Tool {
+
+     constructor (filter: ToolFilter = ProxyTool.TOOL_FILTER.ALL) {
+         let tools: Tool[];
+-        if (filter === ProxyTool.TOOL_FILTER.READY) {
+-            tools = [new FetchTool()];
+-        } else {
+-            tools = [new FetchWorkerTool(), new FetchTool()];
+-        }
++
++        // Always use FetchTool to avoid worker-based fetch failures:
++        tools = [new FetchTool()];
++        // Legacy:
++        // if (filter === ProxyTool.TOOL_FILTER.READY) {
++        //   tools = [new FetchTool()];
++        // } else {
++        //     tools = [new FetchWorkerTool(), new FetchTool()];
++        // }
+
+         /**
+          * Sequence of tools to proxy.

src/components/action-menu/action-menu.css

@@ -157,7 +157,9 @@ button::-moz-focus-inner {
     border-radius: $form-radius !important;
     box-shadow: 0 0 .5rem hsla(0, 0%, 0%, .25) !important;
     font-family: "Helvetica Neue", Helvetica, Arial, sans-serif !important;
-    z-index: $z-index-tooltip !important;
+    z-index: 999999 !important;
+    white-space: nowrap !important;
+    position: fixed !important;
 }
 
 $arrow-size: 0.5rem;