minista 1.1.0 → 1.2.0

package/README.md

@@ -78,12 +78,12 @@ src
 import { render } from "minista" // Required!
 
 const PageHome = () => {
-  return render( // Required!
+  return (
     <h1>Hello</h1>
   )
 }
 
-export default PageHome
+export default render(<PageHome />) // Required!
 ```
 
 ## Commands
@@ -119,7 +119,7 @@ $ minista build
 import { render, Comment } from "minista"
 
 const PageHome = () => {
-  return render(
+  return (
     <>
       <Comment text="Comment Test" />
       <h1>Hello</h1>
@@ -127,7 +127,7 @@ const PageHome = () => {
   )
 }
 
-export default PageHome
+export default render(<PageHome />)
 ```
 
 ```html
@@ -158,9 +158,6 @@ export default PageHome
 const MiniCssExtractPlugin = require("mini-css-extract-plugin")
 const CopyPlugin = require("copy-webpack-plugin")
 
-// Example of dev mode
-const isDev = process.env.NODE_ENV !== "production"
-
 const webpackConfig = {
   // Merge
   devServer: {
@@ -168,6 +165,22 @@ const webpackConfig = {
   },
   // Replace
   entry: { custom: "./src/assets/index.js" },
+  module: {
+    rules: [
+      // Merge: loader options
+      {
+        test: /\.css$/,
+        use: [
+          {
+            loader: "css-loader",
+            options: {
+              url: false,
+            },
+          },
+        ],
+      },
+    ],
+  },
   plugins: [
     // Replace
     new MiniCssExtractPlugin({
@@ -178,10 +191,7 @@ const webpackConfig = {
       patterns: [{ from: "./static", to: "./", noErrorOnMissing: true }],
     }),
   ],
-
-  // All optimization is replaced.
   optimization: {
-    minimize: !isDev,
     minimizer: [
       /* Replace plugins */
     ],

package/cli.js

@@ -3,7 +3,7 @@ const fs = require("fs")
 const path = require("path")
 const glob = require("glob")
 const webpack = require("webpack")
-const { mergeWithCustomize, customizeObject, unique } = require("webpack-merge")
+const { mergeWithRules, unique } = require("webpack-merge")
 const webpackDevServer = require("webpack-dev-server")
 const beautify = require("js-beautify")
 
@@ -20,17 +20,30 @@ function getUserWebpackConfig() {
 }
 
 function getMergedWebpackConfig({ config, userConfig }) {
-  const mergedConfig = mergeWithCustomize({
-    customizeObject: customizeObject({
+  const mergedConfig = mergeWithRules(
+    {
       entry: "replace",
-      optimization: "replace",
-    }),
-    customizeArray: unique(
-      "plugins",
-      ["MiniCssExtractPlugin", "CopyPlugin"],
-      (plugin) => plugin.constructor && plugin.constructor.name
-    ),
-  })(config, userConfig)
+      module: {
+        rules: {
+          test: "match",
+          use: {
+            loader: "match",
+            options: "merge",
+          },
+        },
+      },
+      optimization: {
+        minimizer: "replace",
+      },
+    },
+    {
+      customizeArray: unique(
+        "plugins",
+        ["MiniCssExtractPlugin", "CopyPlugin"],
+        (plugin) => plugin.constructor && plugin.constructor.name
+      ),
+    }
+  )(config, userConfig)
   const filterdPlugins = filterWebpackPlugins({
     plugins: mergedConfig.plugins,
   })

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "minista",
   "description": "Mini static site generator that can be written in React (JSX) for web coding",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "bin": {
     "minista": "cli.js"
   },

package/webpack.config.js

@@ -115,7 +115,7 @@ const webpackConfig = {
     path: path.resolve("dist"),
     publicPath: "/",
     filename: "assets/[name].js",
-    assetModuleFilename: "assets/images/[name].[ext]",
+    assetModuleFilename: "assets/images/[name][ext]",
   },
   module: {
     rules: [
@@ -195,7 +195,7 @@ const webpackConfig = {
         test: /\.(woff2?|eot|ttf|otf)$/i,
         type: "asset/resource",
         generator: {
-          filename: "assets/fonts/[name].[ext]",
+          filename: "assets/fonts/[name][ext]",
         },
       },
       {
@@ -229,7 +229,12 @@ const webpackConfig = {
     }),
     new CopyPlugin({
       patterns: [
-        { from: "./public", to: path.resolve("dist"), noErrorOnMissing: true },
+        {
+          from: "./public",
+          to: path.resolve("dist"),
+          noErrorOnMissing: true,
+          info: { minimized: true },
+        },
       ],
     }),
   ],