update deps

Author: mProjectsCode

.eslintignore

@@ -32,3 +32,5 @@ exampleVault/.obsidian/*
 exampleVault/.obsidian/plugins/*
 exampleVault/.obsidian/plugins/obsidian-js-engine-plugin/*
 !exampleVault/.obsidian/plugins/obsidian-js-engine-plugin/.hotreload
+
+meta.txt

.eslintrc.cjs

@@ -0,0 +1,24 @@
+import manifest from '../../manifest.json' assert { type: 'json' };
+
+export function getBuildBanner(buildType: string, getVersion: (version: string) => string) {
+	return `/*
+-------------------------------------------
+${manifest.name} - ${buildType}
+-------------------------------------------
+By: ${manifest.author} (${manifest.authorUrl})
+Time: ${new Date().toUTCString()}
+Version: ${getVersion(manifest.version)}
+-------------------------------------------
+THIS IS A GENERATED/BUNDLED FILE BY ESBUILD
+if you want to view the source, please visit the github repository of this plugin
+-------------------------------------------
+Copyright (C) ${new Date().getFullYear()} ${manifest.author}
+-------------------------------------------
+This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+`;
+}

.gitignore

@@ -0,0 +1,57 @@
+import builtins from 'builtin-modules';
+import esbuild from 'esbuild';
+import esbuildSvelte from 'esbuild-svelte';
+import sveltePreprocess from 'svelte-preprocess';
+import { getBuildBanner } from 'build/buildBanner';
+
+const banner = getBuildBanner('Release Build', version => version);
+
+const build = await esbuild.build({
+	banner: {
+		js: banner,
+	},
+	entryPoints: ['jsEngine/main.ts'],
+	bundle: true,
+	external: [
+		'obsidian',
+		'electron',
+		'@codemirror/autocomplete',
+		'@codemirror/collab',
+		'@codemirror/commands',
+		'@codemirror/language',
+		'@codemirror/lint',
+		'@codemirror/search',
+		'@codemirror/state',
+		'@codemirror/view',
+		'@lezer/common',
+		'@lezer/highlight',
+		'@lezer/lr',
+		...builtins,
+	],
+	format: 'cjs',
+	target: 'es2022',
+	logLevel: 'info',
+	sourcemap: false,
+	treeShaking: true,
+	outfile: 'main.js',
+	minify: true,
+	metafile: true,
+	define: {
+		MB_GLOBAL_CONFIG_DEV_BUILD: 'false',
+	},
+	plugins: [
+		esbuildSvelte({
+			compilerOptions: { css: 'injected', dev: false, sveltePath: 'svelte' },
+			preprocess: sveltePreprocess(),
+			filterWarnings: warning => {
+				// we don't want warnings from node modules that we can do nothing about
+				return !warning.filename?.includes('node_modules');
+			},
+		}),
+	],
+});
+
+const file = Bun.file('meta.txt');
+await Bun.write(file, JSON.stringify(build.metafile, null, '\t'));
+
+process.exit(0);

automation/build/buildBanner.ts

@@ -0,0 +1,62 @@
+import esbuild from 'esbuild';
+import copy from 'esbuild-plugin-copy-watch';
+import esbuildSvelte from 'esbuild-svelte';
+import sveltePreprocess from 'svelte-preprocess';
+import manifest from '../../manifest.json' assert { type: 'json' };
+import { getBuildBanner } from 'build/buildBanner';
+
+const banner = getBuildBanner('Dev Build', _ => 'Dev Build');
+
+const context = await esbuild.context({
+	banner: {
+		js: banner,
+	},
+	entryPoints: ['jsEngine/main.ts'],
+	bundle: true,
+	external: [
+		'obsidian',
+		'electron',
+		'@codemirror/autocomplete',
+		'@codemirror/collab',
+		'@codemirror/commands',
+		'@codemirror/language',
+		'@codemirror/lint',
+		'@codemirror/search',
+		'@codemirror/state',
+		'@codemirror/view',
+		'@lezer/common',
+		'@lezer/highlight',
+		'@lezer/lr',
+	],
+	format: 'cjs',
+	target: 'es2022',
+	logLevel: 'info',
+	sourcemap: 'inline',
+	treeShaking: true,
+	outdir: `exampleVault/.obsidian/plugins/${manifest.id}/`,
+	outbase: 'jsEngine',
+	plugins: [
+		copy({
+			paths: [
+				{
+					from: './styles.css',
+					to: '',
+				},
+				{
+					from: './manifest.json',
+					to: '',
+				},
+			],
+		}),
+		esbuildSvelte({
+			compilerOptions: { css: 'injected', dev: true, sveltePath: 'svelte' },
+			preprocess: sveltePreprocess(),
+			filterWarnings: warning => {
+				// we don't want warnings from node modules that we can do nothing about
+				return !(warning.filename?.includes('node_modules') || warning.message.includes('has unused export property'));
+			},
+		}),
+	],
+});
+
+await context.watch();

automation/build/esbuild.config.ts

@@ -1,16 +1,17 @@
-import { $seq, Verboseness, $input, $choise, $confirm, CMD_FMT } from './shellUtils';
+import { UserError } from 'utils/utils';
+import { CanaryVersion, Version, getIncrementOptions, parseVersion, stringifyVersion } from 'utils/versionUtils';
 import config from './config.json';
-import { Version, getIncrementOptions, parseVersion, stringifyVersion } from 'versionUtils';
-import { UserError } from 'utils';
+import { $choice as $choice, $confirm, $seq, CMD_FMT, Verboseness } from 'utils/shellUtils';
 
 async function runPreconditions(): Promise<void> {
 	// run preconditions
 	await $seq(
-		[`bun run format`, `bun run lint:fix`, `bun run tsc`, `bun run test`, `bun run types`],
+		[`bun run format`, `bun run lint:fix`, `bun run test`],
 		(cmd: string) => {
 			throw new UserError(`precondition "${cmd}" failed`);
 		},
 		() => {},
+		undefined,
 		Verboseness.VERBOSE,
 	);
 
@@ -21,6 +22,7 @@ async function runPreconditions(): Promise<void> {
 			throw new UserError('failed to add preconditions changes to git');
 		},
 		() => {},
+		undefined,
 		Verboseness.NORMAL,
 	);
 
@@ -32,6 +34,7 @@ async function runPreconditions(): Promise<void> {
 			changesToCommit = true;
 		},
 		() => {},
+		undefined,
 		Verboseness.QUITET,
 	);
 
@@ -43,6 +46,7 @@ async function runPreconditions(): Promise<void> {
 				throw new UserError('failed to add preconditions changes to git');
 			},
 			() => {},
+			undefined,
 			Verboseness.NORMAL,
 		);
 	}
@@ -58,6 +62,7 @@ async function run() {
 			throw new UserError('there are still untracked changes');
 		},
 		() => {},
+		undefined,
 		Verboseness.QUITET,
 	);
 
@@ -76,11 +81,11 @@ async function run() {
 
 	const versionIncrementOptions = getIncrementOptions(currentVersion);
 
-	const selctedIndex = await $choise(
+	const selectedIndex = await $choice(
 		`Current version "${currentVersionString}". Select new version`,
 		versionIncrementOptions.map(x => stringifyVersion(x)),
 	);
-	const newVersion = versionIncrementOptions[selctedIndex];
+	const newVersion = versionIncrementOptions[selectedIndex];
 	const newVersionString = stringifyVersion(newVersion);
 
 	console.log('');
@@ -89,30 +94,41 @@ async function run() {
 		throw new UserError('user canceled script');
 	});
 
-	manifest.version = newVersionString;
+	if (!(newVersion instanceof CanaryVersion)) {
+		manifest.version = newVersionString;
+	}
 
 	await Bun.write(manifestFile, JSON.stringify(manifest, null, '\t'));
 
-	const versionsFile = Bun.file('./versions.json');
-	const versionsJson = await versionsFile.json();
+	const betaManifest = structuredClone(manifest);
+	betaManifest.version = newVersionString;
+
+	const betaManifestFile = Bun.file('./manifest-beta.json');
+	await Bun.write(betaManifestFile, JSON.stringify(betaManifest, null, '\t'));
 
-	versionsJson[newVersionString] = manifest.minAppVersion;
+	if (!(newVersion instanceof CanaryVersion)) {
+		const versionsFile = Bun.file('./versions.json');
+		const versionsJson = await versionsFile.json();
 
-	await Bun.write(versionsFile, JSON.stringify(versionsJson, null, '\t'));
+		versionsJson[newVersionString] = manifest.minAppVersion;
 
-	const packageFile = Bun.file('./package.json');
-	const packageJson = await packageFile.json();
+		await Bun.write(versionsFile, JSON.stringify(versionsJson, null, '\t'));
 
-	packageJson.version = newVersionString;
+		const packageFile = Bun.file('./package.json');
+		const packageJson = await packageFile.json();
 
-	await Bun.write(packageFile, JSON.stringify(packageJson, null, '\t'));
+		packageJson.version = newVersionString;
+
+		await Bun.write(packageFile, JSON.stringify(packageJson, null, '\t'));
+	}
 
 	await $seq(
 		[`bun run format`, `git add .`, `git commit -m "[auto] bump version to \`${newVersionString}\`"`],
 		() => {
 			throw new UserError('failed to add preconditions changes to git');
 		},
 		() => {},
+		undefined,
 		Verboseness.NORMAL,
 	);
 
@@ -133,6 +149,7 @@ async function run() {
 			throw new UserError('failed to merge or create tag');
 		},
 		() => {},
+		undefined,
 		Verboseness.NORMAL,
 	);
 

automation/build/esbuild.dev.config.ts

@@ -7,16 +7,24 @@ export enum Verboseness {
 	VERBOSE,
 }
 
-function exec(c: string): Subprocess<'ignore', 'pipe', 'inherit'> {
-	return Bun.spawn(stringArgv(c));
+function exec(c: string, cwd?: string): Subprocess<'ignore', 'pipe', 'inherit'> {
+	return Bun.spawn(stringArgv(c), { cwd: cwd });
 }
 
-export async function $(cmd: string, verboseness: Verboseness = Verboseness.NORMAL): Promise<{ stdout: string; stderr: string; exit: number }> {
+export async function $(
+	cmd: string,
+	cwd?: string | undefined,
+	verboseness: Verboseness = Verboseness.NORMAL,
+): Promise<{ stdout: string; stderr: string; exit: number }> {
 	if (verboseness === Verboseness.NORMAL || verboseness === Verboseness.VERBOSE) {
-		console.log(`\n${CMD_FMT.Bright}running${CMD_FMT.Reset} - ${cmd}\n`);
+		if (cwd !== undefined) {
+			console.log(`\n${CMD_FMT.Bright}running${CMD_FMT.Reset} in ${cwd} - ${cmd}\n`);
+		} else {
+			console.log(`\n${CMD_FMT.Bright}running${CMD_FMT.Reset} - ${cmd}\n`);
+		}
 	}
 
-	const proc = exec(cmd);
+	const proc = exec(cmd, cwd);
 	const stdout = await new Response(proc.stdout).text();
 	const stderr = await new Response(proc.stderr).text();
 
@@ -61,12 +69,13 @@ export async function $seq(
 	cmds: string[],
 	onError: (cmd: string, index: number) => void,
 	onSuccess: () => void,
+	cwd?: string | undefined,
 	verboseness: Verboseness = Verboseness.NORMAL,
 ): Promise<void> {
 	const results = [];
 	for (let i = 0; i < cmds.length; i += 1) {
 		const cmd = cmds[i];
-		const result = await $(cmd, verboseness);
+		const result = await $(cmd, cwd, verboseness);
 
 		if (result.exit !== 0) {
 			onError(cmd, i);
@@ -88,7 +97,7 @@ export async function $input(message: string): Promise<string> {
 	return text.trim();
 }
 
-export async function $choise(message: string, options: string[]): Promise<number> {
+export async function $choice(message: string, options: string[]): Promise<number> {
 	console.log(`${message} `);
 
 	let optionNumbers = new Map<string, number>();

automation/release.ts

@@ -0,0 +1,6 @@
+export class UserError extends Error {}
+
+export interface ProjectConfig {
+	corePackages: string[];
+	packages: string[];
+}