Merge pull request #1503 from akashic-games/fix-bin-ext

fix: fix commands broken on early versions of Node.js v18, v20 and v21
akashic-games · Feb 14, 2025 · 662a0b0 · 662a0b0
2 parents 9bf4646 + 2428caf
commit 662a0b0
Show file tree

Hide file tree

Showing 39 changed files with 34 additions and 23 deletions.
diff --git a/.changeset/clean-seas-sleep.md b/.changeset/clean-seas-sleep.md
@@ -0,0 +1,12 @@
+---
+"@akashic/akashic-cli-lib-manage": patch
+"@akashic/akashic-cli-sandbox": patch
+"@akashic/akashic-cli-export": patch
+"@akashic/akashic-cli-extra": patch
+"@akashic/akashic-cli-serve": patch
+"@akashic/akashic-cli-init": patch
+"@akashic/akashic-cli-scan": patch
+"@akashic/akashic-cli": patch
+---
+
+fix commands broken on early versions of Node.js v18, v20 and v21
diff --git a/...ic-cli-export/bin/akashic-cli-export-html → ...cli-export/bin/akashic-cli-export-html.js b/...ic-cli-export/bin/akashic-cli-export-html → ...cli-export/bin/akashic-cli-export-html.js
diff --git a/...hic-cli-export/bin/akashic-cli-export-zip → ...-cli-export/bin/akashic-cli-export-zip.js b/...hic-cli-export/bin/akashic-cli-export-zip → ...-cli-export/bin/akashic-cli-export-zip.js
diff --git a/packages/akashic-cli-export/bin/run → packages/akashic-cli-export/bin/run.js b/packages/akashic-cli-export/bin/run → packages/akashic-cli-export/bin/run.js
diff --git a/packages/akashic-cli-export/package.json b/packages/akashic-cli-export/package.json
@@ -6,7 +6,7 @@
   "scripts": {
     "prepublish": "npm run clean && npm run build",
     "clean": "shx rm -rf lib && shx rm -rf spec/build",
-    "start": "npm run build && node bin/run",
+    "start": "npm run build && node bin/run.js",
     "build": "npm run build:app && npm run copy:pdi && npm run build:template",
     "build:app": "tsc -p ./ && tsc -p ./tsconfig.cjs.json",
     "copy:pdi": "npm run copy:pdi:v1 && npm run copy:pdi:v2 && npm run copy:pdi:v3",
@@ -25,10 +25,10 @@
   "author": "DWANGO Co., Ltd.",
   "license": "MIT",
   "bin": {
-    "akashic-cli-export": "./bin/run",
-    "akashic-cli-export-html": "./bin/akashic-cli-export-html",
-    "akashic-cli-export-zip": "./bin/akashic-cli-export-zip",
-    "akashic-cli-zip": "./bin/akashic-cli-export-zip"
+    "akashic-cli-export": "./bin/run.js",
+    "akashic-cli-export-html": "./bin/akashic-cli-export-html.js",
+    "akashic-cli-export-zip": "./bin/akashic-cli-export-zip.js",
+    "akashic-cli-zip": "./bin/akashic-cli-export-zip.js"
   },
   "files": [
     "lib"

diff --git a/.../akashic-cli-extra/bin/akashic-cli-config → ...ashic-cli-extra/bin/akashic-cli-config.js b/.../akashic-cli-extra/bin/akashic-cli-config → ...ashic-cli-extra/bin/akashic-cli-config.js
diff --git a/.../akashic-cli-extra/bin/akashic-cli-modify → ...ashic-cli-extra/bin/akashic-cli-modify.js b/.../akashic-cli-extra/bin/akashic-cli-modify → ...ashic-cli-extra/bin/akashic-cli-modify.js
diff --git a/...es/akashic-cli-extra/bin/akashic-cli-stat → ...akashic-cli-extra/bin/akashic-cli-stat.js b/...es/akashic-cli-extra/bin/akashic-cli-stat → ...akashic-cli-extra/bin/akashic-cli-stat.js
diff --git a/packages/akashic-cli-extra/package.json b/packages/akashic-cli-extra/package.json
@@ -20,14 +20,13 @@
     "./package.json": "./package.json"
   },
   "bin": {
-    "akashic-cli-config": "./bin/akashic-cli-config",
-    "akashic-cli-modify": "./bin/akashic-cli-modify",
-    "akashic-cli-stat": "./bin/akashic-cli-stat"
+    "akashic-cli-config": "./bin/akashic-cli-config.js",
+    "akashic-cli-modify": "./bin/akashic-cli-modify.js",
+    "akashic-cli-stat": "./bin/akashic-cli-stat.js"
   },
   "scripts": {
     "prepublish": "npm run clean && npm run build",
     "clean": "rimraf ./lib && rimraf ./spec/build",
-    "start": "npm run build && node bin/run",
     "build": "tsc -p ./",
     "test": "npm run test:vitest && npm run test:lint",
     "test:vitest": "vitest run",

diff --git a/packages/akashic-cli-init/bin/run → packages/akashic-cli-init/bin/run.js b/packages/akashic-cli-init/bin/run → packages/akashic-cli-init/bin/run.js
diff --git a/packages/akashic-cli-init/package.json b/packages/akashic-cli-init/package.json
@@ -6,7 +6,7 @@
   "scripts": {
     "prepublish": "npm run clean && npm run build",
     "clean": "rimraf ./lib",
-    "start": "npm run build && node bin/run",
+    "start": "npm run build && node bin/run.js",
     "build": "tsc -p ./",
     "lint": "eslint -c .eslintrc.cjs --fix",
     "test": "npm run test:vitest && npm run lint",
@@ -15,7 +15,7 @@
   "author": "DWANGO Co., Ltd.",
   "license": "MIT",
   "bin": {
-    "akashic-cli-init": "./bin/run"
+    "akashic-cli-init": "./bin/run.js"
   },
   "files": [
     "lib"

diff --git a/...ic-cli-lib-manage/bin/akashic-cli-install → ...cli-lib-manage/bin/akashic-cli-install.js b/...ic-cli-lib-manage/bin/akashic-cli-install → ...cli-lib-manage/bin/akashic-cli-install.js
diff --git a/...-cli-lib-manage/bin/akashic-cli-uninstall → ...i-lib-manage/bin/akashic-cli-uninstall.js b/...-cli-lib-manage/bin/akashic-cli-uninstall → ...i-lib-manage/bin/akashic-cli-uninstall.js
diff --git a/...hic-cli-lib-manage/bin/akashic-cli-update → ...-cli-lib-manage/bin/akashic-cli-update.js b/...hic-cli-lib-manage/bin/akashic-cli-update → ...-cli-lib-manage/bin/akashic-cli-update.js
diff --git a/packages/akashic-cli-lib-manage/package.json b/packages/akashic-cli-lib-manage/package.json
@@ -14,9 +14,9 @@
   "author": "DWANGO Co., Ltd.",
   "license": "MIT",
   "bin": {
-    "akashic-cli-install": "./bin/akashic-cli-install",
-    "akashic-cli-uninstall": "./bin/akashic-cli-uninstall",
-    "akashic-cli-update": "./bin/akashic-cli-update"
+    "akashic-cli-install": "./bin/akashic-cli-install.js",
+    "akashic-cli-uninstall": "./bin/akashic-cli-uninstall.js",
+    "akashic-cli-update": "./bin/akashic-cli-update.js"
   },
   "files": [
     "lib"

diff --git a/...ashic-cli-sandbox/bin/akashic-cli-sandbox → ...ic-cli-sandbox/bin/akashic-cli-sandbox.js b/...ashic-cli-sandbox/bin/akashic-cli-sandbox → ...ic-cli-sandbox/bin/akashic-cli-sandbox.js
diff --git a/packages/akashic-cli-sandbox/package.json b/packages/akashic-cli-sandbox/package.json
@@ -6,7 +6,7 @@
   "main": "index.js",
   "scripts": {
     "prepublish": "npm run build",
-    "start": "npm run build && node bin/run",
+    "start": "npm run build && node bin/akashic-cli-sandbox.js",
     "build": "npm run copy:common && npm run copy:engine-files && npm run build:client && npm run build:server",
     "copy:common": "cpx \"./engine-src/common/js/**/*.js\" ./js && cpx \"./engine-src/common/external/**/*.js\" ./js",
     "copy:engine-files": "npm run copy:v1 && npm run copy:v2 && npm run copy:v3",
@@ -24,7 +24,7 @@
   "author": "DWANGO Co., Ltd.",
   "license": "MIT",
   "bin": {
-    "akashic-cli-sandbox": "./bin/akashic-cli-sandbox"
+    "akashic-cli-sandbox": "./bin/akashic-cli-sandbox.js"
   },
   "files": [
     "lib",

diff --git a/packages/akashic-cli-scan/bin/run → packages/akashic-cli-scan/bin/run.js b/packages/akashic-cli-scan/bin/run → packages/akashic-cli-scan/bin/run.js
diff --git a/packages/akashic-cli-scan/package.json b/packages/akashic-cli-scan/package.json
@@ -15,7 +15,7 @@
   "author": "DWANGO Co., Ltd.",
   "license": "MIT",
   "bin": {
-    "akashic-cli-scan": "./bin/run"
+    "akashic-cli-scan": "./bin/run.js"
   },
   "files": [
     "bin",

diff --git a/packages/akashic-cli-serve/Dockerfile b/packages/akashic-cli-serve/Dockerfile
@@ -39,5 +39,5 @@ COPY --from=build --chown=node:node /app/config ./config
 
 USER node
 EXPOSE 3300
-ENTRYPOINT ["/tini", "--", "node", "bin/run"]
+ENTRYPOINT ["/tini", "--", "node", "bin/run.js"]
 CMD ["/game"]
diff --git a/packages/akashic-cli-serve/bin/run → packages/akashic-cli-serve/bin/run.js b/packages/akashic-cli-serve/bin/run → packages/akashic-cli-serve/bin/run.js
diff --git a/packages/akashic-cli-serve/package.json b/packages/akashic-cli-serve/package.json
@@ -24,7 +24,7 @@
   "author": "DWANGO Co., Ltd.",
   "license": "MIT",
   "bin": {
-    "akashic-cli-serve": "./bin/run"
+    "akashic-cli-serve": "./bin/run.js"
   },
   "dependencies": {
     "@akashic/akashic-cli-commons": "1.0.0-next.0",

diff --git a/packages/akashic-cli-serve/src/client/vite.config.mts b/packages/akashic-cli-serve/src/client/vite.config.mts
@@ -9,7 +9,7 @@ export default defineConfig({
 		emptyOutDir: false,
 	},
 
-	// vite serve 用の設定。利用時は別で適当なコンテンツを実行する serve を起動しておく必要がある (e.g. `node bin/run -B --port 3300 <content>`) 。
+	// vite serve 用の設定。利用時は別で適当なコンテンツを実行する serve を起動しておく必要がある (e.g. `node bin/run.js -B --port 3300 <content>`) 。
 	// TODO HMR が効かない問題を解消する
 	server: {
 		proxy: {

diff --git a/packages/akashic-cli/bin/akashic-config → packages/akashic-cli/bin/akashic-config.js b/packages/akashic-cli/bin/akashic-config → packages/akashic-cli/bin/akashic-config.js
diff --git a/packages/akashic-cli/bin/akashic-export → packages/akashic-cli/bin/akashic-export.js b/packages/akashic-cli/bin/akashic-export → packages/akashic-cli/bin/akashic-export.js
diff --git a/packages/akashic-cli/bin/akashic-init → packages/akashic-cli/bin/akashic-init.js b/packages/akashic-cli/bin/akashic-init → packages/akashic-cli/bin/akashic-init.js
diff --git a/packages/akashic-cli/bin/akashic-install → packages/akashic-cli/bin/akashic-install.js b/packages/akashic-cli/bin/akashic-install → packages/akashic-cli/bin/akashic-install.js
diff --git a/packages/akashic-cli/bin/akashic-link → packages/akashic-cli/bin/akashic-link.js b/packages/akashic-cli/bin/akashic-link → packages/akashic-cli/bin/akashic-link.js
diff --git a/packages/akashic-cli/bin/akashic-modify → packages/akashic-cli/bin/akashic-modify.js b/packages/akashic-cli/bin/akashic-modify → packages/akashic-cli/bin/akashic-modify.js
diff --git a/packages/akashic-cli/bin/akashic-sandbox → packages/akashic-cli/bin/akashic-sandbox.js b/packages/akashic-cli/bin/akashic-sandbox → packages/akashic-cli/bin/akashic-sandbox.js
diff --git a/packages/akashic-cli/bin/akashic-scan → packages/akashic-cli/bin/akashic-scan.js b/packages/akashic-cli/bin/akashic-scan → packages/akashic-cli/bin/akashic-scan.js
diff --git a/packages/akashic-cli/bin/akashic-serve → packages/akashic-cli/bin/akashic-serve.js b/packages/akashic-cli/bin/akashic-serve → packages/akashic-cli/bin/akashic-serve.js
diff --git a/packages/akashic-cli/bin/akashic-stat → packages/akashic-cli/bin/akashic-stat.js b/packages/akashic-cli/bin/akashic-stat → packages/akashic-cli/bin/akashic-stat.js
diff --git a/packages/akashic-cli/bin/akashic-uninstall → ...ages/akashic-cli/bin/akashic-uninstall.js b/packages/akashic-cli/bin/akashic-uninstall → ...ages/akashic-cli/bin/akashic-uninstall.js
diff --git a/packages/akashic-cli/bin/akashic-unlink → packages/akashic-cli/bin/akashic-unlink.js b/packages/akashic-cli/bin/akashic-unlink → packages/akashic-cli/bin/akashic-unlink.js
diff --git a/packages/akashic-cli/bin/akashic-update → packages/akashic-cli/bin/akashic-update.js b/packages/akashic-cli/bin/akashic-update → packages/akashic-cli/bin/akashic-update.js
diff --git a/packages/akashic-cli/bin/akashic → packages/akashic-cli/bin/akashic.js b/packages/akashic-cli/bin/akashic → packages/akashic-cli/bin/akashic.js
diff --git a/packages/akashic-cli/package.json b/packages/akashic-cli/package.json
@@ -4,7 +4,7 @@
   "description": "Command-line utility for akashic game development",
   "type": "module",
   "bin": {
-    "akashic": "./bin/akashic"
+    "akashic": "./bin/akashic.js"
   },
   "scripts": {
     "prepublish": "npm run clean && npm run build",

diff --git a/test/e2e.js b/test/e2e.js
@@ -2,7 +2,7 @@
 //
 // Usage:
 //  node test/e2e.js          (latestタグでpublishされたものをインストールしてテスト)
-//  node test/e2e.js --local  (このリポジトリの packages/akashic-cli/bin/akashic をテスト)
+//  node test/e2e.js --local  (このリポジトリの packages/akashic-cli/bin/akashic.js をテスト)
 
 import { tmpdir } from "os";
 import { dirname, join, resolve } from "path";
@@ -107,7 +107,7 @@ try {
 		await exec("npm install @akashic/akashic-cli@latest");
 		akashicCliPath = `${targetDir}/node_modules/.bin/akashic`;
 	} else {
-		akashicCliPath = resolve(__dirname, "..", "packages", "akashic-cli", "bin", "akashic");
+		akashicCliPath = resolve(__dirname, "..", "packages", "akashic-cli", "bin", "akashic.js");
 
 		// workaround: Windows 環境は shebang を解釈しないのでそのままでは実行できない。
 		// (npm i @akashic/akashic-cli した時は実行可能な .cmd ファイルが作られるが、ここでは存在しない)