Skip to content

Commit

Permalink
Merge pull request #190 from vim-denops/update
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
lambdalisue authored May 21, 2022
2 parents 4e694e1 + dfb21c4 commit ca660c2
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 19 deletions.
2 changes: 1 addition & 1 deletion denops/@denops-private/cli.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { parse } from "https://deno.land/std@0.127.0/flags/mod.ts";
import { parse } from "https://deno.land/std@0.140.0/flags/mod.ts";
import { using } from "https://deno.land/x/[email protected]/mod.ts#^";
import { Service } from "./service.ts";
import { Vim } from "./host/vim.ts";
Expand Down
2 changes: 1 addition & 1 deletion denops/@denops-private/host/nvim.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {
assertArray,
assertString,
} from "https://deno.land/x/[email protected]/mod.ts#^";
import { Session } from "https://deno.land/x/[email protected].4/mod.ts#^";
import { Session } from "https://deno.land/x/[email protected].6/mod.ts#^";
import { responseTimeout } from "../defs.ts";
import { Invoker, isInvokerMethod } from "./invoker.ts";
import { Host } from "./base.ts";
Expand Down
16 changes: 11 additions & 5 deletions denops/@denops-private/service.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { compareVersions } from "https://deno.land/x/[email protected]/mod.ts#^";
import {
assertArray,
assertString,
Expand All @@ -8,18 +9,25 @@ import {
Dispatcher as SessionDispatcher,
Session,
SessionOptions,
} from "https://deno.land/x/[email protected].4/mod.ts#^";
} from "https://deno.land/x/[email protected].6/mod.ts#^";
import {
WorkerReader,
WorkerWriter,
} from "https://deno.land/x/[email protected].3/mod.ts#^";
} from "https://deno.land/x/[email protected].4/mod.ts#^";
import { responseTimeout } from "./defs.ts";
import { Host } from "./host/base.ts";
import { Invoker, RegisterOptions } from "./host/invoker.ts";
import type { Meta } from "../@denops/mod.ts";

const workerScript = "./worker/script.ts";

// Prior to Deno v1.22.0, `Deno` namespace is not available on Worker
// https://deno.com/blog/v1.22#deno-namespace-is-available-in-workers-by-default
// deno-lint-ignore no-explicit-any
const workerOptions: any = compareVersions(Deno.version.deno, "1.22.0") === -1
? { deno: { namespace: true } }
: {};

/**
* Service manage plugins and is visible from the host (Vim/Neovim) through `invoke()` function.
*/
Expand Down Expand Up @@ -62,9 +70,7 @@ export class Service implements ServiceApi {
{
name,
type: "module",
deno: {
namespace: true,
},
...workerOptions,
},
);
worker.postMessage({ name, script, meta });
Expand Down
6 changes: 3 additions & 3 deletions denops/@denops-private/worker/script.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import { toFileUrl } from "https://deno.land/std@0.127.0/path/mod.ts";
import { toFileUrl } from "https://deno.land/std@0.140.0/path/mod.ts";
import {
assertObject,
assertString,
isObject,
isString,
} from "https://deno.land/x/[email protected]/mod.ts#^";
import { Session } from "https://deno.land/x/[email protected].4/mod.ts#^";
import { Session } from "https://deno.land/x/[email protected].6/mod.ts#^";
import { using } from "https://deno.land/x/[email protected]/mod.ts#^";
import {
WorkerReader,
WorkerWriter,
} from "https://deno.land/x/[email protected].3/mod.ts#^";
} from "https://deno.land/x/[email protected].4/mod.ts#^";
import { responseTimeout } from "../defs.ts";
import type { Denops, Meta } from "../../@denops/mod.ts";
import { DenopsImpl } from "../../@denops/impl.ts";
Expand Down
2 changes: 1 addition & 1 deletion denops/@denops/impl.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { Session } from "https://deno.land/x/[email protected].4/mod.ts#^";
import type { Session } from "https://deno.land/x/[email protected].6/mod.ts#^";
import { BatchError, Context, Denops, Dispatcher, Meta } from "./mod.ts";

export class DenopsImpl implements Denops {
Expand Down
4 changes: 2 additions & 2 deletions denops/@denops/test.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import * as path from "https://deno.land/std@0.127.0/path/mod.ts";
import * as path from "https://deno.land/std@0.140.0/path/mod.ts";
import {
assertEquals,
assertRejects,
} from "https://deno.land/std@0.127.0/testing/asserts.ts";
} from "https://deno.land/std@0.140.0/testing/asserts.ts";
import { test } from "./test/tester.ts";
import { BatchError } from "./mod.ts";

Expand Down
4 changes: 2 additions & 2 deletions denops/@denops/test/bypass/cli.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { copy } from "https://deno.land/std@0.127.0/streams/conversion.ts";
import { copy } from "https://deno.land/std@0.140.0/streams/conversion.ts";
import {
WorkerReader,
WorkerWriter,
} from "https://deno.land/x/[email protected].3/mod.ts#^";
} from "https://deno.land/x/[email protected].4/mod.ts#^";

const worker = self as unknown as Worker;
const reader = new WorkerReader(worker);
Expand Down
6 changes: 3 additions & 3 deletions denops/@denops/test/tester.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as path from "https://deno.land/std@0.127.0/path/mod.ts";
import { Session } from "https://deno.land/x/[email protected].4/mod.ts#^";
import * as path from "https://deno.land/std@0.140.0/path/mod.ts";
import { Session } from "https://deno.land/x/[email protected].6/mod.ts#^";
import { using } from "https://deno.land/x/[email protected]/mod.ts#^";
import { deadline } from "https://deno.land/std@0.127.0/async/mod.ts";
import { deadline } from "https://deno.land/std@0.140.0/async/mod.ts";
import type { Denops, Meta } from "../mod.ts";
import { DenopsImpl } from "../impl.ts";
import { DENOPS_TEST_NVIM, DENOPS_TEST_VIM, run } from "./runner.ts";
Expand Down
2 changes: 1 addition & 1 deletion denops/@denops/test/tester_test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { assertEquals } from "https://deno.land/std@0.127.0/testing/asserts.ts";
import { assertEquals } from "https://deno.land/std@0.140.0/testing/asserts.ts";
import { test } from "./tester.ts";

test(
Expand Down

0 comments on commit ca660c2

Please sign in to comment.