Skip to content

Commit c338693

Browse files
committed
Upgrade to deno 1.40
1 parent 146c6db commit c338693

File tree

13 files changed

+29
-23
lines changed

13 files changed

+29
-23
lines changed

.github/workflows/docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- name: Setup Deno
3434
uses: denoland/setup-deno@v1
3535
with:
36-
deno-version: v1.39
36+
deno-version: v1.40
3737

3838
- name: Run bundle build
3939
run: |

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Setup Deno
1414
uses: denoland/setup-deno@v1
1515
with:
16-
deno-version: v1.39
16+
deno-version: v1.40
1717
- name: Run build
1818
run: deno task build
1919
- name: Bundle

.github/workflows/server.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Setup Deno
1717
uses: denoland/setup-deno@v1
1818
with:
19-
deno-version: v1.39
19+
deno-version: v1.40
2020

2121
- name: Build bundles
2222
run: |

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Setup Deno
2121
uses: denoland/setup-deno@v1
2222
with:
23-
deno-version: v1.39
23+
deno-version: v1.40
2424

2525
- name: Run build
2626
run: deno task build

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM lukechannings/deno:v1.39.4
1+
FROM lukechannings/deno:v1.40.2
22
# The volume that will keep the space data
33

44
# Either create a volume:

cmd/upgrade.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export async function upgradeCommand() {
1717
"So, that's done. Now let's see if this actually did anything...",
1818
);
1919
const vp = new Deno.Command("deno", {
20-
args: ["run", "-A", "--unstable", Deno.mainModule, "version"],
20+
args: ["run", "-A", Deno.mainModule, "version"],
2121
});
2222
const versionStatus = await vp.output();
2323
if (!versionStatus.success) {

common/spaces/disk_space_primitives.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export class DiskSpacePrimitives implements SpacePrimitives {
4848

4949
const f = await Deno.open(localPath, { read: true });
5050
const data = await readAll(f);
51-
Deno.close(f.rid);
51+
f.close();
5252

5353
return {
5454
data,

deno.jsonc

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,25 @@
44
"deep-clean-mac": "rm -f deno.lock && rm -rf $HOME/Library/Caches/deno && deno task clean",
55
"install": "deno install -f --unstable -A --importmap import_map.json silverbullet.ts",
66
"check": "find . -name '*.ts*' | xargs deno check",
7-
"test": "deno test -A --unstable",
8-
"build": "deno run -A build_plugs.ts && deno run -A --unstable build_web.ts",
7+
"test": "deno test -A --unstable-kv --unstable-worker-options",
8+
"build": "deno run -A build_plugs.ts && deno run -A build_web.ts",
99
"plugs": "deno run -A build_plugs.ts",
10-
"server": "deno run -A --unstable --check silverbullet.ts",
10+
"server": "deno run -A --unstable-kv --unstable-worker-options --check silverbullet.ts",
1111

1212
"watch-web": "deno run -A --check build_web.ts --watch",
13-
"watch-server": "deno run -A --unstable --check --watch silverbullet.ts",
13+
"watch-server": "deno run -A --unstable-kv --unstable-worker-options --check --watch silverbullet.ts",
1414
"watch-plugs": "deno run -A --check build_plugs.ts -w",
1515

1616
"bundle": "deno run -A build_bundle.ts",
1717
// Regenerates some bundle files (checked into the repo)
1818
"generate": "./scripts/generate.sh",
1919

2020
// Compile
21-
"compile": "deno task bundle && deno compile -A --unstable -o silverbullet dist/silverbullet.js",
22-
"server:dist:linux-x86_64": "deno task bundle && deno compile -A --unstable --target x86_64-unknown-linux-gnu -o silverbullet dist/silverbullet.js && zip silverbullet-server-linux-x86_64.zip silverbullet",
23-
"server:dist:darwin-x86_64": "deno task bundle && deno compile -A --unstable --target x86_64-apple-darwin -o silverbullet dist/silverbullet.js && zip silverbullet-server-darwin-x86_64.zip silverbullet",
24-
"server:dist:darwin-aarch64": "deno task bundle && deno compile -A --unstable --target aarch64-apple-darwin -o silverbullet dist/silverbullet.js && zip silverbullet-server-darwin-aarch64.zip silverbullet",
25-
"server:dist:windows-x86_64": "deno task bundle && deno compile -A --unstable --target x86_64-pc-windows-msvc -o silverbullet.exe dist/silverbullet.js && zip silverbullet-server-windows-x86_64.zip silverbullet.exe"
21+
"compile": "deno task bundle && deno compile -A --unstable-kv --unstable-worker-options -o silverbullet dist/silverbullet.js",
22+
"server:dist:linux-x86_64": "deno task bundle && deno compile -A --unstable-kv --unstable-worker-options --target x86_64-unknown-linux-gnu -o silverbullet dist/silverbullet.js && zip silverbullet-server-linux-x86_64.zip silverbullet",
23+
"server:dist:darwin-x86_64": "deno task bundle && deno compile -A --unstable-kv --unstable-worker-options --target x86_64-apple-darwin -o silverbullet dist/silverbullet.js && zip silverbullet-server-darwin-x86_64.zip silverbullet",
24+
"server:dist:darwin-aarch64": "deno task bundle && deno compile -A --unstable-kv --unstable-worker-options --target aarch64-apple-darwin -o silverbullet dist/silverbullet.js && zip silverbullet-server-darwin-aarch64.zip silverbullet",
25+
"server:dist:windows-x86_64": "deno task bundle && deno compile -A --unstable-kv --unstable-worker-options --target x86_64-pc-windows-msvc -o silverbullet.exe dist/silverbullet.js && zip silverbullet-server-windows-x86_64.zip silverbullet.exe"
2626
},
2727

2828
"compilerOptions": {

docker-entrypoint.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ fi
1313

1414
if [ "$PUID" == "0" ] || [ "$UID" != "0" ]; then
1515
# Will run SilverBullet as default user
16-
deno run -A --unstable /silverbullet.js $@
16+
deno run -A --unstable-kv --unstable-worker-options /silverbullet.js $@
1717
else
1818
# Create silverbullet user and group ad-hoc mapped to PUID and PGID
1919
getent group $PGID &> /dev/null || groupadd -g $PGID silverbullet
@@ -24,6 +24,6 @@ else
2424
# And run via su as requested PUID, usually this will be 'silverbullet' but if a user with this idea already exists, we will use that
2525
USERNAME=$(getent passwd $PUID | cut -d ":" -f 1)
2626
echo "Running SilverBullet as $USERNAME (configured as PUID $PUID and PGID $PGID)"
27-
su $USERNAME -s /bin/bash -c "deno run -A --unstable /silverbullet.js $args"
27+
su $USERNAME -s /bin/bash -c "deno run -A --unstable-kv --unstable-worker-options /silverbullet.js $args"
2828
fi
2929

plugos/deps.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ export { expandGlobSync } from "https://deno.land/std@0.165.0/fs/mod.ts";
55
export { mime } from "https://deno.land/x/mimetypes@v1.0.0/mod.ts";
66
export { default as cacheDir } from "https://deno.land/x/cache_dir@0.2.0/mod.ts";
77
export * as flags from "https://deno.land/std@0.165.0/flags/mod.ts";
8-
export * as esbuild from "https://deno.land/x/esbuild@v0.19.12/mod.js";
8+
export * as esbuild from "https://deno.land/x/esbuild@v0.20.0/mod.js";
99
export { denoPlugins } from "https://deno.land/x/esbuild_deno_loader@0.8.5/mod.ts";
1010
export * as YAML from "https://deno.land/std@0.184.0/yaml/mod.ts";

0 commit comments

Comments
 (0)