fix: make sure windiService is available, rename service

Author: harlan-zw

src/interfaces.ts

@@ -2,7 +2,7 @@ import type webpack from 'webpack'
 import type { WindiPluginUtils, UserOptions } from '@windicss/plugin-utils'
 
 export type Compiler = webpack.Compiler & {
-  $windyCSSService: WindiPluginUtils & {
+  $windi: WindiPluginUtils & {
     dirty: Set<string>
     root: string
     virtualModules: Map<string, string>

src/loaders/transform-css.ts

@@ -10,7 +10,7 @@ function TransformCss(
     return source
 
   this.cacheable(true)
-  const service = (this._compiler as Compiler).$windyCSSService
+  const service = (this._compiler as Compiler).$windi
 
   if (!service)
     return source

src/loaders/transform-template.ts

@@ -14,7 +14,7 @@ function TransformTemplate(
     return source
 
   this.cacheable(true)
-  const service = (this._compiler as Compiler).$windyCSSService
+  const service = (this._compiler as Compiler).$windi
 
   if (!service)
     return source

src/loaders/virtual-module.ts

@@ -17,7 +17,7 @@ async function VirtualModule(
     return
   }
   this.cacheable(false)
-  const service = (this._compiler as Compiler).$windyCSSService
+  const service = (this._compiler as Compiler).$windi
   const match = this.resource.match(MODULE_ID_VIRTUAL_TEST)
   if (!service || !match) {
     const error = new Error(`Failed to match the resource "${this.resource}" to a WindiCSS virtual module.`)

src/plugin.ts

@@ -93,10 +93,10 @@ class WindiCSSWebpackPlugin {
      */
     compiler.options.module.rules.push({
       include(resource) {
-        if (shouldExcludeResource(resource))
+        if (!compiler.$windi || shouldExcludeResource(resource))
           return false
 
-        return Boolean(compiler.$windyCSSService.isDetectTarget(resource))
+        return Boolean(compiler.$windi.isDetectTarget(resource))
       },
       enforce: 'post',
       use: [{
@@ -111,10 +111,10 @@ class WindiCSSWebpackPlugin {
      */
     compiler.options.module.rules.push({
       include(resource) {
-        if (shouldExcludeResource(resource))
+        if (!compiler.$windi || shouldExcludeResource(resource))
           return false
 
-        return Boolean(compiler.$windyCSSService.isDetectTarget(resource))
+        return Boolean(compiler.$windi.isDetectTarget(resource))
       },
       use: [{
         loader: transformTemplateLoader,
@@ -123,10 +123,10 @@ class WindiCSSWebpackPlugin {
 
     compiler.options.module.rules.push({
       include(resource) {
-        if (shouldExcludeResource(resource))
+        if (!compiler.$windi || shouldExcludeResource(resource))
           return false
 
-        return Boolean(compiler.$windyCSSService.isCssTransformTarget(resource))
+        return Boolean(compiler.$windi.isCssTransformTarget(resource))
       },
       use: [{
         loader: transformCSSLoader,
@@ -150,7 +150,7 @@ class WindiCSSWebpackPlugin {
     * Add the windycss config file as a dependency so that the watcher can handle updates to it.
     */
     compiler.hooks.afterCompile.tap(NAME, (compilation) => {
-      if (compiler.$windyCSSService) {
+      if (compiler.$windi) {
         let hasConfig = false
         // add watcher for the config path
         for (const name of defaultConfigureFiles) {
@@ -191,27 +191,27 @@ class WindiCSSWebpackPlugin {
         resource = 'all-modules'
 
       // make sure service is available and file is valid
-      if (!compiler.$windyCSSService || shouldExcludeResource(resource))
+      if (!compiler.$windi || shouldExcludeResource(resource))
         return
 
       const skipInvalidation
-        = compiler.$windyCSSService.dirty.has(resource)
-        || (resource !== 'all-modules' && !compiler.$windyCSSService.isDetectTarget(resource) && resource !== compiler.$windyCSSService.configFilePath)
+        = compiler.$windi.dirty.has(resource)
+        || (resource !== 'all-modules' && !compiler.$windi.isDetectTarget(resource) && resource !== compiler.$windi.configFilePath)
 
       debug.plugin('file update', resource, `skip:${skipInvalidation}`)
       if (skipInvalidation)
         return
       // Add dirty file so the loader can process it
-      compiler.$windyCSSService.dirty.add(resource)
+      compiler.$windi.dirty.add(resource)
       // Trigger a change to the virtual module
       const moduleUpdateId = hmrId++
       MODULE_ID_VIRTUAL_MODULES.forEach((virtualModulePath) => {
         let virtualModuleContent = ''
         const match = virtualModulePath.match(MODULE_ID_VIRTUAL_TEST)
         if (match) {
           const layer = (match[1] as LayerName | 'all') || 'all'
-          if (compiler.$windyCSSService && compiler.$windyCSSService.virtualModules.has(layer))
-            virtualModuleContent = def(compiler.$windyCSSService.virtualModules.get(layer), '')
+          if (compiler.$windi && compiler.$windi.virtualModules.has(layer))
+            virtualModuleContent = def(compiler.$windi.virtualModules.get(layer), '')
         }
         virtualModules.writeModule(
           join(this.options.virtualModulePath, virtualModulePath),
@@ -223,13 +223,13 @@ class WindiCSSWebpackPlugin {
 
     // Make windy service available to the loader
     const initWindyCSSService = async() => {
-      if (!compiler.$windyCSSService) {
+      if (!compiler.$windi) {
         const utils = def(this.options.utils, createUtils(this.options, {
           root,
           name: NAME,
         }))
 
-        compiler.$windyCSSService = Object.assign(
+        compiler.$windi = Object.assign(
           utils,
           {
             root,
@@ -240,25 +240,25 @@ class WindiCSSWebpackPlugin {
         // Scans all files and builds initial css
         // wrap in a try catch
         try {
-          await compiler.$windyCSSService.init()
+          await compiler.$windi.init()
         }
         catch (e: any) {
-          compiler.$windyCSSService.initException = e
+          compiler.$windi.initException = e
         }
       }
     }
 
     compiler.hooks.thisCompilation.tap(NAME, (compilation) => {
-      if (!compiler.$windyCSSService)
+      if (!compiler.$windi)
         return
 
       // give the init exception to the compilation so that the user can see there was an issue
-      if (compiler.$windyCSSService.initException) {
-        compilation.errors.push(compiler.$windyCSSService.initException)
-        compiler.$windyCSSService.initException = undefined
+      if (compiler.$windi.initException) {
+        compilation.errors.push(compiler.$windi.initException)
+        compiler.$windi.initException = undefined
       }
       compilation.hooks.childCompiler.tap(NAME, (childCompiler) => {
-        childCompiler.$windyCSSService = compiler.$windyCSSService
+        childCompiler.$windi = compiler.$windi
       })
     })