v1.4.9: Both JSR and HTTPS are supported

zhangfuxing · zhangfuxing · commit 1373e7a1af3c · 2024-04-02T12:14:10.000+08:00
diff --git a/README.md b/README.md
@@ -11,9 +11,14 @@ ProgressBar in terminal for deno
 #### example
 
 ```ts
-import { MultiProgressBar } from "https://deno.land/x/progress@v1.4.8/mod.ts";
+import { MultiProgressBar } from "https://deno.land/x/progress@v1.4.9/mod.ts";
 import { delay } from "https://deno.land/std@0.220.1/async/delay.ts";
+
 // or JSR
+// import { MultiProgressBar } from "jsr:@deno-library/progress@v1.4.9";
+// import { delay } from "jsr:@std/async@0.221.0";
+
+// or JSR (Run `deno add @deno-library/progress` and `deno add @std/async`)
 // import { MultiProgressBar } from "@deno-library/progress";
 // import { delay } from "@std/async";
 
@@ -149,10 +154,16 @@ What is displayed and display order, default: ':bar :text :percent :time
 #### simple example
 
 ```ts
-import ProgressBar from "https://deno.land/x/progress@v1.4.8/mod.ts";
+import ProgressBar from "https://deno.land/x/progress@v1.4.9/mod.ts";
+import { delay } from "https://deno.land/std@0.220.1/async/delay.ts";
+
 // or JSR
+// import ProgressBar from "jsr:@deno-library/progress@v1.4.9";
+// import { delay } from "jsr:@std/async@0.221.0";
+
+// or JSR (Run `deno add @deno-library/progress` and `deno add @std/async`)
 // import ProgressBar from "@deno-library/progress";
-import { delay } from "https://deno.land/std@0.220.1/async/delay.ts";
+// import { delay } from "@std/async";
 
 const title = "downloading:";
 const total = 100;
