@best-shot/preset-web 0.14.8 → 0.14.10

package/index.mjs

@@ -5,7 +5,7 @@ import { setOutputName } from './lib/apply-set-output-name.mjs';
 import { splitChunks } from './lib/apply-split-chunks.mjs';
 
 function addHash(filename) {
-  return filename.includes('[contenthash')
+  return filename.includes('contenthash')
     ? filename
     : suffix(filename, '.[contenthash]');
 }
@@ -14,16 +14,14 @@ function addMin(filename) {
   return suffix(filename, '.min');
 }
 
-export function apply({ config: { html, vendors, optimization = {} } }) {
+export function apply({ cwd, config: { html, vendors, optimization = {} } }) {
   return async (chain) => {
     const mode = chain.get('mode');
     const minimize = chain.optimization.get('minimize');
     const serve = chain.devServer.entries() !== undefined;
     const hot = (serve && chain.devServer.get('hot')) || false;
 
-    chain.devtool(
-      mode === 'production' ? false : serve ? 'eval-source-map' : 'source-map',
-    );
+    chain.devtool(mode === 'production' ? false : 'source-map');
 
     chain
       .when(minimize, setOutputName({ style: addMin, script: addMin }))
@@ -41,7 +39,7 @@ export function apply({ config: { html, vendors, optimization = {} } }) {
       await splitChunks({ vendors })(chain);
     }
 
-    await setHtml({ html })(chain);
+    await setHtml({ cwd, html })(chain);
 
     if (mode === 'production') {
       const {

package/lib/apply-set-html.mjs

@@ -22,20 +22,16 @@ const darkTag = {
   `,
 };
 
-export function setHtml({ html = {} }) {
+export function setHtml({ cwd, html = {} }) {
   return async (chain) => {
     const mode = chain.get('mode');
     const watch = chain.get('watch');
-    const context = chain.get('context');
     const minimize = chain.optimization.get('minimize');
 
     const { default: HtmlWebpackPlugin } = await import('html-webpack-plugin');
 
     const defaultTemplate = slash(
-      relative(
-        context,
-        fileURLToPath(new URL('template.html', import.meta.url)),
-      ),
+      relative(cwd, fileURLToPath(new URL('template.html', import.meta.url))),
     );
 
     const isModule = chain.output.get('module');
@@ -112,14 +108,7 @@ export function setHtml({ html = {} }) {
       .rule('micro-tpl')
       .test(extToRegexp({ extname: ['html', 'htm'] }))
       .use('micro-tpl-loader')
-      .loader('micro-tpl-loader');
-
-    chain.resolveLoader.modules.prepend(
-      relative(
-        context,
-        fileURLToPath(new URL('../node_modules', import.meta.url)),
-      ),
-    );
+      .loader(fileURLToPath(import.meta.resolve('micro-tpl-loader')));
 
     if (!watch && chain.module.rules.has('babel')) {
       chain.module

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@best-shot/preset-web",
-  "version": "0.14.8",
+  "version": "0.14.10",
   "description": "A `best-shot` preset for web project",
   "license": "MIT",
   "author": {
@@ -43,11 +43,11 @@
     "webpack-subresource-integrity": "5.2.0-rc.1"
   },
   "peerDependencies": {
-    "webpack": "^5.91.0",
-    "@best-shot/core": "^0.9.10"
+    "webpack": "^5.92.1",
+    "@best-shot/core": "~0.9.15"
   },
   "engines": {
-    "node": ">=20.0.0 || ^18.12.0"
+    "node": ">=20.6.0 || ^18.19.0"
   },
   "publishConfig": {
     "access": "public",