[tag] v0.2.45-4

subdirectory · Dec 30, 2024 · 9905869 · 9905869
1 parent 6530374
commit 9905869
Show file tree

Hide file tree

Showing 13 changed files with 43 additions and 52 deletions.
diff --git a/.github/README.md b/.github/README.md
@@ -153,7 +153,7 @@ Here are Subshell's advantages over existing Node.js based shells.
 In fact, you can load the Subshell init script in Deno.
 
 ```
-$　deno repl --unstable --eval-file=https://deno.land/x/subshell@0.2.45-3/init.ts
+$　deno repl --unstable --eval-file=https://deno.land/x/subshell@0.2.45-4/init.ts
 ...
 Deno 1.23.2
 exit using ctrl+d or close()

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 0.2.45-4 Dec 30, 2024
+
+- switch to npm: specifier
+
 ## 0.2.45-3 Dec 30, 2024
 
 - fix release tag

diff --git a/Dockerfile b/Dockerfile
@@ -43,6 +43,6 @@ RUN chmod 644 /cache/deno_history.txt
 
 USER subshell
 
-ENV SUBSHELL_VERSION 0.2.45-3
+ENV SUBSHELL_VERSION 0.2.45-4
 
 CMD hub
diff --git a/README.md b/README.md
@@ -4,11 +4,11 @@ a Deno 🦕 repl, using polkadot-js extension as remote signer ✍️.
 Start with browser extension integration
 
 ```
-$　deno repl --allow-net --allow-env --eval-file=https://deno.land/x/subshell@0.2.45-3/init.ts
+$　deno repl --allow-net --allow-env --eval-file=https://deno.land/x/subshell@0.2.45-4/init.ts
 ```
 
 Start in lite mode
 
 ```
