glass-easel-miniprogram-webpack-plugin 0.18.0 → 0.20.0

package/index.js

@@ -71,12 +71,13 @@ const writeCache = (compiler, key, value) => new Promise((resolve) => {
     });
 });
 class StyleSheetManager {
-    constructor(disableClassPrefix, codeRoot, virtualModules) {
+    constructor(disableClassPrefix, disableHostConversion, codeRoot, virtualModules) {
         this.map = Object.create(null);
         this.enableStyleScope = Object.create(null);
         this.scopeNameInc = 0;
         this.hostStylesReady = false;
         this.disableClassPrefix = disableClassPrefix;
+        this.disableHostConversion = disableHostConversion;
         this.codeRoot = codeRoot;
         this.virtualModules = virtualModules;
     }
@@ -155,6 +156,7 @@ class GlassEaselMiniprogramWebpackPlugin {
         this.defaultEntry = options.defaultEntry || 'pages/index/index';
         this.customBootstrap = options.customBootstrap || false;
         this.disableClassPrefix = options.disableClassPrefix || false;
+        this.disableHostConversion = options.disableHostConversion || false;
     }
     apply(compiler) {
         const devMode = this.dev === undefined
@@ -170,7 +172,7 @@ class GlassEaselMiniprogramWebpackPlugin {
         // init style sheet manager
         const virtualModules = this.virtualModules;
         virtualModules.apply(compiler);
-        const styleSheetManager = new StyleSheetManager(this.disableClassPrefix, codeRoot, this.virtualModules);
+        const styleSheetManager = new StyleSheetManager(this.disableClassPrefix, this.disableHostConversion, codeRoot, this.virtualModules);
         // cleanup wasm modules
         compiler.hooks.shutdown.tap(PLUGIN_NAME, () => {
             depsTmplGroup.free();
@@ -374,6 +376,7 @@ class GlassEaselMiniprogramWebpackPlugin {
                                 else {
                                     x.options = {
                                         classPrefix: styleSheetManager.getScopeName(compPath),
+                                        disableHostConversion: styleSheetManager.disableHostConversion,
                                         setLowPriorityStyles: (s, map) => {
                                             styleSheetManager.setLowPriorityStyles(compPath, s, map);
                                         },

package/index.ts

@@ -44,6 +44,7 @@ type PluginConfig = {
   defaultEntry: string
   customBootstrap: boolean
   disableClassPrefix: boolean
+  disableHostConversion: boolean
 }
 
 type GlobalStaticConfig = {
@@ -91,16 +92,19 @@ class StyleSheetManager {
   enableStyleScope = Object.create(null) as { [path: string]: boolean }
   scopeNameInc = 0
   disableClassPrefix: boolean
+  disableHostConversion: boolean
   codeRoot: string
   virtualModules: VirtualModulePluginType
   hostStylesReady = false
 
   constructor(
     disableClassPrefix: boolean,
+    disableHostConversion: boolean,
     codeRoot: string,
     virtualModules: VirtualModulePluginType,
   ) {
     this.disableClassPrefix = disableClassPrefix
+    this.disableHostConversion = disableHostConversion
     this.codeRoot = codeRoot
     this.virtualModules = virtualModules
   }
@@ -182,6 +186,7 @@ export class GlassEaselMiniprogramWebpackPlugin implements WebpackPluginInstance
   defaultEntry: string
   customBootstrap: boolean
   disableClassPrefix: boolean
+  disableHostConversion: boolean
   // eslint-disable-next-line @typescript-eslint/no-unsafe-call
   virtualModules = new VirtualModulesPlugin() as VirtualModulePluginType
 
@@ -192,6 +197,7 @@ export class GlassEaselMiniprogramWebpackPlugin implements WebpackPluginInstance
     this.defaultEntry = options.defaultEntry || 'pages/index/index'
     this.customBootstrap = options.customBootstrap || false
     this.disableClassPrefix = options.disableClassPrefix || false
+    this.disableHostConversion = options.disableHostConversion || false
   }
 
   apply(compiler: Compiler) {
@@ -214,6 +220,7 @@ export class GlassEaselMiniprogramWebpackPlugin implements WebpackPluginInstance
     virtualModules.apply(compiler)
     const styleSheetManager = new StyleSheetManager(
       this.disableClassPrefix,
+      this.disableHostConversion,
       codeRoot,
       this.virtualModules,
     )
@@ -425,6 +432,7 @@ export class GlassEaselMiniprogramWebpackPlugin implements WebpackPluginInstance
                   } else {
                     x.options = {
                       classPrefix: styleSheetManager.getScopeName(compPath),
+                      disableHostConversion: styleSheetManager.disableHostConversion,
                       setLowPriorityStyles: (s: string, map: string) => {
                         styleSheetManager.setLowPriorityStyles(compPath, s, map)
                       },

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.18.0",
+  "version": "0.20.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/wechat-miniprogram/glass-easel.git"
@@ -18,8 +18,8 @@
   "main": "index.js",
   "peerDependencies": {
     "webpack": "^5.101.3",
-    "glass-easel": "0.18.0",
-    "glass-easel-miniprogram-adapter": "0.18.0"
+    "glass-easel": "0.20.0",
+    "glass-easel-miniprogram-adapter": "0.20.0"
   },
   "dependencies": {
     "chalk": "4",
@@ -27,8 +27,8 @@
     "source-map": "^0.7.4",
     "webpack-sources": "^3.2.1",
     "webpack-virtual-modules": "^0.5.0",
-    "glass-easel-stylesheet-compiler": "0.18.0",
-    "glass-easel-template-compiler": "0.18.0"
+    "glass-easel-stylesheet-compiler": "0.20.0",
+    "glass-easel-template-compiler": "0.20.0"
   },
   "scripts": {
     "build": "tsc -p .",

package/wxss_loader.js

@@ -6,8 +6,8 @@ const { StyleSheetTransformer } = require('glass-easel-stylesheet-compiler')
 
 module.exports = function (src, prevMap, meta) {
   const callback = this.async()
-  const { classPrefix, setLowPriorityStyles } = this.query
-  const sst = new StyleSheetTransformer(this.resourcePath, src, classPrefix, 750, true)
+  const { classPrefix, disableHostConversion, setLowPriorityStyles } = this.query
+  const sst = new StyleSheetTransformer(this.resourcePath, src, classPrefix, 750, !disableHostConversion)
   setLowPriorityStyles(sst.getLowPriorityContent(), sst.getLowPrioritySourceMap())
   const warnings = sst.extractWarnings()
   if (warnings && warnings.length > 0) {