Remove browserify, Use rollup #1561

ShinobuTakahashi · 2026-03-03T04:15:05Z

browserify -> rollup 変更のファイルで、この PR でレビューしていただきたいファイルです。
CI で落ちていますが、#1703 で対応しています。

-Original file line number
+Diff line change
@@ -0,0 +1,7 @@
+    ---
+    "@akashic/akashic-cli-lib-manage": patch
+    "@akashic/akashic-cli-commons": patch
+    "@akashic/akashic-cli-export": patch
+    ---
+    Remove browserify & mock-fs, Use rollup & memfs

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
     node_modules/
     packages/akashic-cli-serve/www/public/thirdparty/
     CHANGELOG.md
+    .changeset/

-Original file line number
+Diff line change
@@ Expand Up / @@ -35,10 +35,11 @@ @@
         "@akashic/remark-preset-lint": "^0.1.2",
         "@changesets/changelog-github": "^0.5.0",
         "@changesets/cli": "^2.27.5",
+        "@types/node": "^22.19.13",
         "get-port": "^7.1.0",
         "nx": "^20.3.1",
         "ps-tree": "^1.2.0",
-        "remark-cli": "^10.0.1",
-        "shelljs": "^0.8.5"
+        "remark-cli": "^12.0.0",
+        "shelljs": "^0.10.0"
       }
     }

