vite-plugin-blocklet 0.1.2 → 0.4.21

package/index.js

@@ -1,14 +1,22 @@
-export function createBlockletPlugin() {
-  return {
-    name: 'vite-plugin-blocklet',
-    transform(code, id) {
-      if (id.endsWith('/vite/dist/client/client.mjs')) {
-        const replacedCode = code.replace(
-          'const socketHost = `${__HMR_HOSTNAME__ || location.hostname}:${__HMR_PORT__}`;',
-          "let tmpPort = __HMR_PORT__;\nif (window.blocklet) {\ntmpPort = new URL(window.location.href).port;\n}\nconst socketHost = `${__HMR_HOSTNAME__ || location.hostname}${tmpPort ? `:${tmpPort}` : ''}`;",
-        );
-        return replacedCode;
-      }
-    },
-  };
+import createHmrPlugin from './libs/hmr.js';
+import createConfigPlugin from './libs/config.js';
+import createMetaPlugin from './libs/meta.js';
+import { isInBlocklet } from './libs/utils.js';
+
+export function createBlockletPlugin(options = {}) {
+  const { disableConfig = false, disableMeta = false, disableHmr = false } = options;
+  const plugins = [];
+  if (!disableMeta) {
+    plugins.push(createMetaPlugin(options));
+  }
+  if (!disableConfig) {
+    plugins.push(createConfigPlugin(options));
+  }
+  if (isInBlocklet) {
+    if (!disableHmr) {
+      plugins.push(createHmrPlugin(options));
+    }
+  }
+
+  return plugins;
 }

package/libs/config.js

@@ -0,0 +1,70 @@
+import fs from 'fs';
+import path from 'path';
+import YAML from 'yaml';
+import { toBlockletDid, isInBlocklet } from './utils.js';
+
+export default function createConfigPlugin() {
+  return {
+    name: 'blocklet:config',
+    configureServer(server) {
+      if (isInBlocklet) {
+        server.middlewares.use((req, res, next) => {
+          const prefix = req.headers['x-path-prefix'] || '/';
+          // blocklet server 会把设置的 base 从请求 url 中移除，所以需要再加回 base
+          if (!req.url.startsWith(prefix)) {
+            req.url = path.join(prefix || '/', req.url);
+          }
+          return next();
+        });
+      }
+    },
+    config(config, { command }) {
+      if (command === 'serve') {
+        const targetConfig = {};
+        if (!config.base) {
+          let base = process.env.BLOCKLET_DEV_MOUNT_POINT || '';
+
+          if (base) {
+            if (!base.startsWith('/')) {
+              base = `/${base}`;
+            }
+            if (!base.endsWith('/')) {
+              base = `${base}/`;
+            }
+          }
+          targetConfig.base = base;
+        }
+        if (!(config.server && config.server.port)) {
+          const port = process.env.BLOCKLET_PORT || 3000;
+          targetConfig.server = {
+            port,
+          };
+        }
+        return targetConfig;
+      }
+
+      if (command === 'build') {
+        if (!config.base) {
+          try {
+            const blockletYamlPath = './blocklet.yml';
+            const blockletYaml = YAML.parse(fs.readFileSync(blockletYamlPath, 'utf8'));
+            const { name } = blockletYaml;
+            if (name) {
+              const did = toBlockletDid(name);
+              const base = `/.blocklet/proxy/${did}/`;
+
+              return {
+                base,
+              };
+            }
+          } catch (err) {
+            console.error(err);
+            return {};
+          }
+        }
+      }
+
+      return {};
+    },
+  };
+}

package/libs/hmr.js

@@ -0,0 +1,17 @@
+export default function createHmrPlugin() {
+  return {
+    name: 'blocklet:hmr',
+    apply: 'serve',
+    transform(code, id) {
+      if (id.endsWith('/vite/dist/client/client.mjs')) {
+        let replacedCode = code;
+        replacedCode = replacedCode.replace("const base = __BASE__ || '/';\n", '');
+        replacedCode = replacedCode.replace(
+          'const socketHost = `${__HMR_HOSTNAME__ || location.hostname}:${__HMR_PORT__}`;',
+          "const base = __BASE__ || '/';\nlet tmpPort = __HMR_PORT__;\nif (window.blocklet) {\ntmpPort = new URL(window.location.href).port + base;\n}\nconst socketHost = `${__HMR_HOSTNAME__ || location.hostname}${tmpPort ? `:${tmpPort}` : ''}`;"
+        );
+        return replacedCode;
+      }
+    },
+  };
+}

package/libs/meta.js

@@ -0,0 +1,19 @@
+export default function createMetaPlugin() {
+  return {
+    name: 'blocklet:meta',
+    transformIndexHtml(html) {
+      return {
+        html,
+        tags: [
+          {
+            // injectTo: 'head',
+            tag: 'script',
+            attrs: {
+              src: '__meta__.js',
+            },
+          },
+        ],
+      };
+    },
+  };
+}

package/libs/utils.js

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

package/package.json

@@ -1,23 +1,31 @@
 {
   "name": "vite-plugin-blocklet",
   "type": "module",
-  "version": "0.1.2",
+  "version": "0.4.21",
   "description": "",
   "main": "index.js",
   "exports": {
     ".": {
-      "require": "./index.cjs",
+      "require": "./dist/index.cjs",
       "import": "./index.js"
     }
   },
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "rollup -c rollup.config.js"
-  },
   "keywords": [],
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "rollup": "^2.70.1"
+    "rollup": "^2.76.0"
+  },
+  "dependencies": {
+    "@arcblock/did": "^1.17.5",
+    "@ocap/mcrypto": "^1.17.5",
+    "@ocap/util": "^1.17.5",
+    "yaml": "^2.1.1"
+  },
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "watch": "rollup -w -c rollup.config.js",
+    "build": "rollup -c rollup.config.js",
+    "postinstall": "npm run build"
   }
