🚿 Quit using dlink

lambdalisue · lambdalisue · commit b7e6ce5eedf5 · 2021-07-05T00:42:10.000+09:00
Close #40
diff --git a/.gitignore b/.gitignore
diff --git a/Makefile b/Makefile
@@ -1,16 +1,10 @@
-TOOLS := ${CURDIR}/.tools
-
 .DEFAULT_GOAL := help
 
 help:
 	@cat $(MAKEFILE_LIST) | \
 	    perl -ne 'print if /^\w+.*##/;' | \
 	    perl -pe 's/(.*):.*##\s*/sprintf("%-20s",$$1)/eg;'
 
-tools: FORCE	## Install development tools
-	@mkdir -p ${TOOLS}
-	@deno install -f --allow-write --allow-read --allow-net --root ${TOOLS} https://deno.land/x/dlink/dlink.ts
-
 fmt: FORCE	## Format code
 	@deno fmt
 
@@ -30,8 +24,4 @@ gen: FORCE	## Generate codes
 	@deno run --unstable -A ./scripts/gen-function/gen-function.ts
 	@make fmt
 
-dlink: FORCE	## Update dlink
-	(cd denops_std; ${TOOLS}/bin/dlink)
-	@make fmt
-
 FORCE:
diff --git a/denops_std/anonymous/mod.ts b/denops_std/anonymous/mod.ts
@@ -1,4 +1,4 @@
-import { Denops } from "../vendor/https/deno.land/x/denops_core/mod.ts";
+import { Denops } from "../deps.ts";
 
 // https://github.com/microsoft/TypeScript/issues/26223#issuecomment-674500430
 export type TupleOf<T, N extends number> = N extends N
