nanoc-webpack.rb 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c27b1415f331e970ecdd99955b365c8e543b8682d70b69a1aeac3f9951658146
-  data.tar.gz: 2d5ef75a0ed5333fdc6e6bbef45120ac9812434e8dc433d9defc198d5861622a
+  metadata.gz: 49f655a8bfc0aa523822ddc3b7ba6282e2cd76c93184a349fe1dbb08c24d41d3
+  data.tar.gz: 470d7218dc0946f4889a441a57ffccb1433a4ae253f92bf05eb5edfb99436ca1
 SHA512:
-  metadata.gz: 7335426a9d835917faaf0217ba85f2e8525d02db9bb2c30f835d163eb3f24e1bd4371ccc648c7d478ed8fb78290fdbdf61b20a11d3db49b47d885d05aa6c51d0
-  data.tar.gz: 940e00ae66c3b742efdf159987bc0e2b69ffc049ad447951d4c791d067bd80a141309e5a3dd24ca6ccc30d06ead28bc5ddd437a7d5caba4e55743623b267bc4c
+  metadata.gz: fc39909276721fbb75670fdb25f4ed15ac3707de64fc64ee95e377c86047c04d771627cf63b20b52194a1bfdb9c82971f9c6ecc838057037e166361077057256
+  data.tar.gz: 9c7153f00b889e798550ab037acbb2548f87d084e2ffd69ff132c48110e68a6fcc973fd1d4d21a5093a743fe959532a42fa6a4dfe6536c99f058648ed85bc85f

data/README.md

@@ -67,7 +67,7 @@ returns the default command-line options forwarded to webpack:
 # Rules
 require "nanoc-webpack"
 compile "/js/main/App.tsx" do
-  filter(:webpack, argv: ["--node-env", "production"])
+  filter(:webpack, argv: ["--config", "webpack.production.js"])
   write("/js/main/app.js")
 end
 ```

data/lib/nanoc/webpack/filter.rb

@@ -15,12 +15,12 @@ module Nanoc::Webpack
 
     ##
     # @example
-    #   Nanoc::Webpack.default_argv.replace ["--cache-type", "memory"]
+    #   Nanoc::Webpack.default_argv.concat ["--cache-type", "filesystem"]
     #
     # @return [Array<String>]
     #  The default command-line options forwarded to webpack.
     def self.default_argv
-      @default_argv ||= ["--cache-type", "filesystem"]
+      @default_argv ||= []
     end
 
     ##
@@ -33,15 +33,17 @@ module Nanoc::Webpack
     # @return [void]
     def run(content, options = {})
       options = Ryo.from(options)
-      path    = temporary_file(content).path
+      path = temporary_file(content).path
       depend_on dependable(paths: options.depend_on, reject: options.reject)
                   .map { items[_1] }
+      argv = [*(options.argv || []), *default_argv]
+      scan_argv(argv)
       spawn "node",
             ["./node_modules/webpack/bin/webpack.js",
+             *argv,
              "--entry", File.join(Dir.getwd, item.attributes[:content_filename]),
              "--output-path", File.dirname(path),
-             "--output-filename", File.basename(path),
-             *default_argv, *(options.argv || [])],
+             "--output-filename", File.basename(path)],
             log: File.join(tmpdir, "webpack.log")
       File.read(path)
     ensure
@@ -64,5 +66,23 @@ module Nanoc::Webpack
     def tmpdir
       File.join(Dir.getwd, "tmp", "webpack")
     end
+
+    def scan_argv(argv)
+      options = argv.filter_map { _1.start_with?("-") ? _1 : nil }
+      builtins = %w[--entry --output-path --output-filename]
+      options
+        .map { |option| [option, options.count { _1 == option }] }
+        .each do |option, count|
+        if builtins.include?(option)
+          abort log("[fatal] '#{option}' is a builtin option that can't be replaced")
+        elsif count > 1
+          warn log("[warn] '#{option}' appears in argv more than once")
+        end
+      end
+    end
+
+    def log(message)
+      "[nanoc-webpack.rb] #{message}"
+    end
   end
 end

data/lib/nanoc/webpack/version.rb

@@ -2,6 +2,6 @@
 
 module Nanoc
   module Webpack
-    VERSION = "0.8.1"
+    VERSION = "0.9.0"
   end
 end

data/spec/filter_spec.rb

@@ -125,28 +125,34 @@ RSpec.describe Nanoc::Webpack::Filter do
   context "when nodejs is executed" do
     let(:cmdline) do
       [
-        "node",
-        "./node_modules/webpack/bin/webpack.js",
         "--entry", File.join(Dir.getwd, "test.ts"),
         "--output-path", instance_of(String),
         "--output-filename", instance_of(String),
-        "--cache-type", "filesystem"
       ]
     end
 
     context "with default arguments" do
       it "executes nodejs" do
-        expect(Kernel).to receive(:spawn).with(*cmdline, instance_of(Hash))
+        expect(Kernel).to receive(:spawn).with(
+                            "node",
+                            "./node_modules/webpack/bin/webpack.js",
+                            *cmdline,
+                            instance_of(Hash)
+                          )
         expect(Process).to receive(:wait)
         filter.run(item)
       end
     end
 
     context "with --no-cache" do
-      let(:cmdline) { super().concat(["--no-cache"]) }
-
       it "executes nodejs with an argument" do
-        expect(Kernel).to receive(:spawn).with(*cmdline, instance_of(Hash))
+        expect(Kernel).to receive(:spawn).with(
+                            "node",
+                            "./node_modules/webpack/bin/webpack.js",
+                            "--no-cache",
+                            *cmdline,
+                            instance_of(Hash)
+                          )
         expect(Process).to receive(:wait)
         filter.run(item, argv: ["--no-cache"])
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-webpack.rb
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - '0x1eef'
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-30 00:00:00.000000000 Z
+date: 2024-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ryo.rb
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: nanoc-webpack.rb integrates webpack into nanoc.