-$　deno repl --allow-net --allow-env --eval-file=https://deno.land/x/subshell@0.2.45-3/tini.ts
+$　deno repl --allow-net --allow-env --eval-file=https://deno.land/x/subshell@0.2.45-4/tini.ts
 ```
diff --git a/cache.ts b/cache.ts
@@ -1,7 +1,4 @@
-import {
-  ApiPromise,
-  WsProvider,
-} from "https://deno.land/x/polkadot@0.2.45/api/mod.ts";
+import { ApiPromise, WsProvider } from "npm:@polkadot/api";
 
 import fs from "node:fs";
 

diff --git a/ci-release.ts b/ci-release.ts
@@ -1,10 +1,11 @@
+#!/usr/bin/env -S deno run --allow-read --allow-run --allow-write --allow-env
 // Copyright 2017-2022 @polkadot/deno authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 // execute with
 //   deno run --allow-read --allow-run --allow-write --allow-env ci-release.ts
 
-import { stringCamelCase } from "https://deno.land/x/polkadot@0.2.45/util/mod.ts";
+import { stringCamelCase } from "npm:@polkadot/util";
 
 // tighter specification for git arguments
 type GitArgs =
@@ -113,7 +114,7 @@ async function gitSetup(): Promise<void> {
   await git("config", "user.email", MAIL);
   await git("config", "push.default", "simple");
   await git("config", "merge.ours.driver", "true");
-  await git("config", "--unset", "http.https://github.com/.extraheader");
+  // await git("config", "--unset", "http.https://github.com/.extraheader");
   await git("checkout", "main");
 }
 
@@ -176,4 +177,4 @@ await setPkgVersion(
   POLKADOT_VERSION,
   ".",
 );
-await gitPush(version);
+// await gitPush(version);
diff --git a/client/mod.ts b/client/mod.ts
@@ -1,16 +1,10 @@
-import {
-  ApiPromise,
-  WsProvider,
-} from "https://deno.land/x/polkadot@0.2.45/api/mod.ts";
-import type {
-  Signer,
-  SignerResult,
-} from "https://deno.land/x/polkadot@0.2.45/api/types/index.ts";
+import { ApiPromise, WsProvider } from "npm:@polkadot/api";
+import type { Signer, SignerResult } from "npm:@polkadot/api/types";
 import type {
   Registry,
   SignerPayloadJSON,
   SignerPayloadRaw,
-} from "https://deno.land/x/polkadot@0.2.45/types/types/index.ts";
+} from "npm:@polkadot/types/types";
 
 export class Client implements Signer {
   private encoder = new TextEncoder();

diff --git a/init.ts b/init.ts
@@ -1,16 +1,13 @@
-import "https://deno.land/x/polkadot@0.2.45/api-augment/mod.ts";
-import {
-  ApiPromise,
-  WsProvider,
-} from "https://deno.land/x/polkadot@0.2.45/api/mod.ts";
-import { GearApi } from "https://gear-js.deno.dev/api/src/index.ts";
-import { Client } from "https://deno.land/x/subshell@0.2.45-3/client/mod.ts";
-// import { VerboseSigner } from "https://deno.land/x/subshell@0.2.45-3/signer/mod.ts";
-import { stringToU8a } from "https://deno.land/x/polkadot@0.2.45/util/mod.ts";
+import "npm:@polkadot/api-augment";
+import { ApiPromise, WsProvider } from "npm:@polkadot/api";
+import { GearApi } from "npm:@gear-js/api";
+import { Client } from "https://deno.land/x/subshell@0.2.45-4/client/mod.ts";
+// import { VerboseSigner } from "https://deno.land/x/subshell@0.2.45-4/signer/mod.ts";
+import { stringToU8a } from "npm:@polkadot/util";
 
 const GEAR = !!Deno.env.get("GEAR");
 const DEFAULT_PROVIDER = GEAR
-  ? "wss://rpc.vara-network.io"
+  ? "wss://rpc.vara.network"
   : "wss://rpc.polkadot.io";
 const SESSION_ID = Deno.env.get("SESSION_ID") ?? "";
 const PROVIDER = Deno.env.get("PROVIDER") ?? DEFAULT_PROVIDER;
@@ -24,8 +21,12 @@ function progInfo() {
     // "⚙️ v8 version ": Deno.version.v8,
     // "🇹 TypeScript version ": Deno.version.typescript,
     "🦕 Deno": Deno.version.deno,
-    "📗 Wiki": GEAR ? "https://github.com/btwiuse/gear.sh/wiki" : "https://wiki.subshell.xyz",
-    "🙋 Issues": GEAR ? "https://github.com/btwiuse/gear.sh/issues" : "https://github.com/btwiuse/subshell/issues",
+    "📗 Wiki": GEAR
+      ? "https://github.com/btwiuse/gear.sh/wiki"
+      : "https://wiki.subshell.xyz",
+    "🙋 Issues": GEAR
+      ? "https://github.com/btwiuse/gear.sh/issues"
+      : "https://github.com/btwiuse/subshell/issues",
     // "⛓️ RPC Pprvider": PROVIDER,
     // "🪄 Custom types": JSON.stringify(TYPES) != '{}' ? 'Yes' : 'None',
     // "📖 Runtime api reference": 'https://substrate.rs',

diff --git a/main.ts b/main.ts
@@ -8,6 +8,6 @@ const status = await Deno.run({
     "--allow-env",
     "--no-prompt",
     "--unstable",
-    "--eval-file=https://deno.land/x/subshell@0.2.45-3/init.ts",
+    "--eval-file=https://deno.land/x/subshell@0.2.45-4/init.ts",
   ],
 }).status();
diff --git a/signer/mod.ts b/signer/mod.ts
@@ -1,18 +1,12 @@
-import {
-  ApiPromise,
-  WsProvider,
-} from "https://deno.land/x/polkadot@0.2.45/api/mod.ts";
-import type {
-  Signer,
-  SignerResult,
-} from "https://deno.land/x/polkadot@0.2.45/api/types/index.ts";
+import { ApiPromise, WsProvider } from "npm:@polkadot/api";
+import type { Signer, SignerResult } from "npm:@polkadot/api/types";
 import type {
   Registry,
   SignerPayloadJSON,
   SignerPayloadRaw,
-} from "https://deno.land/x/polkadot@0.2.45/types/types/index.ts";
-import { Keyring } from "https://deno.land/x/polkadot@0.2.45/api/mod.ts";
-import { createTestPairs } from "https://deno.land/x/polkadot@0.2.45/keyring/mod.ts";
+} from "npm:@polkadot/types/types";
+import { Keyring } from "npm:@polkadot/api";
+import { createTestPairs } from "npm:@polkadot/keyring";
 
 export function VerboseSigner(inner: Signer): Signer {
   async function signRaw(payload: SignerPayloadRaw): Promise<SignerResult> {

diff --git a/sixel.ts b/sixel.ts
@@ -2,7 +2,7 @@
 
 import { fromPng } from "npm:@rgba-image/png";
 import * as sixel from "npm:sixel";
-import { stringToU8a } from "https://deno.land/x/polkadot@0.2.45/util/mod.ts";
+import { stringToU8a } from "npm:@polkadot/util";
 import {
   ImageMagick,
   initializeImageMagick,

diff --git a/subsh-deno b/subsh-deno
@@ -5,9 +5,12 @@ if [[ -z "$RUNNING_IN_DOCKER" ]]; then
   cd $(dirname $(realpath $0))
 fi
 
-# DENO=deno
 DENO=subshell
 
+if ! command -v $DENO &> /dev/null; then
+  DENO=deno
+fi
+
 if [[ "$1" == cache ]]; then
   until
     $DENO run --no-lock --unstable -A cache.ts 
@@ -16,7 +19,7 @@ if [[ "$1" == cache ]]; then
   done
   $DENO run --no-lock --unstable -A cache.ts
 else
-  # $DENO repl --v8-flags=--trace-side-effect-free-debug-evaluate --unstable --eval-file=https://deno.land/x/subshell@0.2.45-3/init.ts
+  # $DENO repl --v8-flags=--trace-side-effect-free-debug-evaluate --unstable --eval-file=https://deno.land/x/subshell@0.2.45-4/init.ts
   # $DENO repl --no-lock --allow-read=".github" --allow-net --allow-env --no-prompt --unstable --eval-file=./init.ts
-  $DENO repl --no-lock --allow-read=".github" --allow-net --allow-env --no-prompt --unstable --allow-import --eval-file=https://deno.land/x/subshell@0.2.45-3/init.ts
+  $DENO repl --no-lock --allow-read=".github" --allow-net --allow-env --no-prompt --unstable --allow-import --eval-file=https://deno.land/x/subshell@0.2.45-4/init.ts
 fi
diff --git a/tini.ts b/tini.ts
@@ -1,7 +1,4 @@
-import {
-  ApiPromise,
-  WsProvider,
-} from "https://deno.land/x/polkadot@0.2.45/api/mod.ts";
+import { ApiPromise, WsProvider } from "npm:@polkadot/api";
 
 async function initApi() {
   const PROVIDER = Deno.env.get("PROVIDER") ?? "wss://rpc.polkadot.io";