@best-shot/preset-mini 0.11.16 → 0.11.17

package/index.mjs

@@ -1,20 +1,13 @@
 import { configKeys } from '@into-mini/auto-entries-plugin/dist/helper/utils.mjs';
-import { transformJS } from './transform.mjs';
+import { applyCopy } from './transform.mjs';
+import { applyLoaders } from './loader.mjs';
 
-export function apply({ config: { copy, mini: { type } = {} } }) {
+export function apply({
+  config: { copy, mini: { type, tagMatcher, preserveTap } = {} },
+}) {
   return async (chain) => {
     if (chain.plugins.has('copy')) {
-      const transform = transformJS(chain);
-
-      chain
-        .plugin('copy')
-        .tap(([options]) => [
-          Array.isArray(copy)
-            ? options.map((item) => ({ transform, ...item }))
-            : typeof copy === 'object'
-              ? { transform, ...options }
-              : options,
-        ]);
+      applyCopy(chain, { copy });
     }
 
     chain.output
@@ -87,9 +80,7 @@ export function apply({ config: { copy, mini: { type } = {} } }) {
 
     chain.experiments.layers(true);
 
-    const rule = chain.module.rule('babel');
-
-    // rule.test(rule.get('test').add('vue'));
+    applyLoaders(chain, { tagMatcher, preserveTap });
 
     const { SfcSplitPlugin } = await import('@into-mini/sfc-split-plugin');
 
@@ -100,8 +91,6 @@ export function apply({ config: { copy, mini: { type } = {} } }) {
 
     chain.plugin('auto-entries').use(AutoEntriesPlugin, [{ type }]);
 
-    const presets = ['vendor', 'common', 'shim', 'vue-mini', 'vue', 'react'];
-
     const configs = Object.values(configKeys);
 
     chain.module.rule('yaml').issuerLayer({ not: configs });
@@ -110,6 +99,8 @@ export function apply({ config: { copy, mini: { type } = {} } }) {
     chain.optimization.avoidEntryIife(true);
 
     if (chain.optimization.splitChunks.get('cacheGroups')) {
+      const presets = ['vendor', 'common', 'shim', 'vue-mini', 'vue', 'react'];
+
       chain.optimization.splitChunks.cacheGroups(
         Object.fromEntries(
           Object.entries(chain.optimization.splitChunks.get('cacheGroups')).map(
@@ -139,6 +130,12 @@ export const schema = {
       type: {
         enum: ['miniprogram', 'plugin'],
       },
+      tagMatcher: {
+        instanceof: 'Function',
+      },
+      preserveTap: {
+        instanceof: 'Function',
+      },
     },
   },
   target: {

package/loader.mjs

@@ -0,0 +1,92 @@
+import extToRegexp from 'ext-to-regexp';
+
+export function applyLoaders(chain) {
+  const babelRule = chain.module.rule('babel');
+
+  const vueRegexp = extToRegexp({ extname: ['vue'] });
+
+  const vueRule = chain.module.rule('vue-file').test(vueRegexp);
+
+  vueRule
+    .rule('extract-vue-javascript')
+    .test(vueRegexp)
+    .issuer(vueRegexp)
+    .resourceQuery(/type=script/)
+    .type('javascript/esm')
+    .use('babel-loader')
+    .merge(babelRule.use('babel-loader').entries())
+    .end()
+    .use('sfc-split-loader')
+    .loader('@into-mini/sfc-split-loader/dist/index.mjs');
+
+  vueRule
+    .rule('extract-vue-template')
+    .test(vueRegexp)
+    .issuer(vueRegexp)
+    .resourceQuery(/type=template/)
+    .type('asset/resource')
+    .generator.filename('[entry].wxml')
+    .end()
+    .use('wxml-loader')
+    .loader('@into-mini/wxml-loader')
+    .end()
+    .use('sfc-split-loader')
+    .loader('@into-mini/sfc-split-loader/dist/index.mjs');
+
+  vueRule
+    .rule('extract-vue-config')
+    .test(vueRegexp)
+    .issuer(vueRegexp)
+    .resourceQuery(/type=config&lang=json/)
+    .type('asset/resource')
+    .generator.filename('[entry].json')
+    .end()
+    .use('entry-loader')
+    .loader('@into-mini/sfc-split-plugin/dist/loader/entry-loader.mjs')
+    .end()
+    .use('sfc-split-loader')
+    .loader('@into-mini/sfc-split-loader/dist/index.mjs');
+
+  const xRule = vueRule
+    .rule('extract-vue-style')
+    .test(vueRegexp)
+    .issuer(vueRegexp)
+    .resourceQuery(/type=style/);
+
+  const styleRule = chain.module.rule('style');
+
+  for (const name of ['all', 'postcss', 'sass', 'less']) {
+    xRule.rule(name).merge(styleRule.rule(name).toConfig());
+  }
+
+  xRule
+    .rule('sass')
+    .delete('test')
+    .resourceQuery(/type=style&lang=scss/);
+
+  xRule
+    .rule('less')
+    .delete('test')
+    .resourceQuery(/type=style&lang=less/);
+
+  xRule
+    .rule('extract')
+    .use('sfc-split-loader')
+    .loader('@into-mini/sfc-split-loader/dist/index.mjs');
+
+  vueRule
+    .rule('split-vue')
+    .issuer({ not: vueRegexp })
+    .resourceQuery({ not: /type=/ })
+    .type('javascript/esm')
+    .use('sfc-split-loader')
+    .loader('@into-mini/sfc-split-loader/dist/index.mjs');
+
+  // vueRule
+  //   .rule('pre-vue').issuer({ not: vueRegexp })
+  //   .resourceQuery({ not: /type=/ })
+  //   .use('sfc-split-loader')
+  // .use('sfc-split-pre')
+  // .loader('@into-mini/sfc-split-loader/dist/next.mjs')
+  // .options(options)
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@best-shot/preset-mini",
-  "version": "0.11.16",
+  "version": "0.11.17",
   "description": "A `best-shot` preset for mini program project",
   "license": "MIT",
   "author": {
@@ -29,14 +29,16 @@
   "dependencies": {
     "@into-mini/auto-entries-plugin": "^0.2.0",
     "@into-mini/sfc-split-loader": "^0.2.6",
-    "@into-mini/sfc-split-plugin": "^0.5.11",
+    "@into-mini/sfc-split-plugin": "^0.6.0",
+    "@into-mini/wxml-loader": "^0.0.0",
+    "ext-to-regexp": "^0.1.0",
     "yaml": "^2.8.2"
   },
   "peerDependencies": {
     "@babel/core": "^7.28.5",
-    "@best-shot/core": "^0.13.9",
+    "@best-shot/core": "^0.13.10",
     "@best-shot/preset-babel": "^0.18.6",
-    "@best-shot/preset-style": "^0.16.2"
+    "@best-shot/preset-style": "^0.16.3"
   },
   "engines": {
     "node": ">=22.11.0"

package/transform.mjs

@@ -1,13 +1,14 @@
 import babel from '@babel/core';
 
-export function transformJS(chain) {
-  return (input, absoluteFrom) => {
-    const { targets } = chain.module
-      .rule('babel')
-      .use('babel-loader')
-      .get('options');
-    const minimize = chain.optimization.get('minimize');
+export function applyCopy(chain, { copy }) {
+  const { targets } = chain.module
+    .rule('babel')
+    .use('babel-loader')
+    .get('options');
 
+  const minimize = chain.optimization.get('minimize');
+
+  const transform = (input, absoluteFrom) => {
     if (!absoluteFrom.endsWith('.js') || absoluteFrom.endsWith('.mjs')) {
       return input;
     }
@@ -33,4 +34,14 @@ export function transformJS(chain) {
       ';',
     );
   };
+
+  chain
+    .plugin('copy')
+    .tap(([options]) => [
+      Array.isArray(copy)
+        ? options.map((item) => ({ transform, ...item }))
+        : typeof copy === 'object'
+          ? { transform, ...options }
+          : options,
+    ]);
 }