neil/silverbullet
1
0
Fork 0
Code

Dep update, build fixes

Browse Source
This commit is contained in:
Zef Hemel 2023-04-19 10:46:20 +02:00
parent 71be0a2343
commit a28966b410
12 changed files with 19 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/desktop.yml vendored
View File

@ -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

2
.github/workflows/docker.yml vendored
View File

@ -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: |

2
.github/workflows/test.yml vendored
View File

@ -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

4
common/deps.ts
View File

@ -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";

6
import_map.json
View File

@ -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"
}
}

3
mobile/capacitor.config.json
View File

@ -5,7 +5,8 @@
"webDir": "dist",
"backgroundColor": "#000",
"ios": {
"contentInset": "always"
"contentInset": "always",
"resize": "native"
},
"plugins": {
"SplashScreen": {

3
mobile/deps.ts
View File

@ -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

4
mobile/ios/App/App.xcodeproj/project.pbxproj
View File

@ -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;

28
mobile/package-lock.json generated
View File

@ -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"

3
plugos/bin/plugos-bundle.ts
View File

@ -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<any>[] = [];
for (const manifestUrl of manifest.imports || []) {
// Safe file name

2
plugos/test_func.test.ts
View File

@ -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" }));

2
plugs/global.plug.yaml
View File

@ -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"