-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ module.exports = [ @@
             languageOptions: {
                 sourceType: "module",
                 parserOptions: {
-                    project: "tsconfig.json",
+                    project: "tsconfig.test.json",
                 },
             },
             ignores: [
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -41,22 +41,22 @@ @@
       ],
       "devDependencies": {
         "@akashic/eslint-config": "^3.0.2",
-        "@types/browserify": "12.0.40",
-        "@types/mock-fs": "4.13.4",
         "@types/node": "20.14.15",
         "@types/resolve": "^1.20.6",
-        "mock-fs": "5.2.0",
+        "memfs": "4.23.0",
         "mock-require": "^3.0.3",
-        "shx": "0.3.4",
+        "shx": "0.4.0",
         "typescript": "5.5.4"
       },
       "dependencies": {
         "@akashic/game-configuration": "2.5.0",
-        "browserify": "17.0.1",
+        "@rollup/plugin-node-resolve": "^16.0.1",
+        "@rollup/plugin-commonjs": "^28.0.3",
         "editorconfig": "^2.0.0",
         "fs-readdir-recursive": "1.1.0",
         "js-sha256": "^0.11.0",
-        "resolve": "^1.22.8"
+        "resolve": "^1.22.8",
+        "rollup": "4.41.1"
       },
       "publishConfig": {
         "access": "public",
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove browserify, Use rollup #1561

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

ShinobuTakahashi Mar 3, 2026 •

edited

Loading

Uh oh!

Uh oh!

-Original file line number
+Diff line change
@@ -1,12 +1,17 @@
     import * as fs from "fs";
+    import { createRequire } from "module";
     import * as path from "path";
     import type { ModuleMainPathsMap, ModuleMainScriptsMap } from "@akashic/game-configuration";
-    import browserify from "browserify";
+    import { nodeResolve } from "@rollup/plugin-node-resolve";
+    import type { RollupOptions } from "rollup";
+    import { rollup } from "rollup";
     import { ConsoleLogger } from "./ConsoleLogger.js";
     import type { Logger } from "./Logger.js";
-    import { StringStream } from "./StringStream.js";
     import * as Util from "./Util.js";
+    const require = createRequire(import.meta.url);
+    const commonjs = require("@rollup/plugin-commonjs");
     interface ModuleMainInfo {
     	moduleName: string;
     	mainScriptPath: string;
@@ Expand Down Expand Up / @@ -88,7 +93,7 @@ export module NodeModules { @@
     	// TODO: node_modules/ 以下以外でも利用するメソッドのため、NodeModules ではなく別の適切な場所に移動する
     	// checkAllModules は実験的なものです。 akashic-cli の外部から利用しないでください
-    	export function listScriptFiles(
+    	export async function listScriptFiles(
     		basepath: string,
     		modules: string|string[],
     		logger: Logger,
@@ Expand All / @@ -97,41 +102,32 @@ export module NodeModules { @@
     		if (modules.length === 0) return Promise.resolve([]);
     		const moduleNames = (typeof modules === "string") ? [modules] : modules;
-    		// moduleNamesをrequireするだけのソースコード文字列を作って依存性解析の基点にする
-    		// (moduleNamesを直接b.require()してもよいはずだが、そうするとモジュールのエントリポイントの代わりに
-    		// モジュールの名前(ディレクトリ名であることが多い)が出力されてしまうので避ける)
-    		const dummyRootName = "__akashic-cli_dummy_require_root.js";
-    		const dummyRootPath = path.join(basepath, dummyRootName);
-    		const rootRequirer = moduleNames.map((name: string) => {
-    			return "require(\"" + Util.makeModuleNameNoVer(name) + "\");";
-    		}).join("\n");
     		// akashicコンテンツが Node.js のコアモジュールを参照するモジュールに依存している場合、
     		// akashic-cli-commons/node_modules 以下への依存として表現される。
     		// これを検知した場合、そのモジュールへの依存はgame.jsonに追記せず、akashicコマンドユーザには警告を表示する。
     		const ignoreModulePaths = ["/akashic-cli-commons/node_modules/"];
-    		// builtins (コアモジュール) を有効にすると browserify が polyfill したモジュールが b.on("dep", ...) で検出される。
-    		// したがってここでは false を指定してコアモジュールの読み込みを禁止する。
-    		const builtins = false;
-    		const b = browserify({
-    			entries: new StringStream(rootRequirer, dummyRootPath),
-    			basedir: basepath,
-    			preserveSymlinks: true, // npm link で node_modules 以下に置かれたモジュールを symlink パスのまま扱う
-    			builtins,
-    		});
-    		b.external("g");
+    		const restoreDirectory = Util.chdir(basepath);
+    		const inputOptions: RollupOptions = {
+    			input: moduleNames,
+    			external: ["g"],
+    			preserveSymlinks: true,
+    			plugins: [
+    				commonjs(),
+    				nodeResolve()
+    			]
+    		};
+    		const filePaths: string[] = [];
+    		try {
+    			const bundle = await rollup(inputOptions);
-    		return new Promise<string[]>((resolve, reject) => {
-    			const filePaths: string[] = [];
-    			b.on("dep", (row: any) => {
-    				const filePath = Util.makeUnixPath(path.relative(basepath, row.file));
-    				if (filePath === dummyRootName || (!checkAllModules && !(/^(?:\.\/)?node_modules/.test(filePath)))) {
+    			bundle.watchFiles.forEach(file => {
+    				const filePath = Util.makeUnixPath(path.relative(basepath, file));
+    				if (!checkAllModules && !(/^(?:\.\/)?node_modules/.test(filePath))) {
     					return;
     				}
     				if (/^\.\.\//.test(filePath)) {
-    					const rawFilePath = Util.makeUnixPath(row.file);
+    					const rawFilePath = Util.makeUnixPath(file);
     					if (ignoreModulePaths.find((modulePath) => rawFilePath.includes(modulePath))) {
     						const detectedModuleName = path.basename(path.dirname(filePath));
     						const msg = "Reference to '" + detectedModuleName
@@ Expand All / @@ -144,14 +140,13 @@ export module NodeModules { @@
     					const msg = "Unsupported module found in " + JSON.stringify(modules)
     												+ ". Skipped listing '" + filePath
     												+ "' that cannot be dealt with. (This may be a core module of Node.js)";
-    					reject(new Error(msg));
-    					return;
+    					throw new Error(msg);
     				}
     				filePaths.push(filePath);
     			});
-    			b.bundle((err: any) => {
-    				void (err ? reject(err) : resolve(filePaths));
-    			});
-    		});
+    		} finally {
+    			await restoreDirectory();
+    		}
+    		return filePaths;
     	}
     }

-Original file line number
+Diff line change
@@ -1,10 +1,15 @@
-    import mockfs from "mock-fs";
     import { Configuration } from "../Configuration.js";
     import { ConsoleLogger } from "../ConsoleLogger.js";
+    import { fs, vol } from "memfs";
+    vi.mock("node:fs", async () => {
+      const memfs: { fs: typeof fs } = await vi.importActual("memfs")
+      return memfs.fs;
+    });
     describe("Configuration", () => {
     	afterEach(() => {
-    		mockfs.restore();
+    		vol.reset();
     	});
     	it("can be instantiated", () => {
     		const loggedResult: string[] = [];
@@ Expand Down Expand Up / @@ -58,7 +63,7 @@ describe("Configuration", () => { @@
     				"zoo": {}
     			}
     		};
-    		mockfs(mockFsContent);
+    		vol.fromNestedJSON(mockFsContent);
     		const self = new Configuration({ content: content, logger: logger });
     		self.vacuumGlobalScripts();
@@ Expand Down @@

-Original file line number
+Diff line change
@@ -1,14 +1,41 @@
-    import mockfs from "mock-fs";
     import { readFile, writeFile, readJSON, writeJSON, readdir, unlink } from "../FileSystem.js";
     import { buildEditorconfig } from "./helpers/buildEditorconfig.js";
+    import { fs, vol } from "memfs";
+    import * as editorconfig from "editorconfig";
+    import path from "path";
+    vi.mock("node:fs", async () => {
+      const memfs: { fs: typeof fs } = await vi.importActual("memfs");
+      return memfs.fs;
+    });
+    // editorconfig の parse() で memfs でモックした .editorconfig が読み込めないため parse() をモックしている。
+    vi.mock("editorconfig", async (importOriginal) => {
+    	return {
+    		...await importOriginal<typeof editorconfig>(),
+    		parse: vi.fn((filepath: string, options?: editorconfig.ParseOptions): Promise<editorconfig.Props> => {
+    			const targetPath = path.join(path.dirname(filepath), ".editorconfig");
+    			if (!fs.existsSync(targetPath)) return Promise.resolve({});
+    			const ret = fs.readFileSync(targetPath);
+    			const parsed = editorconfig.parseBuffer(ret as Buffer);
+    			const parsedObj = parsed[1][1];
+    			const obj: editorconfig.Props = {
+    				indent_size: parseInt(parsedObj.indent_size, 10),
+    				indent_style: parsedObj.indent_style === "tab" ? "tab" : "space",
+    				insert_final_newline: parsedObj.insert_final_newline === "true"
+    			}
+    			return Promise.resolve(obj);
+    		})
+    	}
+    });
     describe("FileSystemSpec", () => {
     	afterEach(() => {
-    		mockfs.restore();
+    		vol.reset();
     	});
     	it("read text", async () => {
-    		mockfs({
+    		vol.fromJSON({
     			"someText.txt": "text content!"
     		});
     		expect(
@@ Expand All / @@ -17,7 +44,7 @@ describe("FileSystemSpec", () => { @@
     	});
     	it("read binary", async () => {
-    		mockfs({
+    		vol.fromJSON({
     			"someBinary": Buffer.from([12, 34, 56])
     		});
     		expect(
@@ Expand All / @@ -26,7 +53,7 @@ describe("FileSystemSpec", () => { @@
     	});
     	it("read json", async () => {
-    		mockfs({
+    		vol.fromNestedJSON({
     			"game": {
     				"game.json": JSON.stringify({
     					width: 120,
@@ Expand All / @@ -43,7 +70,7 @@ describe("FileSystemSpec", () => { @@
     	});
     	it("write text", async () => {
-    		mockfs({
+    		vol.fromNestedJSON({
     			"some": {}
     		});
     		await writeFile("./some/foo.txt", "string content!!");
@@ Expand All / @@ -53,7 +80,7 @@ describe("FileSystemSpec", () => { @@
     	});
     	it("write binary", async () => {
-    		mockfs({});
+    		vol.fromNestedJSON({ "": {} });
     		await writeFile("./someBinary", Buffer.from([12, 34]));
     		expect(
     			await readFile("./someBinary")
@@ Expand All / @@ -62,7 +89,7 @@ describe("FileSystemSpec", () => { @@
     	describe("#writeJson", () => {
     		it("write game.json", async () => {
-    			mockfs({
+    			vol.fromNestedJSON({
     				"game": {
     					"game.json": JSON.stringify({})
     				}
@@ Expand All / @@ -77,7 +104,7 @@ describe("FileSystemSpec", () => { @@
     		});
     		it("write json without .editorconfig", async () => {
-    			mockfs({
+    			vol.fromNestedJSON({
     				"test.json": JSON.stringify({})
     			});
     			await writeJSON("test.json", { width: 120, height: 240 });
@@ Expand All / @@ -92,7 +119,7 @@ describe("FileSystemSpec", () => { @@
     		});
     		it("write json with .editorconfig", async () => {
-    			mockfs({
+    			vol.fromNestedJSON({
     				"test1/.editorconfig": buildEditorconfig({ indentSize: 4, indentStyle: "tab", insertFinalNewline: true }),
     				"test1/test.json": JSON.stringify({}),
     				"test2/.editorconfig": buildEditorconfig({ indentSize: 2, indentStyle: "space", insertFinalNewline: true }),
@@ Expand Down Expand Up / @@ -132,7 +159,7 @@ describe("FileSystemSpec", () => { @@
     		});
     		it("write json with formatter", async () => {
-    			mockfs({
+    			vol.fromNestedJSON({
     				"test.json": JSON.stringify({})
     			});
     			await writeJSON("test.json", { width: 120, height: 240 }, (content) => JSON.stringify(content, undefined, " "));
@@ Expand All / @@ -148,7 +175,7 @@ describe("FileSystemSpec", () => { @@
     	});
     	it("read directories", async () => {
-    		mockfs({
+    		vol.fromNestedJSON({
     			"foo": {
     				"test.json": ""
     			},
@@ Expand All / @@ -167,7 +194,7 @@ describe("FileSystemSpec", () => { @@
     	});
     	it("unlink file", async () => {
-    		mockfs({
+    		vol.fromNestedJSON({
     			"foo": {
     				"test.json": JSON.stringify({ val: 42 })
     			},
@@ Expand Down @@

Remove browserify, Use rollup #1561

Uh oh!

Remove browserify, Use rollup #1561

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

ShinobuTakahashi Mar 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

ShinobuTakahashi Mar 3, 2026 •

edited

Loading