diff --git a/denops_std/anonymous/mod_test.ts b/denops_std/anonymous/mod_test.ts
@@ -1,8 +1,5 @@
-import {
-  assertEquals,
-  assertThrowsAsync,
-} from "../vendor/https/deno.land/std/testing/asserts.ts";
-import { test } from "../vendor/https/deno.land/x/denops_core/test/mod.ts";
+import { assertEquals, assertThrowsAsync } from "../deps_test.ts";
+import { test } from "../deps_test.ts";
 import * as anonymous from "./mod.ts";
 
 test({
diff --git a/denops_std/autocmd/common.ts b/denops_std/autocmd/common.ts
@@ -1,4 +1,4 @@
-import { Denops } from "../vendor/https/deno.land/x/denops_core/mod.ts";
+import { Denops } from "../deps.ts";
 import { AutocmdEvent } from "./types.ts";
 
 type CommonOptions = {
diff --git a/denops_std/autocmd/common_test.ts b/denops_std/autocmd/common_test.ts
@@ -1,5 +1,4 @@
-import { test } from "../vendor/https/deno.land/x/denops_core/test/mod.ts";
-import { assertEquals } from "../vendor/https/deno.land/std/testing/asserts.ts";
+import { assertEquals, test } from "../deps_test.ts";
 import { globals } from "../variable/mod.ts";
 import { define, emit, emitAll, list, remove } from "./common.ts";
 
diff --git a/denops_std/autocmd/group.ts b/denops_std/autocmd/group.ts
@@ -1,4 +1,4 @@
-import { Denops } from "../vendor/https/deno.land/x/denops_core/mod.ts";
+import { Denops } from "../deps.ts";
 import { execute } from "../helper/execute.ts";
 import { AutocmdEvent } from "./types.ts";
 import {
diff --git a/denops_std/autocmd/group_test.ts b/denops_std/autocmd/group_test.ts
@@ -1,5 +1,4 @@
-import { test } from "../vendor/https/deno.land/x/denops_core/test/mod.ts";
-import { assertEquals } from "../vendor/https/deno.land/std/testing/asserts.ts";
+import { assertEquals, test } from "../deps_test.ts";
 import { globals } from "../variable/mod.ts";
 import { group } from "./group.ts";
 
diff --git a/denops_std/deps.ts b/denops_std/deps.ts
@@ -0,0 +1,5 @@
+export * as fs from "https://deno.land/std@0.100.0/fs/mod.ts";
+export * as hash from "https://deno.land/std@0.100.0/hash/mod.ts";
+export * as path from "https://deno.land/std@0.100.0/path/mod.ts";
+
+export * from "https://deno.land/x/denops_core@v1.0.0-alpha.12/mod.ts";
diff --git a/denops_std/deps_test.ts b/denops_std/deps_test.ts
@@ -1 +1,3 @@
+export * from "https://deno.land/std@0.100.0/testing/asserts.ts";
+
 export * from "https://deno.land/x/denops_core@v1.0.0-alpha.12/test/mod.ts";
diff --git a/denops_std/function/_generated.ts b/denops_std/function/_generated.ts
@@ -1,6 +1,6 @@
 // NOTE: This file is generated. Do NOT modify it manually.
 // deno-lint-ignore-file camelcase
-import { Denops } from "../vendor/https/deno.land/x/denops_core/mod.ts";
+import { Denops } from "../deps.ts";
 
 /**
  * Return the absolute value of {expr}.  When {expr} evaluates to
diff --git a/denops_std/function/buffer.ts b/denops_std/function/buffer.ts
@@ -1,4 +1,4 @@
-import { Denops } from "../vendor/https/deno.land/x/denops_core/mod.ts";
+import { Denops } from "../deps.ts";
 
 /**
  * Add a buffer to the buffer list with {name}.
diff --git a/denops_std/function/common.ts b/denops_std/function/common.ts
@@ -1,4 +1,4 @@
-import { Denops } from "../vendor/https/deno.land/x/denops_core/mod.ts";
+import { Denops } from "../deps.ts";
 
 /**
  * The result is a Number, which is |TRUE| if {expr} is
diff --git a/denops_std/function/nvim/_generated.ts b/denops_std/function/nvim/_generated.ts
@@ -1,6 +1,6 @@
 // NOTE: This file is generated. Do NOT modify it manually.
 // deno-lint-ignore-file camelcase
-import { Denops } from "../../vendor/https/deno.land/x/denops_core/mod.ts";
+import { Denops } from "../../deps.ts";
 
 /**
  * Returns Dictionary of |api-metadata|.
diff --git a/denops_std/function/vim/_generated.ts b/denops_std/function/vim/_generated.ts
@@ -1,6 +1,6 @@
 // NOTE: This file is generated. Do NOT modify it manually.
 // deno-lint-ignore-file camelcase
-import { Denops } from "../../vendor/https/deno.land/x/denops_core/mod.ts";
+import { Denops } from "../../deps.ts";
 
 /**
  * Return the current text in the balloon.  Only for the string,
diff --git a/denops_std/helper/batch.ts b/denops_std/helper/batch.ts
@@ -1,9 +1,4 @@
-import {
-  Context,
-  Denops,
-  Dispatcher,
-  Meta,
-} from "../vendor/https/deno.land/x/denops_core/mod.ts";
+import { Context, Denops, Dispatcher, Meta } from "../deps.ts";
 
 class BatchHelper implements Denops {
   #denops: Denops;
diff --git a/denops_std/helper/batch_test.ts b/denops_std/helper/batch_test.ts
@@ -1,5 +1,4 @@
-import { test } from "../vendor/https/deno.land/x/denops_core/test/mod.ts";
-import { assertEquals } from "../vendor/https/deno.land/std/testing/asserts.ts";
+import { assertEquals, test } from "../deps_test.ts";
 import * as fn from "../function/mod.ts";
 import { batch } from "./batch.ts";
 
diff --git a/denops_std/helper/execute.ts b/denops_std/helper/execute.ts
@@ -1,7 +1,4 @@
-import {
-  Context,
-  Denops,
-} from "../vendor/https/deno.land/x/denops_core/mod.ts";
+import { Context, Denops } from "../deps.ts";
 
 /**
  * Execute Vim script directly
diff --git a/denops_std/helper/execute_test.ts b/denops_std/helper/execute_test.ts
@@ -1,8 +1,4 @@
-import {
-  assertEquals,
-  assertThrowsAsync,
-} from "../vendor/https/deno.land/std/testing/asserts.ts";
-import { test } from "../vendor/https/deno.land/x/denops_core/test/mod.ts";
+import { assertEquals, assertThrowsAsync, test } from "../deps_test.ts";
 import { execute } from "./execute.ts";
 
 test({
diff --git a/denops_std/helper/load.ts b/denops_std/helper/load.ts
@@ -1,7 +1,4 @@
-import { Denops } from "../vendor/https/deno.land/x/denops_core/mod.ts";
-import * as fs from "../vendor/https/deno.land/std/fs/mod.ts";
-import * as hash from "../vendor/https/deno.land/std/hash/mod.ts";
-import * as path from "../vendor/https/deno.land/std/path/mod.ts";
+import { Denops, fs, hash, path } from "../deps.ts";
 import { execute } from "./execute.ts";
 
 /**
diff --git a/denops_std/mod.ts b/denops_std/mod.ts
@@ -1,8 +1,2 @@
 // Re-export
-export type {
-  BatchError,
-  Context,
-  Denops,
-  Dispatcher,
-  Meta,
-} from "./vendor/https/deno.land/x/denops_core/mod.ts";
+export type { BatchError, Context, Denops, Dispatcher, Meta } from "./deps.ts";
diff --git a/denops_std/modules-lock.json b/denops_std/modules-lock.json
diff --git a/denops_std/modules.json b/denops_std/modules.json
diff --git a/denops_std/test/mod.ts b/denops_std/test/mod.ts
@@ -1,3 +1,3 @@
 // Re-export
-export { test } from "../vendor/https/deno.land/x/denops_core/test/mod.ts";
-export type { TestDefinition } from "../vendor/https/deno.land/x/denops_core/test/mod.ts";
+export { test } from "../deps_test.ts";
+export type { TestDefinition } from "../deps_test.ts";
diff --git a/denops_std/variable/helper.ts b/denops_std/variable/helper.ts
@@ -1,4 +1,4 @@
-import { Denops } from "../vendor/https/deno.land/x/denops_core/mod.ts";
+import { Denops } from "../deps.ts";
 
 type VariableGroups = "g" | "b" | "w" | "t" | "v";
 
diff --git a/denops_std/variable/helper_test.ts b/denops_std/variable/helper_test.ts
@@ -1,8 +1,4 @@
-import { test } from "../vendor/https/deno.land/x/denops_core/test/mod.ts";
-import {
-  assertEquals,
-  assertThrowsAsync,
-} from "../vendor/https/deno.land/std/testing/asserts.ts";
+import { assertEquals, assertThrowsAsync, test } from "../deps_test.ts";
 import { buffers, globals, tabpages, vim, windows } from "./helper.ts";
 
 test({
diff --git a/denops_std/vendor/https/deno.land/std/fs/mod.ts b/denops_std/vendor/https/deno.land/std/fs/mod.ts
diff --git a/denops_std/vendor/https/deno.land/std/hash/mod.ts b/denops_std/vendor/https/deno.land/std/hash/mod.ts
diff --git a/denops_std/vendor/https/deno.land/std/path/mod.ts b/denops_std/vendor/https/deno.land/std/path/mod.ts
diff --git a/denops_std/vendor/https/deno.land/std/testing/asserts.ts b/denops_std/vendor/https/deno.land/std/testing/asserts.ts
diff --git a/denops_std/vendor/https/deno.land/x/denops_core/mod.ts b/denops_std/vendor/https/deno.land/x/denops_core/mod.ts
diff --git a/denops_std/vendor/https/deno.land/x/unknownutil/mod.ts b/denops_std/vendor/https/deno.land/x/unknownutil/mod.ts
diff --git a/scripts/gen-function/format.ts b/scripts/gen-function/format.ts
@@ -41,7 +41,7 @@ function formatDefinition({ fn, docs, vars }: Definition): string[] {
 }
 
 export function format(definitions: Definition[], root: string): string[] {
-  const denops = `${root}/vendor/https/deno.land/x/denops_core/mod.ts`;
+  const denops = `${root}/deps.ts`;
   const lines = [
     "// NOTE: This file is generated. Do NOT modify it manually.",
     "// deno-lint-ignore-file camelcase",

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { Denops } from "../vendor/https/deno.land/x/denops_core/mod.ts";`
	`1`	`+import { Denops } from "../deps.ts";`
`2`	`2`
`3`	`3`	`// https://github.com/microsoft/TypeScript/issues/26223#issuecomment-674500430`
`4`	`4`	`export type TupleOf<T, N extends number> = N extends N`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
	`1`	`+export * from "https://deno.land/std@0.100.0/testing/asserts.ts";`
	`2`	`+`
`1`	`3`	`export * from "https://deno.land/x/denops_core@v1.0.0-alpha.12/test/mod.ts";`