-}
+}

package/rollup.config.js

@@ -1,7 +1,7 @@
 export default {
   input: 'index.js',
   output: {
-    file: 'index.cjs',
+    file: 'dist/index.cjs',
     format: 'cjs',
   },
 };

package/index.cjs

@@ -1,20 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-function createBlockletPlugin() {
-  return {
-    name: 'vite-plugin-blocklet',
-    transform(code, id) {
-      if (id.endsWith('/vite/dist/client/client.mjs')) {
-        const replacedCode = code.replace(
-          'const socketHost = `${__HMR_HOSTNAME__ || location.hostname}:${__HMR_PORT__}`;',
-          "let tmpPort = __HMR_PORT__;\nif (window.blocklet) {\ntmpPort = new URL(window.location.href).port;\n}\nconst socketHost = `${__HMR_HOSTNAME__ || location.hostname}${tmpPort ? `:${tmpPort}` : ''}`;",
-        );
-        return replacedCode;
-      }
-    },
-  };
-}
-
-exports.createBlockletPlugin = createBlockletPlugin;

package/pnpm-lock.yaml

@@ -1,25 +0,0 @@
-lockfileVersion: 5.3
-
-specifiers:
-  rollup: ^2.70.1
-
-devDependencies:
-  rollup: 2.70.1
-
-packages:
-
-  /fsevents/2.3.2:
-    resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==}
-    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
-    os: [darwin]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /rollup/2.70.1:
-    resolution: {integrity: sha512-CRYsI5EuzLbXdxC6RnYhOuRdtz4bhejPMSWjsFLfVM/7w/85n2szZv6yExqUXsBdz5KT8eoubeyDUDjhLHEslA==}
-    engines: {node: '>=10.0.0'}
-    hasBin: true
-    optionalDependencies:
-      fsevents: 2.3.2
-    dev: true