2.0.0-pre3

Author: zefhemel

cmd/compile.ts

@@ -4,15 +4,14 @@ import { denoPlugins } from "@luca/esbuild-deno-loader";
 import * as esbuild from "esbuild";
 import { bundleAssets } from "../lib/asset_bundle/builder.ts";
 import type { Manifest } from "../lib/plugos/types.ts";
-// import { version } from "../version.ts";
-
-const workerRuntimeUrl = new URL(
-  "../lib/plugos/worker_runtime.ts",
-  import.meta.url,
-);
-// TODO: Re-enable this once we have a stable version
-// const workerRuntimeUrl =
-//   `https://deno.land/x/silverbullet@${version}/lib/plugos/worker_runtime.ts`;
+import { version } from "../version.ts";
+
+// const workerRuntimeUrl = new URL(
+//   "../lib/plugos/worker_runtime.ts",
+//   import.meta.url,
+// );
+const workerRuntimeUrl =
+  `https://deno.land/x/silverbullet@${version}/lib/plugos/worker_runtime.ts`;
 
 export type CompileOptions = {
   debug?: boolean;

cmd/update_version.ts

@@ -1,3 +1,6 @@
+import denoJson from "../deno.json" with {
+  type: "json",
+};
 export async function updateVersionFile() {
   const command = new Deno.Command("git", {
     args: ["describe", "--tags", "--long"],
@@ -9,8 +12,10 @@ export async function updateVersionFile() {
   const commitVersion = new TextDecoder().decode(stdout).trim();
 
   const versionFilePath = "./version.ts";
-  const versionContent =
-    `export const version = "2.0-beta (${commitVersion})";\n`;
+  const versionContent = `
+export const publicVersion = "2.0-beta (${commitVersion})";
+export const version = "${denoJson.version}";
+`;
 
   await Deno.writeTextFile(versionFilePath, versionContent);
   console.log(`Updated version.ts with version information: ${commitVersion}`);

cmd/version.ts

@@ -1,5 +1,5 @@
-import { version } from "../version.ts";
+import {publicVersion } from "../version.ts";
 
 export function versionCommand() {
-  console.log(version);
+  console.log(publicVersion);
 }

deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@silverbulletmd/silverbullet",
-  "version": "2.0.0-pre2",
+  "version": "2.0.0-pre3",
   "exports": {
     "./syscall": "./plug-api/syscall.ts",
     "./syscalls": "./plug-api/syscalls.ts",
@@ -97,6 +97,24 @@
   "imports": {
     "@cliffy/command": "jsr:@cliffy/command@^1.0.0-rc.7",
     "@cliffy/prompt": "jsr:@cliffy/prompt@^1.0.0-rc.7",
+    "@silverbulletmd/silverbullet/syscall": "./plug-api/syscall.ts",
+    "@silverbulletmd/silverbullet/syscalls": "./plug-api/syscalls.ts",
+    "@silverbulletmd/silverbullet/type/client": "./type/client.ts",
+    "@silverbulletmd/silverbullet/type/command": "./type/command.ts",
+    "@silverbulletmd/silverbullet/type/config": "./type/config.ts",
+    "@silverbulletmd/silverbullet/type/datastore": "./type/datastore.ts",
+    "@silverbulletmd/silverbullet/type/event": "./type/event.ts",
+    "@silverbulletmd/silverbullet/type/index": "./type/index.ts",
+    "@silverbulletmd/silverbullet/type/rpc": "./type/rpc.ts",
+    "@silverbulletmd/silverbullet/lib/json": "./plug-api/lib/json.ts",
+    "@silverbulletmd/silverbullet/lib/tree": "./plug-api/lib/tree.ts",
+    "@silverbulletmd/silverbullet/lib/attribute": "./plug-api/lib/attribute.ts",
+    "@silverbulletmd/silverbullet/lib/page_ref": "./plug-api/lib/page_ref.ts",
+    "@silverbulletmd/silverbullet/lib/resolve": "./plug-api/lib/resolve.ts",
+    "@silverbulletmd/silverbullet/lib/query_expression": "./plug-api/lib/query_expression.ts",
+    "@silverbulletmd/silverbullet/lib/native_fetch": "./plug-api/lib/native_fetch.ts",
+    "@silverbulletmd/silverbullet/lib/frontmatter": "./plug-api/lib/frontmatter.ts",
+    "@silverbulletmd/silverbullet/lib/tags": "./plug-api/lib/tags.ts",
     "@codemirror/autocomplete": "https://esm.sh/@codemirror/autocomplete@6.18.1?external=@codemirror/state,@codemirror/commands,@lezer/common,@codemirror/view,@codemirror/language&target=es2022",
     "@codemirror/commands": "https://esm.sh/@codemirror/commands@6.7.0?external=@codemirror/state,@codemirror/view,@codemirror/language,@lezer/common&target=es2022",
     "@codemirror/lang-css": "https://esm.sh/@codemirror/lang-css@6.3.0?external=@codemirror/language,@codemirror/autocomplete,@codemirror/state,@lezer/common,@lezer/css&target=es2022",

plugs/editor/editor.plug.yaml

@@ -262,11 +262,6 @@ functions:
     command:
       name: "Client: Version"
 
-  gettingStartedCommand:
-    path: ./help.ts:gettingStartedCommand
-    command:
-      name: "Help: Getting Started"
-
   uploadFileCommand:
     path: ./upload.ts:uploadFile
     command:

plugs/editor/help.ts

@@ -1,12 +1,8 @@
 import { editor } from "@silverbulletmd/silverbullet/syscalls";
-import { version } from "../../version.ts";
+import { publicVersion } from "../../version.ts";
 
 export async function versionCommand() {
   await editor.flashNotification(
-    `You are currently running SilverBullet ${version}`,
+    `You are currently running SilverBullet ${publicVersion}`,
   );
 }
-
-export async function gettingStartedCommand() {
-  await editor.openUrl("https://silverbullet.md/Getting%20Started");
-}

scripts/release.sh

@@ -3,7 +3,6 @@
 VERSION=$1
 
 # Patch version is version.ts and deno.json
-echo "export const version = \"$VERSION\";" > version.ts
 sed -i '' "s/\(\"version\": \"\)[^\"]*\(\"\)/\1$VERSION\2/" deno.json
 git commit -am $VERSION
 git tag $VERSION

silverbullet.ts

@@ -1,6 +1,6 @@
 import { Command } from "@cliffy/command";
 
-import { version } from "./version.ts";
+import { publicVersion } from "./version.ts";
 
 import { upgradeCommand, upgradeEdgeCommand } from "./cmd/upgrade.ts";
 import { versionCommand } from "./cmd/version.ts";
@@ -16,7 +16,7 @@ globalThis.addEventListener("unhandledrejection", (event) => {
 await new Command()
   .name("silverbullet")
   .description("Workshop for the mind")
-  .version(version)
+  .version(publicVersion)
   .helpOption(false)
   .usage("<options> <folder> | <command> (see below)")
   // Main command

web/syscalls/system.ts

@@ -1,6 +1,6 @@
 import type { SysCallMapping } from "../../lib/plugos/system.ts";
 import type { Client } from "../client.ts";
-import { version } from "../../version.ts";
+import { publicVersion } from "../../version.ts";
 import type { CommandDef } from "../../lib/manifest.ts";
 import type { SyscallMeta } from "../../type/index.ts";
 
@@ -147,7 +147,7 @@ export function systemSyscalls(
       return readOnlyMode ? "ro" : "rw";
     },
     "system.getVersion": () => {
-      return version;
+      return publicVersion;
     },
     "system.getConfig": (_ctx, key: string, defaultValue: any = undefined) => {
       return client.config.get(key, defaultValue);