Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ function donePlugin(outfile: string): esbuild.Plugin {
const commonOptions = {
format: 'esm',
platform: 'node',
target: 'es2018',

write: false,
bundle: true,
Expand Down
8 changes: 2 additions & 6 deletions packages/core/src/modloader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,7 @@ export async function boot(): Promise<void> {
let { version: gameVersion, hotfix: gameVersionHotfix } = await game.loadVersion(config);
console.log(`crosscode ${gameVersion}-${gameVersionHotfix}`);

let runtimeModBaseDirectory = utils.cwdFilePathFromURL(
// @ts-expect-error we're not using CJS
new URL('../dist/runtime', import.meta.url),
);
let runtimeModBaseDirectory = './ccloader3/dist/runtime';
let runtimeMod: Mod | null;
try {
runtimeMod = await loadModMetadata(runtimeModBaseDirectory);
Expand Down Expand Up @@ -186,8 +183,7 @@ export async function boot(): Promise<void> {
}

async function loadModloaderMetadata(): Promise<{ version: semver.SemVer }> {
// @ts-expect-error we're not using CJS
let filePath = utils.cwdFilePathFromURL(new URL('../metadata.json', import.meta.url));
let filePath = './ccloader3/metadata.json';
let jsonText = await files.loadText(filePath);
let data = JSON.parse(jsonText) as { version: string };
return {
Expand Down
1 change: 0 additions & 1 deletion packages/core/src/service-worker-bridge.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ export async function loadServiceWorker(): Promise<ServiceWorker> {
const path = 'dist-ccmod-service-worker.js';
await window.navigator.serviceWorker.register(path, {
updateViaCache: 'none',
type: 'module',
});
}

Expand Down
28 changes: 14 additions & 14 deletions packages/runtime/src/extension-preloader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,22 @@ declare global {
}
}

const extensionFolder = paths.join(modloader.config.gameAssetsDir, 'extension');
// @ts-expect-error we're not using CJS
const exts = await getInstalledExtensions(modloader.config);
for (const extensionName of exts) {
const filepath = paths.join(extensionFolder, extensionName);
// @ts-expect-error we're not using CJS
const isReadable = await files.isReadable(`${filepath}/${extensionName}.json`);
if (isReadable) {
// @ts-expect-error we're not using CJS
const text = await files.loadText(`${filepath}/${extensionName}.json`);
const data = JSON.parse(text);
async function preloadExtensions(): Promise<void> {
const extensionFolder = paths.join(modloader.config.gameAssetsDir, 'extension');
const exts = await getInstalledExtensions(modloader.config);
for (const extensionName of exts) {
const filepath = paths.join(extensionFolder, extensionName);
const isReadable = await files.isReadable(`${filepath}/${extensionName}.json`);
if (isReadable) {
const text = await files.loadText(`${filepath}/${extensionName}.json`);
const data = JSON.parse(text);

if (!data.files) break;
if (!data.files) break;

for (const extFile of data.files) {
ig.fileForwarding[extFile] = `extension/${extensionName}/${extFile}`;
for (const extFile of data.files) {
ig.fileForwarding[extFile] = `extension/${extensionName}/${extFile}`;
}
}
}
}
void preloadExtensions();
2 changes: 1 addition & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"compilerOptions": {
"target": "es2017",
"target": "es2018",
"module": "nodenext",
"esModuleInterop": true,
"forceConsistentCasingInFileNames": true,
Expand Down