vite-plugin-blocklet 0.6.7 → 0.6.9

package/dist/index.cjs

@@ -3,7 +3,6 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var vitePluginNodePolyfills = require('vite-plugin-node-polyfills');
-var VitePluginEntryInject = require('vite-plugin-entry-inject');
 var vite = require('vite');
 var semver = require('semver');
 var Mcrypto = require('@ocap/mcrypto');
@@ -17,7 +16,6 @@ var mri = require('mri');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
-var VitePluginEntryInject__default = /*#__PURE__*/_interopDefaultLegacy(VitePluginEntryInject);
 var semver__default = /*#__PURE__*/_interopDefaultLegacy(semver);
 var Mcrypto__default = /*#__PURE__*/_interopDefaultLegacy(Mcrypto);
 var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
@@ -131,8 +129,19 @@ function createConfigPlugin() {
 function createMetaPlugin() {
   return {
     name: 'blocklet:meta',
-    transformIndexHtml(html) {
+    transformIndexHtml(html, ctx) {
       const tags = [];
+      if (ctx?.chunk?.isEntry) {
+        let script;
+        html = html.replace(new RegExp('<script[^<>]+' + ctx.chunk.fileName + '[^<>]+></script>'), (match) => {
+          script = match;
+
+          return '';
+        });
+        if (script) {
+          html = html.replace('</body>', `${script}</body>`);
+        }
+      }
       // 如果 index.html 中没有设置 title，则自动注入 blocklet.yml 中的 title
       if (!/<title>(.*?)<\/title>/.test(html)) {
         const blockletYamlPath = './blocklet.yml';
@@ -270,7 +279,7 @@ function generateHtml({ color, image }) {
   }
   </style>
   <div class="spinner-wrapper">
-    <img src="${image}" width="90" height="90" style="margin-bottom: 16px" />
+    <img src="${image}" width="70" height="70" style="margin-bottom: 16px" />
     <div class="spinner">
       <div class="bounce1"></div>
       <div class="bounce2"></div>
@@ -364,11 +373,7 @@ function createBlockletPlugin(options = {}) {
     disableLoading = false,
     ...restOptions
   } = options;
-  const plugins = [
-    VitePluginEntryInject__default["default"]({
-      injectTo: 'body',
-    }),
-  ];
+  const plugins = [];
   if (!disableMeta) {
     plugins.push(createMetaPlugin());
   }

package/index.js

@@ -1,5 +1,4 @@
 import { nodePolyfills } from 'vite-plugin-node-polyfills';
-import VitePluginEntryInject from 'vite-plugin-entry-inject';
 import createHmrPlugin from './libs/hmr.js';
 import createConfigPlugin from './libs/config.js';
 import createMetaPlugin from './libs/meta.js';
@@ -36,11 +35,7 @@ export function createBlockletPlugin(options = {}) {
     disableLoading = false,
     ...restOptions
   } = options;
-  const plugins = [
-    VitePluginEntryInject({
-      injectTo: 'body',
-    }),
-  ];
+  const plugins = [];
   if (!disableMeta) {
     plugins.push(createMetaPlugin(restOptions));
   }

package/libs/loading.js

@@ -107,7 +107,7 @@ function generateHtml({ color, image }) {
   }
   </style>
   <div class="spinner-wrapper">
-    <img src="${image}" width="90" height="90" style="margin-bottom: 16px" />
+    <img src="${image}" width="70" height="70" style="margin-bottom: 16px" />
     <div class="spinner">
       <div class="bounce1"></div>
       <div class="bounce2"></div>

package/libs/meta.js

@@ -4,8 +4,19 @@ import YAML from 'yaml';
 export default function createMetaPlugin() {
   return {
     name: 'blocklet:meta',
-    transformIndexHtml(html) {
+    transformIndexHtml(html, ctx) {
       const tags = [];
+      if (ctx?.chunk?.isEntry) {
+        let script;
+        html = html.replace(new RegExp('<script[^<>]+' + ctx.chunk.fileName + '[^<>]+></script>'), (match) => {
+          script = match;
+
+          return '';
+        });
+        if (script) {
+          html = html.replace('</body>', `${script}</body>`);
+        }
+      }
       // 如果 index.html 中没有设置 title，则自动注入 blocklet.yml 中的 title
       if (!/<title>(.*?)<\/title>/.test(html)) {
         const blockletYamlPath = './blocklet.yml';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vite-plugin-blocklet",
   "type": "module",
-  "version": "0.6.7",
+  "version": "0.6.9",
   "description": "",
   "main": "index.js",
   "files": [
@@ -27,13 +27,12 @@
     "rollup": "^2.79.1"
   },
   "dependencies": {
-    "@arcblock/did": "^1.18.87",
-    "@ocap/mcrypto": "^1.18.87",
-    "@ocap/util": "^1.18.87",
+    "@arcblock/did": "^1.18.88",
+    "@ocap/mcrypto": "^1.18.88",
+    "@ocap/util": "^1.18.88",
     "get-port": "^5.1.1",
     "mri": "^1.2.0",
     "semver": "^7.5.4",
-    "vite-plugin-entry-inject": "^1.0.2",
     "vite-plugin-node-polyfills": "^0.7.0",
     "yaml": "^2.3.1"
   },