vite-plugin-blocklet 0.6.1 → 0.6.3

package/dist/index.cjs

@@ -27,6 +27,10 @@ var mri__default = /*#__PURE__*/_interopDefaultLegacy(mri);
 const { types } = Mcrypto__default["default"];
 
 function toBlockletDid(name) {
+  if (did.isValid(name)) {
+    return name;
+  }
+
   const pk = util.toHex(Buffer.from(typeof name === 'string' ? name.trim() : name));
   return did.fromPublicKey(pk, { role: types.RoleType.ROLE_ANY });
 }
@@ -99,11 +103,12 @@ function createConfigPlugin() {
           try {
             const blockletYamlPath = './blocklet.yml';
             const blockletYaml = YAML__default["default"].parse(fs__default["default"].readFileSync(blockletYamlPath, 'utf8'));
-            const { name } = blockletYaml;
-            if (name) {
-              const did = toBlockletDid(name);
+            let { name, did } = blockletYaml;
+            if (!did && name) {
+              did = toBlockletDid(name);
+            }
+            if (did) {
               const base = `/.blocklet/proxy/${did}/`;
-
               return {
                 base,
               };
@@ -187,7 +192,8 @@ async function setupClient(app, options = {}) {
 function createBlockletPlugin(options = {}) {
   const {
     // NOTICE: 由于 polyfill 不是每个项目都必须的，并且有些现有的项目已经配置了 polyfill，所以这个配置默认 disable 会比较好
-    disableNodePolyfills = true,
+    // UPDATE: 经过实践，大部分项目都需要此配置，现变更为默认开启 @2023-04-25
+    disableNodePolyfills = false,
     disableConfig = false,
     disableMeta = false,
     disableHmr = false,

package/index.js

@@ -7,7 +7,8 @@ import setupClient from './libs/client.js';
 export function createBlockletPlugin(options = {}) {
   const {
     // NOTICE: 由于 polyfill 不是每个项目都必须的，并且有些现有的项目已经配置了 polyfill，所以这个配置默认 disable 会比较好
-    disableNodePolyfills = true,
+    // UPDATE: 经过实践，大部分项目都需要此配置，现变更为默认开启 @2023-04-25
+    disableNodePolyfills = false,
     disableConfig = false,
     disableMeta = false,
     disableHmr = false,

package/libs/config.js

@@ -48,11 +48,12 @@ export default function createConfigPlugin() {
           try {
             const blockletYamlPath = './blocklet.yml';
             const blockletYaml = YAML.parse(fs.readFileSync(blockletYamlPath, 'utf8'));
-            const { name } = blockletYaml;
-            if (name) {
-              const did = toBlockletDid(name);
+            let { name, did } = blockletYaml;
+            if (!did && name) {
+              did = toBlockletDid(name);
+            }
+            if (did) {
               const base = `/.blocklet/proxy/${did}/`;
-
               return {
                 base,
               };

package/libs/utils.js

@@ -1,10 +1,14 @@
 import Mcrypto from '@ocap/mcrypto';
 import { toHex } from '@ocap/util';
-import { fromPublicKey } from '@arcblock/did';
+import { fromPublicKey, isValid } from '@arcblock/did';
 
 const { types } = Mcrypto;
 
 export function toBlockletDid(name) {
+  if (isValid(name)) {
+    return name;
+  }
+
   const pk = toHex(Buffer.from(typeof name === 'string' ? name.trim() : name));
   return fromPublicKey(pk, { role: types.RoleType.ROLE_ANY });
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vite-plugin-blocklet",
   "type": "module",
-  "version": "0.6.1",
+  "version": "0.6.3",
   "description": "",
   "main": "index.js",
   "files": [
@@ -27,14 +27,14 @@
     "rollup": "^2.79.1"
   },
   "dependencies": {
-    "@arcblock/did": "^1.18.65",
-    "@ocap/mcrypto": "^1.18.65",
-    "@ocap/util": "^1.18.65",
+    "@arcblock/did": "^1.18.78",
+    "@ocap/mcrypto": "^1.18.78",
+    "@ocap/util": "^1.18.78",
     "get-port": "^5.1.1",
     "mri": "^1.2.0",
-    "semver": "^7.3.8",
+    "semver": "^7.5.0",
     "vite-plugin-node-polyfills": "^0.7.0",
-    "yaml": "^2.2.1"
+    "yaml": "^2.2.2"
   },
   "peerDependencies": {
     "vite": ">=2"