@into-mini/sfc-split-plugin 0.6.3 → 0.6.5

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import { AddWxsPlugin } from "./plugin/add-wxs.mjs";
 import { ExposeEntryNamePlugin } from "./plugin/expose-entry.mjs";
-import { EntryRenamePlugin } from "./plugin/entry-rename.mjs";
+// import { EntryRenamePlugin } from './plugin/entry-rename.mts';
 import { MinaRuntimeWebpackPlugin } from "./plugin/mina-runtime.mjs";
 export class SfcSplitPlugin {
     options;
@@ -17,10 +17,10 @@ export class SfcSplitPlugin {
             new AddWxsPlugin().apply(compiler);
             new MinaRuntimeWebpackPlugin().apply(compiler);
             new ExposeEntryNamePlugin().apply(compiler);
-            new EntryRenamePlugin({
-                issuer: /\.vue$/,
-                test: /\.wxml|json/,
-            }).apply(compiler);
+            // new EntryRenamePlugin({
+            //   issuer: /\.vue$/,
+            //   test: /\.wxml|json/,
+            // }).apply(compiler);
         }
     }
 }

package/dist/loader/entry-loader.mjs

@@ -3,6 +3,7 @@
 import { createHash } from 'node:crypto';
 import { relative, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
+import sortKeys from 'sort-keys';
 import slash from 'slash';
 function createShortHash(input) {
     return createHash('sha256').update(input).digest('hex').slice(0, 8);
@@ -11,7 +12,7 @@ function reach(path) {
     return fileURLToPath(import.meta.resolve(path));
 }
 const componentRoot = 'as-components';
-function handleImport({ toThis, addSmartEntry, context, rootContext, maps, callback, }) {
+function handleImport({ addSmartEntry, context, rootContext, maps, callback }) {
     if (Object.keys(maps).length > 0) {
         for (const [name, path] of Object.entries(maps)) {
             if (path.endsWith('.vue') && !path.startsWith('plugin://')) {
@@ -30,7 +31,7 @@ function handleImport({ toThis, addSmartEntry, context, rootContext, maps, callb
                             createShortHash(slash(relativePath)),
                         ].join('/')
                         : relativePath.replace(/\.vue$/, '');
-                    const placer = toThis(entryName);
+                    const placer = `/${entryName}`;
                     callback({
                         name,
                         placer,
@@ -55,19 +56,14 @@ function handleImport({ toThis, addSmartEntry, context, rootContext, maps, callb
 export default function loader(source) {
     this.cacheable();
     const callback = this.async();
-    const { entryName: thisEntryName } = this;
     const config = JSON.parse(source.trim() || '{}');
     const { rootContext, context } = this;
-    function toThis(entryName) {
-        return slash(relative(`/${thisEntryName}/..`, `/${entryName}`));
-    }
     // eslint-disable-next-line unicorn/consistent-function-scoping
     const addSmartEntry = (io) => {
         this.addSmartEntry(io);
     };
     if (config?.usingComponents) {
         handleImport.bind(this)({
-            toThis,
             addSmartEntry,
             componentRoot,
             context,
@@ -84,7 +80,6 @@ export default function loader(source) {
     }
     if (config?.componentGenerics) {
         handleImport.bind(this)({
-            toThis,
             addSmartEntry,
             context,
             rootContext,
@@ -96,6 +91,8 @@ export default function loader(source) {
             },
         });
     }
+    config.componentGenerics &&= sortKeys(config.componentGenerics);
+    config.usingComponents &&= sortKeys(config.usingComponents);
     const shouldFormat = this._compiler?.options?.optimization?.minimize !== true;
     const spaces = shouldFormat ? 2 : 0;
     callback(null, JSON.stringify(config, null, spaces));

package/dist/plugin/expose-entry.d.mts

@@ -1,7 +1,6 @@
-import type { Compiler, Compilation, PathData, Module, Chunk, WebpackPluginInstance } from 'webpack';
+import type { Compiler, PathData, Chunk, WebpackPluginInstance } from 'webpack';
 export declare class ExposeEntryNamePlugin implements WebpackPluginInstance {
     getEntryNameFromChunk(chunk: Chunk): string | null | undefined;
-    getEntryNameFromEntries(compilation: Compilation, module: Module): string;
     getEntryNameFromPathData(pathData: PathData): string;
     apply(compiler: Compiler): void;
 }

package/dist/plugin/expose-entry.mjs

@@ -1,4 +1,3 @@
-import slash from 'slash';
 const PLUGIN_NAME = 'ExposeEntryNamePlugin';
 export class ExposeEntryNamePlugin {
     getEntryNameFromChunk(chunk) {
@@ -12,29 +11,6 @@ export class ExposeEntryNamePlugin {
         }
         return '';
     }
-    getEntryNameFromEntries(compilation, module) {
-        const { moduleGraph, entries } = compilation;
-        for (const [name, io] of entries) {
-            for (const dep of io.dependencies) {
-                const entryModule = moduleGraph.getModule(dep);
-                if (entryModule) {
-                    if (
-                    // @ts-expect-error ------------
-                    entryModule.request && // @ts-expect-error ------------
-                        slash(entryModule.request) === slash(module.request)) {
-                        return name;
-                    }
-                    if (
-                    // @ts-expect-error ------------
-                    entryModule?.resource && // @ts-expect-error ------------
-                        slash(entryModule?.resource) === slash(module.resource)) {
-                        return name;
-                    }
-                }
-            }
-        }
-        return '';
-    }
     getEntryNameFromPathData(pathData) {
         if (pathData?.chunk) {
             const entryName = this.getEntryNameFromChunk(pathData.chunk);
@@ -54,7 +30,6 @@ export class ExposeEntryNamePlugin {
         return '';
     }
     apply(compiler) {
-        const { NormalModule: { getCompilationHooks }, } = compiler.webpack;
         compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
             compilation.hooks.assetPath.tap(PLUGIN_NAME, (path, pathData) => {
                 if (path.includes('[entry]')) {
@@ -65,15 +40,6 @@ export class ExposeEntryNamePlugin {
                 }
                 return path;
             });
-            getCompilationHooks(compilation).loader.tap(PLUGIN_NAME, (loaderContext, module) => {
-                Object.defineProperty(loaderContext, 'entryName', {
-                    enumerable: true,
-                    configurable: false,
-                    get: () => {
-                        return this.getEntryNameFromEntries(compilation, module);
-                    },
-                });
-            });
         });
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@into-mini/sfc-split-plugin",
-  "version": "0.6.3",
+  "version": "0.6.5",
   "license": "MIT",
   "keywords": [
     "loader",
@@ -29,12 +29,13 @@
   "type": "module",
   "dependencies": {
     "slash": "^5.1.0",
+    "sort-keys": "^6.0.0",
     "yaml": "^2.8.2",
     "@into-mini/clsx": "^0.1.1",
     "@into-mini/sfc-transformer": "^0.6.5"
   },
   "peerDependencies": {
-    "webpack": "^5.104.0"
+    "webpack": "^5.104.1"
   },
   "engines": {
     "node": ">=22.18.0"

package/dist/plugin/expose-entry-bk.d.mts

@@ -1,6 +0,0 @@
-import type { Compiler, Compilation, PathData, Module, WebpackPluginInstance } from 'webpack';
-export declare class ExposeEntryNamePlugin implements WebpackPluginInstance {
-    getEntryNameFromEntries(compilation: Compilation, module: Module): string;
-    getEntryNameFromPathData(compilation: Compilation, pathData: PathData): string;
-    apply(compiler: Compiler): void;
-}

package/dist/plugin/expose-entry-bk.mjs

@@ -1,63 +0,0 @@
-import slash from 'slash';
-const PLUGIN_NAME = 'ExposeEntryNamePlugin';
-export class ExposeEntryNamePlugin {
-    getEntryNameFromEntries(compilation, module) {
-        const { moduleGraph, entries } = compilation;
-        for (const [name, io] of entries) {
-            for (const dep of io.dependencies) {
-                const entryModule = moduleGraph.getModule(dep);
-                if (entryModule) {
-                    if (
-                    // @ts-expect-error ------------
-                    entryModule.request && // @ts-expect-error ------------
-                        slash(entryModule.request) === slash(module.request)) {
-                        return name;
-                    }
-                    if (
-                    // @ts-expect-error ------------
-                    entryModule?.resource && // @ts-expect-error ------------
-                        slash(entryModule?.resource) === slash(module.resource)) {
-                        return name;
-                    }
-                }
-            }
-        }
-        return '';
-    }
-    getEntryNameFromPathData(compilation, pathData) {
-        const mod = pathData.module;
-        const graph = pathData.chunkGraph;
-        if (mod && graph) {
-            const [entryModule] = graph
-                .getModuleChunks(mod)
-                .map((chunk) => [...graph.getChunkEntryModulesIterable(chunk)][0]);
-            if (entryModule) {
-                return this.getEntryNameFromEntries(compilation, entryModule);
-            }
-        }
-        return '';
-    }
-    apply(compiler) {
-        const { NormalModule: { getCompilationHooks }, } = compiler.webpack;
-        compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
-            compilation.hooks.assetPath.tap(PLUGIN_NAME, (path, pathData) => {
-                if (path.includes('[entry]')) {
-                    const entryName = this.getEntryNameFromPathData(compilation, pathData);
-                    return entryName
-                        ? path.replaceAll('[entry]', entryName)
-                        : path.replaceAll('[entry]', '[hash:8]');
-                }
-                return path;
-            });
-            getCompilationHooks(compilation).loader.tap(PLUGIN_NAME, (loaderContext, module) => {
-                Object.defineProperty(loaderContext, 'entryName', {
-                    enumerable: true,
-                    configurable: false,
-                    get: () => {
-                        return this.getEntryNameFromEntries(compilation, module);
-                    },
-                });
-            });
-        });
-    }
-}