Skip to content

Commit b075741

Browse files
committed
fix(export): fix fs-extra related crash, such as export-html given .zip destination
1 parent d66e322 commit b075741

12 files changed

Lines changed: 25 additions & 13 deletions

File tree

.changeset/polite-socks-relate.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@akashic/akashic-cli-commons": patch
3+
"@akashic/akashic-cli-export": patch
4+
---
5+
6+
Fix export-html crash when the output path ends with `.zip`

packages/akashic-cli-commons/src/Renamer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as fs from "fs";
22
import * as path from "path";
3-
import * as fsx from "fs-extra";
3+
import fsx from "fs-extra";
44
import { sha256 } from "js-sha256";
55
import type { GameConfiguration } from "./GameConfiguration.js";
66
import { KNOWN_AUDIO_EXTENSIONS } from "./knownAudioExtensions.js";

packages/akashic-cli-commons/vitest.config.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ export default defineConfig({
55
globals: true,
66
include: [
77
"./src/**/__tests__/**/*[sS]pec.ts",
8-
]
8+
],
9+
deps: {
10+
interopDefault: false,
11+
},
912
},
1013
});

packages/akashic-cli-export/src/__tests__/licenseUtilSpec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as path from "path";
2-
import * as fsx from "fs-extra";
2+
import fsx from "fs-extra";
33
import { writeLicenseTextFile } from "../licenseUtil.js";
44

55

packages/akashic-cli-export/src/html/__tests__/exportHTMLSpec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as path from "path";
2-
import * as fsx from "fs-extra";
2+
import fsx from "fs-extra";
33
import * as exp from "../exportHTML.js";
44

55
describe("exportHTML", function () {

packages/akashic-cli-export/src/html/convertBundle.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import * as cmn from "@akashic/akashic-cli-commons";
66
import * as ejs from "ejs";
77
import fsx from "fs-extra";
88
import type { MinifyOptions } from "terser";
9-
import * as liceneUtil from "../licenseUtil.js";
9+
import * as licenseUtil from "../licenseUtil.js";
1010
import { validateGameJson } from "../utils.js";
1111
import type {
1212
ConvertTemplateParameterObject} from "./convertUtil.js";
@@ -83,7 +83,7 @@ export async function promiseConvertBundle(options: ConvertTemplateParameterObje
8383
innerHTMLAssetArray = innerHTMLAssetArray.concat(tempScriptData);
8484
}
8585

86-
await liceneUtil.writeLicenseTextFile(options.source, options.output, libPaths, conf._content.environment["sandbox-runtime"]);
86+
await licenseUtil.writeLicenseTextFile(options.source, options.output, libPaths, conf._content.environment["sandbox-runtime"]);
8787

8888
if (errorMessages.length > 0) {
8989
options.logger.warn("The following ES5 syntax errors exist.\n" + errorMessages.join("\n"));

packages/akashic-cli-export/src/html/convertNoBundle.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import * as cmn from "@akashic/akashic-cli-commons";
66
import * as ejs from "ejs";
77
import fsx from "fs-extra";
88
import type { MinifyOptions } from "terser";
9-
import * as liceneUtil from "../licenseUtil.js";
9+
import * as licenseUtil from "../licenseUtil.js";
1010
import { validateGameJson } from "../utils.js";
1111
import type {
1212
ConvertTemplateParameterObject} from "./convertUtil.js";
@@ -76,7 +76,7 @@ export async function promiseConvertNoBundle(options: ConvertTemplateParameterOb
7676
assetPaths = assetPaths.concat(globalScriptPaths);
7777
}
7878

79-
await liceneUtil.writeLicenseTextFile(options.source, options.output, libPaths, content.environment["sandbox-runtime"]);
79+
await licenseUtil.writeLicenseTextFile(options.source, options.output, libPaths, content.environment["sandbox-runtime"]);
8080

8181
if (errorMessages.length > 0) {
8282
options.logger.warn("The following ES5 syntax errors exist.\n" + errorMessages.join("\n"));

packages/akashic-cli-export/src/html/exportHTML.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import * as os from "os";
44
import * as path from "path";
55
import * as cmn from "@akashic/akashic-cli-commons";
66
import archiver = require("archiver");
7-
import * as fsx from "fs-extra";
7+
import fsx from "fs-extra";
88
import { promiseConvertBundle } from "./convertBundle.js";
99
import { promiseConvertNoBundle } from "./convertNoBundle.js";
1010
import type { ConvertTemplateParameterObject } from "./convertUtil.js";

packages/akashic-cli-export/src/zip/__tests__/convertSpec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as fs from "fs";
22
import { createRequire } from "module";
33
import * as path from "path";
44
import vm from "vm";
5-
import * as fsx from "fs-extra";
5+
import fsx from "fs-extra";
66
import mockfs from "mock-fs";
77
import { vi } from "vitest";
88
import { validateGameJson } from "../../utils.js";

packages/akashic-cli-export/src/zip/__tests__/transformPackImagesSpec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as path from "path";
22
import { makeUnixPath } from "@akashic/akashic-cli-commons/lib/Util.js";
3-
import * as fs from "fs-extra";
3+
import fs from "fs-extra";
44
import { extractPackTargets, transformPackSmallImagesImpl } from "../transformPackImages.js";
55

66
describe("transformPackImages", () => {

0 commit comments

Comments
 (0)