diff --git a/.github/workflows/desktop.yml b/.github/workflows/desktop.yml index 2ee2dfe0..a149fb15 100644 --- a/.github/workflows/desktop.yml +++ b/.github/workflows/desktop.yml @@ -32,7 +32,7 @@ jobs: # uses: denoland/setup-deno@v1 uses: denoland/setup-deno@d4873ceeec10de6275fecd1f94b6985369d40231 with: - deno-version: v1.29.1 + deno-version: v1.32.5 - name: Build SilverBullet run: deno task build - name: Create SilverBullet bundle diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 4f3fac9d..a2a5cb78 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -15,7 +15,7 @@ jobs: - name: Setup Deno uses: denoland/setup-deno@d4873ceeec10de6275fecd1f94b6985369d40231 with: - deno-version: v1.28.1 + deno-version: v1.32.5 - name: Run bundle build run: | diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6e6c5194..f00162d6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -21,7 +21,7 @@ jobs: # uses: denoland/setup-deno@v1 uses: denoland/setup-deno@d4873ceeec10de6275fecd1f94b6985369d40231 with: - deno-version: v1.29.1 + deno-version: v1.32.5 - name: Run build run: deno task build diff --git a/common/deps.ts b/common/deps.ts index 6af1a9a1..b4706dd3 100644 --- a/common/deps.ts +++ b/common/deps.ts @@ -15,8 +15,8 @@ export type { Completion, CompletionResult } from "@codemirror/autocomplete"; export { styleTags, Tag, tagHighlighter, tags } from "@lezer/highlight"; -export * as YAML from "https://deno.land/std@0.177.0/encoding/yaml.ts"; -export * as path from "https://deno.land/std@0.177.0/path/mod.ts"; +export * as YAML from "https://deno.land/std@0.184.0/yaml/mod.ts"; +export * as path from "https://deno.land/std@0.184.0/path/mod.ts"; export { readAll } from "https://deno.land/std@0.165.0/streams/conversion.ts"; diff --git a/import_map.json b/import_map.json index b5dde93b..688c42ee 100644 --- a/import_map.json +++ b/import_map.json @@ -17,10 +17,10 @@ "$sb/": "./plug-api/", "handlebars": "https://esm.sh/handlebars", "@lezer/lr": "https://esm.sh/@lezer/lr@1.3.3?external=@lezer/common", - "yaml": "https://deno.land/std/encoding/yaml.ts", + "yaml": "https://deno.land/std@0.184.0/yaml/mod.ts", "@capacitor/core": "https://esm.sh/@capacitor/core@4.6.2", - "@capacitor/filesystem": "https://esm.sh/@capacitor/filesystem@4.1.4?external=@capacitor/core", - "@capacitor/app": "https://esm.sh/@capacitor/app@4.1.1?external=@capacitor/core" + "@capacitor/filesystem": "https://esm.sh/@capacitor/filesystem@4.1.4", + "@capacitor/app": "https://esm.sh/@capacitor/app@4.1.1" } } diff --git a/mobile/capacitor.config.json b/mobile/capacitor.config.json index b1be01ac..e540c029 100644 --- a/mobile/capacitor.config.json +++ b/mobile/capacitor.config.json @@ -5,7 +5,8 @@ "webDir": "dist", "backgroundColor": "#000", "ios": { - "contentInset": "always" + "contentInset": "always", + "resize": "native" }, "plugins": { "SplashScreen": { diff --git a/mobile/deps.ts b/mobile/deps.ts index aba31e41..4b10e8bd 100644 --- a/mobile/deps.ts +++ b/mobile/deps.ts @@ -3,3 +3,6 @@ export { App as CapacitorApp } from '@capacitor/app'; export { Directory, Encoding, Filesystem } from "@capacitor/filesystem"; export type { WriteFileResult } from "@capacitor/filesystem"; + +// https://esm.sh/v116/​@capacitor/app​@4.1.1/X-ZS9AY2FwYWNpdG9yL2NvcmU/dist/esm/index.d.ts + diff --git a/mobile/ios/App/App.xcodeproj/project.pbxproj b/mobile/ios/App/App.xcodeproj/project.pbxproj index 1cf07a9d..1f4df953 100644 --- a/mobile/ios/App/App.xcodeproj/project.pbxproj +++ b/mobile/ios/App/App.xcodeproj/project.pbxproj @@ -350,7 +350,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 8; + CURRENT_PROJECT_VERSION = 9; DEVELOPMENT_TEAM = Z92J6WM6X8; INFOPLIST_FILE = App/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = SilverBullet; @@ -376,7 +376,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 8; + CURRENT_PROJECT_VERSION = 9; DEVELOPMENT_TEAM = Z92J6WM6X8; INFOPLIST_FILE = App/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = SilverBullet; diff --git a/mobile/package-lock.json b/mobile/package-lock.json index 48fd9165..2ec15f3d 100644 --- a/mobile/package-lock.json +++ b/mobile/package-lock.json @@ -628,29 +628,6 @@ "integrity": "sha512-Cy9llcy8DvET5uznocPyqL3BFRrFXSVqbgpMJ9Wz8oVjZlh/zUSNbPRbov0VX7VxN2JH1Oa0uNxZ7eLRb62pJA==", "dev": true, "hasInstallScript": true, - "dependencies": { - "@esbuild/linux-loong64": "0.14.54", - "esbuild-android-64": "0.14.54", - "esbuild-android-arm64": "0.14.54", - "esbuild-darwin-64": "0.14.54", - "esbuild-darwin-arm64": "0.14.54", - "esbuild-freebsd-64": "0.14.54", - "esbuild-freebsd-arm64": "0.14.54", - "esbuild-linux-32": "0.14.54", - "esbuild-linux-64": "0.14.54", - "esbuild-linux-arm": "0.14.54", - "esbuild-linux-arm64": "0.14.54", - "esbuild-linux-mips64le": "0.14.54", - "esbuild-linux-ppc64le": "0.14.54", - "esbuild-linux-riscv64": "0.14.54", - "esbuild-linux-s390x": "0.14.54", - "esbuild-netbsd-64": "0.14.54", - "esbuild-openbsd-64": "0.14.54", - "esbuild-sunos-64": "0.14.54", - "esbuild-windows-32": "0.14.54", - "esbuild-windows-64": "0.14.54", - "esbuild-windows-arm64": "0.14.54" - }, "bin": { "esbuild": "bin/esbuild" }, @@ -1257,7 +1234,6 @@ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", "dependencies": { - "graceful-fs": "^4.1.6", "universalify": "^2.0.0" }, "optionalDependencies": { @@ -1735,9 +1711,6 @@ "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.77.3.tgz", "integrity": "sha512-/qxNTG7FbmefJWoeeYJFbHehJ2HNWnjkAFRKzWN/45eNBBF/r8lo992CwcJXEzyVxs5FmfId+vTSTQDb+bxA+g==", "dev": true, - "dependencies": { - "fsevents": "~2.3.2" - }, "bin": { "rollup": "dist/bin/rollup" }, @@ -2102,7 +2075,6 @@ "dev": true, "dependencies": { "esbuild": "^0.14.27", - "fsevents": "~2.3.2", "postcss": "^8.4.13", "resolve": "^1.22.0", "rollup": ">=2.59.0 <2.78.0" diff --git a/plugos/bin/plugos-bundle.ts b/plugos/bin/plugos-bundle.ts index 1dc5dfd7..aace0187 100755 --- a/plugos/bin/plugos-bundle.ts +++ b/plugos/bin/plugos-bundle.ts @@ -42,8 +42,9 @@ export async function bundle( // Imports // Imports currently only "import" dependencies at this point, importing means: assume they're preloaded so we don't need to bundle them - const plugCache = path.join(cacheDir()!, "plugos"); + const plugCache = path.join(cacheDir()!, "plugos-imports"); await Deno.mkdir(plugCache, { recursive: true }); + // console.log("Cache dir", plugCache); const imports: Manifest[] = []; for (const manifestUrl of manifest.imports || []) { // Safe file name diff --git a/plugos/test_func.test.ts b/plugos/test_func.test.ts index e9869055..3f668a08 100644 --- a/plugos/test_func.test.ts +++ b/plugos/test_func.test.ts @@ -1,4 +1,4 @@ -import * as YAML from "https://deno.land/std/encoding/yaml.ts"; +import * as YAML from "https://deno.land/std@0.184.0/yaml/mod.ts"; export function hello() { console.log(YAML.stringify({ hello: "world" })); diff --git a/plugs/global.plug.yaml b/plugs/global.plug.yaml index 72173591..2cf1477b 100644 --- a/plugs/global.plug.yaml +++ b/plugs/global.plug.yaml @@ -1,4 +1,4 @@ name: global dependencies: "https://esm.sh/handlebars": "https://esm.sh/handlebars@4.7.7" - "https://deno.land/std/encoding/yaml.ts": "https://deno.land/std@0.165.0/encoding/yaml.ts" + "https://deno.land/std@0.184.0/yaml/mod.ts": "https://deno.land/std@0.184.0/yaml/mod.ts"