From 91364cabae8687e7620edac406b43cb40cb55878 Mon Sep 17 00:00:00 2001 From: Andy Hayden Date: Wed, 6 Mar 2019 07:23:47 -0800 Subject: Replace deno.land/x/std with deno.land/std (#1890) --- .gitmodules | 2 +- js/deps/https/deno.land/std | 1 + js/deps/https/deno.land/x/std | 1 - js/test_util.ts | 7 ++----- js/unit_tests.ts | 2 +- src/main.rs | 2 +- tests/fetch_deps.ts | 2 +- tools/fmt_test.py | 2 +- tools/http_benchmark.py | 2 +- website/index.html | 2 +- website/manual.md | 20 ++++++++++---------- 11 files changed, 20 insertions(+), 23 deletions(-) create mode 160000 js/deps/https/deno.land/std delete mode 160000 js/deps/https/deno.land/x/std diff --git a/.gitmodules b/.gitmodules index 86e16fd72..10e1215d7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,5 +5,5 @@ path = build url = https://github.com/denoland/chromium_build.git [submodule "js/deps/https/deno.land/x/std"] - path = js/deps/https/deno.land/x/std + path = js/deps/https/deno.land/std url = https://github.com/denoland/deno_std.git diff --git a/js/deps/https/deno.land/std b/js/deps/https/deno.land/std new file mode 160000 index 000000000..d441a7dbf --- /dev/null +++ b/js/deps/https/deno.land/std @@ -0,0 +1 @@ +Subproject commit d441a7dbf01ed87163dcde4120295c0c796f3f0d diff --git a/js/deps/https/deno.land/x/std b/js/deps/https/deno.land/x/std deleted file mode 160000 index d441a7dbf..000000000 --- a/js/deps/https/deno.land/x/std +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d441a7dbf01ed87163dcde4120295c0c796f3f0d diff --git a/js/test_util.ts b/js/test_util.ts index f2d3b8dd6..c85284019 100644 --- a/js/test_util.ts +++ b/js/test_util.ts @@ -7,11 +7,8 @@ // tests by the special string. permW0N0 means allow-write but not allow-net. // See tools/unit_tests.py for more details. -import * as testing from "./deps/https/deno.land/x/std/testing/mod.ts"; -export { - assert, - assertEqual -} from "./deps/https/deno.land/x/std/testing/mod.ts"; +import * as testing from "./deps/https/deno.land/std/testing/mod.ts"; +export { assert, assertEqual } from "./deps/https/deno.land/std/testing/mod.ts"; // testing.setFilter must be run before any tests are defined. testing.setFilter(Deno.args[1]); diff --git a/js/unit_tests.ts b/js/unit_tests.ts index 5085deb5c..a82ffb36c 100644 --- a/js/unit_tests.ts +++ b/js/unit_tests.ts @@ -50,4 +50,4 @@ import "./version_test.ts"; import "../website/app_test.js"; -import "deps/https/deno.land/x/std/testing/main.ts"; +import "deps/https/deno.land/std/testing/main.ts"; diff --git a/src/main.rs b/src/main.rs index 23efa50ee..48d96b04a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -86,7 +86,7 @@ fn main() { }); if flags.fmt { - rest_argv.insert(1, "https://deno.land/x/std/prettier/main.ts".to_string()); + rest_argv.insert(1, "https://deno.land/std/prettier/main.ts".to_string()); flags.allow_read = true; flags.allow_write = true; } diff --git a/tests/fetch_deps.ts b/tests/fetch_deps.ts index 41ed60aca..14f1feb8f 100644 --- a/tests/fetch_deps.ts +++ b/tests/fetch_deps.ts @@ -1,5 +1,5 @@ // Run ./tools/http_server.py too in order for this test to run. -import { assert } from "../js/deps/https/deno.land/x/std/testing/mod.ts"; +import { assert } from "../js/deps/https/deno.land/std/testing/mod.ts"; // TODO Top level await https://github.com/denoland/deno/issues/471 async function main() { diff --git a/tools/fmt_test.py b/tools/fmt_test.py index 4b066a47b..d4aca75aa 100755 --- a/tools/fmt_test.py +++ b/tools/fmt_test.py @@ -16,7 +16,7 @@ def fmt_test(deno_exe): dst = os.path.join(d, "badly_formatted.js") shutil.copyfile(src, dst) # Set DENO_DIR to //js/ so we don't have to rely on an intenet - # connection to download https://deno.land/x/std/prettier/main.ts + # connection to download https://deno.land/std/prettier/main.ts deno_dir = os.path.join(root_path, "js") run([deno_exe, dst, "--fmt", "--allow-read"], merge_env={"DENO_DIR": deno_dir}) diff --git a/tools/http_benchmark.py b/tools/http_benchmark.py index d84a24de6..2df5fcb89 100755 --- a/tools/http_benchmark.py +++ b/tools/http_benchmark.py @@ -19,7 +19,7 @@ def deno_http_benchmark(deno_exe): def deno_net_http_benchmark(deno_exe): deno_cmd = [ deno_exe, "--allow-net", - "js/deps/https/deno.land/x/std/http/http_bench.ts", ADDR + "js/deps/https/deno.land/std/http/http_bench.ts", ADDR ] print "http_benchmark testing DENO using net/http." return run( diff --git a/website/index.html b/website/index.html index f78896e12..c57a10718 100644 --- a/website/index.html +++ b/website/index.html @@ -108,7 +108,7 @@ href="https://github.com/denoland/deno_install/blob/master/install.ps1">https://

Or a more complex one:

- 
import { serve } from "https://deno.land/x/std@v0.2.10/http/server.ts";
+      
import { serve } from "https://deno.land/std@v0.2.10/http/server.ts";
 const s = serve("0.0.0.0:8000");
 
 async function main() {
diff --git a/website/manual.md b/website/manual.md
index e26ae9da5..3767a2e01 100644
--- a/website/manual.md
+++ b/website/manual.md
@@ -38,7 +38,7 @@ Deno provides a set of reviewed
 - Like the browser, allows imports from URLs:
 
   ```typescript
-  import * as log from "https://deno.land/x/std/log/mod.ts";
+  import * as log from "https://deno.land/std/log/mod.ts";
   ```
 
 - Remote code is fetched and cached on first execution, and never updated until
@@ -244,7 +244,7 @@ I/O streams in Deno.
 Try the program:
 
 ```
-> deno https://deno.land/x/examples/cat.ts /etc/passwd
+> deno https://deno.land/std/examples/cat.ts /etc/passwd
 ```
 
 ### TCP echo server
@@ -270,7 +270,7 @@ When this program is started, the user is prompted for permission to listen on
 the network:
 
 ```
-> deno https://deno.land/x/examples/echo_server.ts
+> deno https://deno.land/std/examples/echo_server.ts
 ⚠️  Deno requests network access to "listen". Grant? [yN] y
 listening on 0.0.0.0:8080
 ```
@@ -279,7 +279,7 @@ For security reasons, deno does not allow programs to access the network without
 explicit permission. To avoid the console prompt, use a command-line flag:
 
 ```
-> deno https://deno.land/x/examples/echo_server.ts --allow-net
+> deno https://deno.land/std/examples/echo_server.ts --allow-net
 ```
 
 To test it, try sending a HTTP request to it by using curl. The request gets
@@ -332,14 +332,14 @@ This one serves a local directory in HTTP.
 
 ```
 alias file_server="deno  --allow-net --allow-read \
-  https://deno.land/x/http/file_server.ts"
+  https://deno.land/std/http/file_server.ts"
 ```
 
 Run it:
 
 ```
 % file_server .
-Downloading https://deno.land/x/http/file_server.ts...
+Downloading https://deno.land/std/http/file_server.ts...
 [...]
 HTTP server listening on http://0.0.0.0:4500/
 ```
@@ -391,7 +391,7 @@ async function main() {
     args: [
       "deno",
       "--allow-read",
-      "https://deno.land/x/examples/cat.ts",
+      "https://deno.land/std/examples/cat.ts",
       ...fileNames
     ],
     stdout: "piped",
@@ -434,7 +434,7 @@ import {
   test,
   assertEqual,
   runIfMain
-} from "https://deno.land/x/testing/mod.ts";
+} from "https://deno.land/std/testing/mod.ts";
 
 test(function t1() {
   assertEqual("hello", "hello");
@@ -493,11 +493,11 @@ everywhere in a large project?** The solution is to import and re-export your
 external libraries in a central `package.ts` file (which serves the same purpose
 as Node's `package.json` file). For example, let's say you were using the above
 testing library across a large project. Rather than importing
-`"https://deno.land/x/testing/mod.ts"` everywhere, you could create a
+`"https://deno.land/std/testing/mod.ts"` everywhere, you could create a
 `package.ts` file the exports the third-party code:
 
 ```ts
-export { test, assertEqual } from "https://deno.land/x/testing/mod.ts";
+export { test, assertEqual } from "https://deno.land/std/testing/mod.ts";
 ```
 
 And throughout project one can import from the `package.ts` and avoid having
-- 
cgit v1.2.3