@@ -174,10 +185,16 @@ await download();
 #### complex example
 
 ```ts
-import ProgressBar from "https://deno.land/x/progress@v1.4.8/mod.ts";
+import ProgressBar from "https://deno.land/x/progress@v1.4.9/mod.ts";
+import { delay } from "https://deno.land/std@0.220.1/async/delay.ts";
+
 // or JSR
+// import ProgressBar from "jsr:@deno-library/progress@v1.4.9";
+// import { delay } from "jsr:@std/async@0.221.0";
+
+// or JSR (Run `deno add @deno-library/progress` and `deno add @std/async`)
 // import ProgressBar from "@deno-library/progress";
-import { delay } from "https://deno.land/std@0.220.1/async/delay.ts";
+// import { delay } from "@std/async";
 
 const total = 100;
 const progress = new ProgressBar({
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,9 @@
 ## Changelog
 
+### v1.4.9 - 2024.04.02
+
+[Both JSR and HTTPS are supported](https://github.com/deno-library/progress/issues/29)
+
 ### v1.4.6 - 2024.03.27
 
 [support JSR](https://github.com/deno-library/progress/issues/28)
@@ -38,7 +42,7 @@ changes:
 
 1. fixed [colored string length calculation bug](https://github.com/deno-library/progress/issues/8)
 
-2.  **Deno.consoleSize is now stable**
+2. **Deno.consoleSize is now stable**
 
 > [Deno v1.27.0 : Stabilize Deno.consoleSize() API](https://github.com/denoland/deno/pull/15933)
 
diff --git a/deno.json b/deno.json
@@ -1,13 +1,11 @@
 {
   "name": "@deno-library/progress",
-  "version": "1.4.8",
-  "exports": "./mod.ts",
-  "lock": false,
-  "imports": {
-    "@std/assert": "jsr:@std/assert@^0.220.1",
-    "@std/async": "jsr:@std/async@^0.220.1",
-    "@std/fmt": "jsr:@std/fmt@^0.220.1"
+  "version": "1.4.9",
+  "exports": {
+    ".": "./mod.ts",
+    "./time": "./time.ts"
   },
+  "lock": false,
   "publish": {
     "exclude": [
       "examples",
@@ -18,5 +16,8 @@
       "changelog.md"
     ]
   },
-  "compilerOptions": {}
-}
+  "compilerOptions": {},
+  "fmt": {
+    "exclude": ["README.md"]
+  }
+}
diff --git a/deps.example.ts b/deps.example.ts
@@ -0,0 +1,6 @@
+export { delay } from "jsr:@std/async@0.221.0";
+export * from "jsr:@std/fmt@0.221.0/colors";
+export {
+  simpleCallbackTarget,
+  timerSource,
+} from "https://deno.land/x/rx_webstreams@0.2.0/mod.ts";
diff --git a/deps.test.ts b/deps.test.ts
@@ -0,0 +1,2 @@
+export { assertEquals } from "jsr:@std/assert@0.221.0";
+export { simpleTimerStream } from "https://deno.land/x/simple_timer_stream@1.0.2/mod.ts";
diff --git a/deps.ts b/deps.ts
@@ -0,0 +1 @@
+export { bgGreen, bgWhite, stripAnsiCode } from "jsr:@std/fmt@0.221.0/colors";
diff --git a/examples/backward.ts b/examples/backward.ts
@@ -1,5 +1,5 @@
 import ProgressBar from "../mod.ts";
-import { delay } from "@std/async";
+import { delay } from "../deps.example.ts";
 
 const progress = new ProgressBar({
   title: "backward",
diff --git a/examples/changeBgColor.ts b/examples/changeBgColor.ts
@@ -1,6 +1,6 @@
 import ProgressBar from "../mod.ts";
-import { bgCyan, bgMagenta } from "@std/fmt/colors";
-import { delay } from "@std/async";
+import { delay } from "../deps.example.ts";
+import { bgCyan, bgMagenta }  from "../deps.example.ts";
 
 const total = 100;
 
diff --git a/examples/changeColor.ts b/examples/changeColor.ts
@@ -1,6 +1,6 @@
 import ProgressBar from "../mod.ts";
-import { green, yellow } from "@std/fmt/colors";
-import { delay } from "@std/async";
+import { delay } from "../deps.example.ts";
+import { green, yellow } from "../deps.example.ts";
 
 const total = 100;
 
diff --git a/examples/clear.ts b/examples/clear.ts
@@ -1,5 +1,5 @@
 import ProgressBar from "../mod.ts";
-import { delay } from "@std/async";
+import { delay } from "../deps.example.ts";
 
 const total = 100;
 
diff --git a/examples/colorProgression.ts b/examples/colorProgression.ts
@@ -1,6 +1,6 @@
 import ProgressBar from "../mod.ts";
-import { bgRgb24 } from "@std/fmt/colors";
-import { delay } from "@std/async";
+import { bgRgb24 } from "../deps.example.ts";
+import { delay } from "../deps.example.ts";
 
 const total = 100;
 
diff --git a/examples/complete.ts b/examples/complete.ts
@@ -1,5 +1,5 @@
 import ProgressBar from "../mod.ts";
-import { delay } from "@std/async";
+import { delay } from "../deps.example.ts";
 
 const total = 100;
 
diff --git a/examples/console.ts b/examples/console.ts
@@ -1,5 +1,5 @@
 import ProgressBar from "../mod.ts";
-import { delay } from "@std/async";
+import { delay } from "../deps.example.ts";
 
 const title = "interval:";
 const total = 100;
diff --git a/examples/display.ts b/examples/display.ts
@@ -1,5 +1,5 @@
 import ProgressBar from "../mod.ts";
-import { delay } from "@std/async";
+import { delay } from "../deps.example.ts";
 
 const total = 100;
 
diff --git a/examples/eta.ts b/examples/eta.ts
@@ -1,5 +1,5 @@
 import ProgressBar from "../mod.ts";
-import { delay } from "@std/async";
+import { delay } from "../deps.example.ts";
 
 const total = 100;
 
diff --git a/examples/info.ts b/examples/info.ts
@@ -1,5 +1,5 @@
 import ProgressBar from "../mod.ts";
-import { delay } from "@std/async";
+import { delay } from "../deps.example.ts";
 
 const total = 100;
 
diff --git a/examples/multi.ts b/examples/multi.ts
@@ -1,5 +1,5 @@
 import { MultiProgressBar } from "../mod.ts";
-import { delay } from "@std/async";
+import { delay } from "../deps.example.ts";
 
 const title = "download files";
 const total = 100;
diff --git a/examples/multi2.ts b/examples/multi2.ts
@@ -2,7 +2,7 @@ import { MultiProgressBar } from "../mod.ts";
 import {
   simpleCallbackTarget,
   timerSource,
-} from "https://deno.land/x/rx_webstreams@0.2.0/mod.ts";
+} from "../deps.example.ts";
 
 const bars = new MultiProgressBar({ title: "Downloading Files: " });
 
diff --git a/examples/multiPrettyTime.ts b/examples/multiPrettyTime.ts
@@ -1,5 +1,5 @@
 import { MultiProgressBar } from "../mod.ts";
-import { delay } from "@std/async";
+import { delay } from "../deps.example.ts";
 
 const title = "download files";
 const total = 100;
diff --git a/examples/preciseBar.ts b/examples/preciseBar.ts
@@ -1,6 +1,6 @@
 import ProgressBar from "../mod.ts";
-import { bgWhite, green } from "@std/fmt/colors";
-import { delay } from "@std/async";
+import { bgWhite, green } from "../deps.example.ts";
+import { delay } from "../deps.example.ts";
 
 const total = 100;
 
diff --git a/examples/prettyTime.ts b/examples/prettyTime.ts
@@ -1,5 +1,5 @@
 import ProgressBar from "../mod.ts";
-import { delay } from "@std/async";
+import { delay } from "../deps.example.ts";
 
 const total = 100;
 
diff --git a/examples/title.ts b/examples/title.ts
@@ -1,5 +1,5 @@
 import ProgressBar from "../mod.ts";
-import { delay } from "@std/async";
+import { delay } from "../deps.example.ts";
 
 const title = "progress:";
 const total = 100;
diff --git a/examples/total.ts b/examples/total.ts
@@ -1,5 +1,5 @@
 import ProgressBar from "../mod.ts";
-import { delay } from "@std/async";
+import { delay } from "../deps.example.ts";
 
 const title = "total test";
 const total = 100;
diff --git a/examples/width.ts b/examples/width.ts
@@ -1,5 +1,5 @@
 import ProgressBar from "../mod.ts";
-import { delay } from "@std/async";
+import { delay } from "../deps.example.ts";
 
 const title = "interval:";
 const total = 100;
diff --git a/mod.ts b/mod.ts
@@ -1,4 +1,4 @@
-import { bgGreen, bgWhite, stripAnsiCode } from "@std/fmt/colors";
+import { bgGreen, bgWhite, stripAnsiCode } from "./deps.ts";
 import { prettyTime, type prettyTimeOptions } from "./time.ts";
 export { MultiProgressBar } from "./multi.ts";
 
diff --git a/multi.ts b/multi.ts
@@ -1,4 +1,4 @@
-import { bgGreen, bgWhite, stripAnsiCode } from "@std/fmt/colors";
+import { bgGreen, bgWhite, stripAnsiCode } from "./deps.ts";
 import { prettyTime, type prettyTimeOptions } from "./time.ts";
 
 const hasStdout = Deno.stdout;
diff --git a/tests/mod.test.ts b/tests/mod.test.ts
@@ -1,5 +1,5 @@
 import ProgressBar from "../mod.ts";
-import { simpleTimerStream } from "https://deno.land/x/simple_timer_stream@1.0.2/mod.ts";
+import { simpleTimerStream } from "../deps.test.ts";
 
 Deno.test(`Use ProgressBar in a deno test`, async () => {
   const progress = new ProgressBar({ title: "downloading: ", total: 50 });
diff --git a/tests/multi.test.ts b/tests/multi.test.ts
@@ -1,5 +1,5 @@
 import { MultiProgressBar } from "../mod.ts";
-import { delay } from "@std/async";
+import { delay } from "../deps.example.ts";
 
 Deno.test(`Use MultiProgressBar in a deno test`, async () => {
   const title = "download files";
diff --git a/tests/time.test.ts b/tests/time.test.ts
@@ -1,5 +1,5 @@
 import { prettyTime } from "../time.ts";
-import { assertEquals } from "@std/assert";
+import { assertEquals } from "../deps.test.ts";
 
 Deno.test(`test prettyTime: default`, () => {
   // assertEquals(prettyTime(10), "10.0s");

-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +export { delay } from "jsr:@std/[email protected]";
 +export * from "jsr:@std/[email protected]/colors";
 +export {
 +  simpleCallbackTarget,
 +  timerSource,
 +} from "https://deno.land/x/[email protected]/mod.ts";
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+export { assertEquals } from "jsr:@std/[email protected]";`
	`2`	`+export { simpleTimerStream } from "https://deno.land/x/[email protected]/mod.ts";`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+export { bgGreen, bgWhite, stripAnsiCode } from "jsr:@std/[email protected]/colors";`