glass-easel-miniprogram-webpack-plugin 0.14.0 → 0.15.0

package/index.js

@@ -41,11 +41,10 @@ const node_fs_1 = require("node:fs");
 const path = __importStar(require("node:path"));
 const webpack_1 = require("webpack");
 const chalk_1 = __importDefault(require("chalk"));
+const chokidar_1 = __importDefault(require("chokidar"));
 const glass_easel_template_compiler_1 = require("glass-easel-template-compiler");
 const helpers_1 = require("./helpers");
 // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-const chokidar = require('chokidar');
-// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 const { RawSource } = require('webpack-sources');
 // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 const VirtualModulesPlugin = require('webpack-virtual-modules');
@@ -305,8 +304,7 @@ class GlassEaselMiniprogramWebpackPlugin {
             // await readdirp(codeRoot, handleFile)
             yield new Promise((resolve, reject) => {
                 const promises = [];
-                /* eslint-disable @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call */
-                const watcher = chokidar.watch(codeRoot, { ignoreInitial: false });
+                const watcher = chokidar_1.default.watch(codeRoot, { ignoreInitial: false });
                 watcher
                     .on('add', (p) => {
                     const normalized = normalizePath(p);
@@ -322,7 +320,6 @@ class GlassEaselMiniprogramWebpackPlugin {
                     .on('ready', () => {
                     Promise.all(promises)
                         .then(() => {
-                        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
                         if (!enableWatch)
                             return watcher.close();
                         return null;
@@ -330,7 +327,6 @@ class GlassEaselMiniprogramWebpackPlugin {
                         .then(resolve)
                         .catch(reject);
                 });
-                /* eslint-enable @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call */
             });
         });
         // init component list before run
@@ -542,9 +538,7 @@ class GlassEaselMiniprogramWebpackPlugin {
         `;
                 const entryFooter = `
           var registerGlobalEventListener = function (backend) {
-            backend.onEvent((target, type, detail, options) => {
-              glassEasel.triggerEvent(target, type, detail, options)
-            })
+            backend.onEvent(glassEasel.triggerEvent)
           }
           exports.registerGlobalEventListener = registerGlobalEventListener
         `;

package/index.ts

@@ -4,6 +4,7 @@ import { promises as fs } from 'node:fs'
 import * as path from 'node:path'
 import { NormalModule, type Compiler, type WebpackPluginInstance } from 'webpack'
 import chalk from 'chalk'
+import chokidar from 'chokidar'
 import { TmplGroup } from 'glass-easel-template-compiler'
 import { escapeJsString } from './helpers'
 
@@ -24,8 +25,6 @@ type Warning = {
   endColumn: number
 }
 
-// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-const chokidar = require('chokidar')
 // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 const { RawSource } = require('webpack-sources')
 // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
@@ -356,7 +355,6 @@ export class GlassEaselMiniprogramWebpackPlugin implements WebpackPluginInstance
       // await readdirp(codeRoot, handleFile)
       await new Promise((resolve, reject) => {
         const promises: Promise<void>[] = []
-        /* eslint-disable @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call */
         const watcher = chokidar.watch(codeRoot, { ignoreInitial: false })
         watcher
           .on('add', (p: string) => {
@@ -372,14 +370,12 @@ export class GlassEaselMiniprogramWebpackPlugin implements WebpackPluginInstance
           .on('ready', () => {
             Promise.all(promises)
               .then(() => {
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-return
                 if (!enableWatch) return watcher.close()
                 return null
               })
               .then(resolve)
               .catch(reject)
           })
-        /* eslint-enable @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call */
       })
     }
 
@@ -601,9 +597,7 @@ export class GlassEaselMiniprogramWebpackPlugin implements WebpackPluginInstance
         `
         const entryFooter = `
           var registerGlobalEventListener = function (backend) {
-            backend.onEvent((target, type, detail, options) => {
-              glassEasel.triggerEvent(target, type, detail, options)
-            })
+            backend.onEvent(glassEasel.triggerEvent)
           }
           exports.registerGlobalEventListener = registerGlobalEventListener
         `

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "glass-easel-miniprogram-webpack-plugin",
   "description": "The webpack plugin of the glass-easel project for MiniProgram file structure",
-  "version": "0.14.0",
+  "version": "0.15.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/wechat-miniprogram/glass-easel.git"
@@ -17,18 +17,18 @@
   "homepage": "https://github.com/wechat-miniprogram/glass-easel",
   "main": "index.js",
   "peerDependencies": {
-    "webpack": "^5.85.0",
-    "glass-easel": "0.14.0",
-    "glass-easel-miniprogram-adapter": "0.14.0"
+    "webpack": "^5.101.3",
+    "glass-easel": "0.15.0",
+    "glass-easel-miniprogram-adapter": "0.15.0"
   },
   "dependencies": {
     "chalk": "4",
-    "chokidar": "^3.5.3",
+    "chokidar": "^4.0.3",
     "source-map": "^0.7.4",
     "webpack-sources": "^3.2.1",
     "webpack-virtual-modules": "^0.5.0",
-    "glass-easel-template-compiler": "0.14.0",
-    "glass-easel-stylesheet-compiler": "0.14.0"
+    "glass-easel-stylesheet-compiler": "0.15.0",
+    "glass-easel-template-compiler": "0.15.0"
   },
   "scripts": {
     "build": "tsc -p .",