shakapacker 6.1.1 → 6.2.0

data/test/test_app/config/webpacker_manifest_path.yml

@@ -0,0 +1,80 @@
+# Note: You must restart bin/webpack-dev-server for changes to take effect
+
+default: &default
+  source_path: app/packs
+  source_entry_path: entrypoints
+  public_root_path: public
+  public_output_path: packs
+  cache_path: tmp/webpacker
+  webpack_compile_output: false
+
+  # Location for manifest.json, defaults to {public_output_path}/manifest.json if unset
+  manifest_path: app/packs/manifest.json
+
+  # Additional paths webpack should look up modules
+  # ['app/assets', 'engine/foo/app/assets']
+  additional_paths:
+    - app/assets
+    - /etc/yarn
+    - some.config.js
+    - app/elm
+
+  # Reload manifest.json on all requests so we reload latest compiled packs
+  cache_manifest: false
+
+  static_assets_extensions:
+    - .jpg
+    - .jpeg
+    - .png
+    - .gif
+    - .tiff
+    - .ico
+    - .svg
+
+  extensions:
+    - .mjs
+    - .js
+
+development:
+  <<: *default
+  compile: true
+
+  # Reference: https://webpack.js.org/configuration/dev-server/
+  dev_server:
+    https: false
+    host: localhost
+    port: 3035
+    public: localhost:3035
+    hmr: false
+    overlay: true
+    disable_host_check: true
+    use_local_ip: false
+    pretty: false
+
+test:
+  <<: *default
+  compile: true
+
+  # Compile test packs to a separate directory
+  public_output_path: packs-test
+
+production:
+  <<: *default
+
+  # Production depends on precompilation of packs prior to booting for performance.
+  compile: false
+
+  # Cache manifest.json for performance
+  cache_manifest: true
+
+staging:
+  <<: *default
+
+  # Production depends on precompilation of packs prior to booting for performance.
+  compile: false
+
+  # Cache manifest.json for performance
+  cache_manifest: true
+
+  # Compile staging packs to a separate directory
+  public_output_path: packs-staging

data/test/version_checker_test.rb

@@ -0,0 +1,271 @@
+require "test_helper"
+require "webpacker/version"
+
+class NodePackageVersionDouble
+  attr_reader :raw, :major_minor_patch
+
+  def initialize(raw: nil, major_minor_patch: nil, semver_wildcard: false, skip_processing: false)
+    @raw = raw
+    @major_minor_patch = major_minor_patch
+    @semver_wildcard = semver_wildcard
+    @skip_processing = skip_processing
+  end
+
+  def semver_wildcard?
+    @semver_wildcard
+  end
+
+  def skip_processing?
+    @skip_processing
+  end
+end
+
+class VersionCheckerTest < Minitest::Test
+  def check_version(node_package_version, stub_gem_version = Webpacker::VERSION, stub_config = true)
+    version_checker = Webpacker::VersionChecker.new(node_package_version)
+    version_checker.stub :gem_version, stub_gem_version do
+      Webpacker.config.stub :ensure_consistent_versioning?, stub_config do
+        version_checker.raise_if_gem_and_node_package_versions_differ
+      end
+    end
+  end
+
+  def test_message_printed_if_consistency_check_disabled_and_mismatch
+    node_package_version = NodePackageVersionDouble.new(raw: "6.1.0", major_minor_patch: ["6", "1", "0"])
+
+    out, err = capture_io do
+      check_version(node_package_version, "6.0.0", false)
+    end
+
+    assert_match \
+      "Webpacker::VersionChecker - Version mismatch detected",
+      err
+  end
+
+  def test_message_printed_if_consistency_check_disabled_and_semver
+    node_package_version = NodePackageVersionDouble.new(raw: "^6.1.0", major_minor_patch: ["6", "1", "0"], semver_wildcard: true)
+
+    out, err = capture_io do
+      check_version(node_package_version, "6.1.0", false)
+    end
+
+    assert_match \
+      "Webpacker::VersionChecker - Semver wildcard detected",
+      err
+  end
+
+  def test_raise_on_different_major_version
+    node_package_version = NodePackageVersionDouble.new(raw: "6.1.0", major_minor_patch: ["6", "1", "0"])
+
+    error = assert_raises do
+      check_version(node_package_version, "7.0.0")
+    end
+
+    assert_match \
+      "**ERROR** Webpacker: Webpacker gem and node package versions do not match",
+      error.message
+  end
+
+  def test_raise_on_different_minor_version
+    node_package_version = NodePackageVersionDouble.new(raw: "6.1.0", major_minor_patch: ["6", "1", "0"])
+
+    error = assert_raises do
+      check_version(node_package_version, "6.2.0")
+    end
+
+    assert_match \
+      "**ERROR** Webpacker: Webpacker gem and node package versions do not match",
+      error.message
+  end
+
+  def test_raise_on_different_patch_version
+    node_package_version = NodePackageVersionDouble.new(raw: "6.1.1", major_minor_patch: ["6", "1", "1"])
+
+    error = assert_raises do
+      check_version(node_package_version, "6.1.2")
+    end
+
+    assert_match \
+      "**ERROR** Webpacker: Webpacker gem and node package versions do not match",
+      error.message
+  end
+
+  def test_raise_on_semver_wildcard
+    node_package_version = NodePackageVersionDouble.new(raw: "^6.0.0", major_minor_patch: ["6", "0", "0"], semver_wildcard: true)
+
+    error = assert_raises do
+      check_version(node_package_version, "6.0.0")
+    end
+
+    assert_match \
+      "**ERROR** Webpacker: Your node package version for shakapacker contains a ^ or ~",
+      error.message
+  end
+
+  def test_no_raise_on_matching_versions
+    node_package_version = NodePackageVersionDouble.new(raw: "6.0.0", major_minor_patch: ["6", "0", "0"])
+
+    assert_silent do
+      check_version(node_package_version, "6.0.0")
+    end
+  end
+
+  def test_no_raise_on_matching_versions_beta
+    node_package_version = NodePackageVersionDouble.new(raw: "6.0.0-beta.1", major_minor_patch: ["6", "0", "0"])
+
+    assert_silent do
+      check_version(node_package_version, "6.0.0.beta.1")
+    end
+  end
+
+  def test_no_raise_on_no_package
+    node_package_version = NodePackageVersionDouble.new(raw: nil, skip_processing: true)
+
+    assert_silent do
+      check_version(node_package_version, "6.0.0")
+    end
+  end
+
+  def test_no_raise_on_skipped_path
+    node_package_version = NodePackageVersionDouble.new(raw: "../shakapacker", skip_processing: true)
+
+    assert_silent do
+      check_version(node_package_version, "6.0.0")
+    end
+  end
+end
+
+class NodePackageVersionTest < Minitest::Test
+  def node_package_version(fixture_version: "normal")
+    file_path = File.expand_path("fixtures/#{fixture_version}_package.json", __dir__)
+    Webpacker::VersionChecker::NodePackageVersion.new(file_path)
+  end
+
+  def test_normal_package_raw
+    assert_equal "6.0.0", node_package_version.raw
+  end
+
+  def test_normal_package_major_minor_patch
+    assert_equal ["6", "0", "0"], node_package_version.major_minor_patch
+  end
+
+  def test_normal_package_skip_processing
+    assert_equal false, node_package_version.skip_processing?
+  end
+
+  def test_normal_package_semver_wildcard
+    assert_equal false, node_package_version.semver_wildcard?
+  end
+
+  def test_beta_package_raw
+    assert_equal "6.0.0-beta.1", node_package_version(fixture_version: "beta").raw
+  end
+
+  def test_beta_package_major_minor_patch
+    assert_equal ["6", "0", "0"], node_package_version(fixture_version: "beta").major_minor_patch
+  end
+
+  def test_beta_package_skip_processing
+    assert_equal false, node_package_version(fixture_version: "beta").skip_processing?
+  end
+
+  def test_beta_package_semver_wildcard
+    assert_equal false, node_package_version(fixture_version: "beta").semver_wildcard?
+  end
+
+  def test_semver_caret_package_raw
+    assert_equal "^6.0.0", node_package_version(fixture_version: "semver_caret").raw
+  end
+
+  def test_semver_caret_package_major_minor_patch
+    assert_equal ["6", "0", "0"], node_package_version(fixture_version: "semver_caret").major_minor_patch
+  end
+
+  def test_semver_caret_package_skip_processing
+    assert_equal false, node_package_version(fixture_version: "semver_caret").skip_processing?
+  end
+
+  def test_semver_caret_package_semver_wildcard
+    assert_equal true, node_package_version(fixture_version: "semver_caret").semver_wildcard?
+  end
+
+  def test_semver_tilde_package_raw
+    assert_equal "~6.0.0", node_package_version(fixture_version: "semver_tilde").raw
+  end
+
+  def test_semver_tilde_package_major_minor_patch
+    assert_equal ["6", "0", "0"], node_package_version(fixture_version: "semver_tilde").major_minor_patch
+  end
+
+  def test_semver_tilde_package_skip_processing
+    assert_equal false, node_package_version(fixture_version: "semver_tilde").skip_processing?
+  end
+
+  def test_semver_tilde_package_semver_wildcard
+    assert_equal true, node_package_version(fixture_version: "semver_tilde").semver_wildcard?
+  end
+
+  def test_relative_path_package_raw
+    assert_equal "../shakapacker", node_package_version(fixture_version: "relative_path").raw
+  end
+
+  def test_relative_path_package_major_minor_patch
+    assert_nil node_package_version(fixture_version: "relative_path").major_minor_patch
+  end
+
+  def test_relative_path_package_skip_processing
+    assert_equal true, node_package_version(fixture_version: "relative_path").skip_processing?
+  end
+
+  def test_relative_path_package_semver_wildcard
+    assert_equal false, node_package_version(fixture_version: "relative_path").semver_wildcard?
+  end
+
+  def test_git_url_package_raw
+    assert_equal "git://github.com/shakapacker/shakapacker.git", node_package_version(fixture_version: "git_url").raw
+  end
+
+  def test_git_url_package_major_minor_patch
+    assert_nil node_package_version(fixture_version: "git_url").major_minor_patch
+  end
+
+  def test_git_url_package_skip_processing
+    assert_equal true, node_package_version(fixture_version: "git_url").skip_processing?
+  end
+
+  def test_git_url_package_semver_wildcard
+    assert_equal false, node_package_version(fixture_version: "git_url").semver_wildcard?
+  end
+
+  def test_github_url_package_raw
+    assert_equal "shakapacker/shakapacker#feature/branch", node_package_version(fixture_version: "github_url").raw
+  end
+
+  def test_github_url_package_major_minor_patch
+    assert_nil node_package_version(fixture_version: "github_url").major_minor_patch
+  end
+
+  def test_github_url_package_skip_processing
+    assert_equal true, node_package_version(fixture_version: "github_url").skip_processing?
+  end
+
+  def test_github_url_package_semver_wildcard
+    assert_equal false, node_package_version(fixture_version: "github_url").semver_wildcard?
+  end
+
+  def test_without_package_raw
+    assert_equal "", node_package_version(fixture_version: "without").raw
+  end
+
+  def test_without_package_major_minor_patch
+    assert_nil node_package_version(fixture_version: "without").major_minor_patch
+  end
+
+  def test_without_package_skip_processing
+    assert_equal true, node_package_version(fixture_version: "without").skip_processing?
+  end
+
+  def test_without_package_semver_wildcard
+    assert_equal false, node_package_version(fixture_version: "without").semver_wildcard?
+  end
+end

data/test/webpacker_test.rb

@@ -23,11 +23,26 @@ class WebpackerTest < Webpacker::Test
     def dev_server.https?; true; end
     def dev_server.hmr?; true; end
     def dev_server.running?; true; end
+    def dev_server.inline_css?; true; end
     Webpacker.instance.stub(:dev_server, dev_server) do
       assert Webpacker.inlining_css?
     end
   end
 
+  def test_explicit_no_inline_css_with_hmr
+    dev_server = Webpacker::DevServer.new({})
+    def dev_server.host; "localhost"; end
+    def dev_server.port; "3035"; end
+    def dev_server.pretty?; false; end
+    def dev_server.https?; true; end
+    def dev_server.hmr?; true; end
+    def dev_server.running?; true; end
+    def dev_server.inline_css?; false; end
+    Webpacker.instance.stub(:dev_server, dev_server) do
+      assert !Webpacker.inlining_css?
+    end
+  end
+
   def test_app_autoload_paths_cleanup
     assert_empty $test_app_autoload_paths_in_initializer
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shakapacker
 version: !ruby/object:Gem::Version
-  version: 6.1.1
+  version: 6.2.0
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-07 00:00:00.000000000 Z
+date: 2022-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -142,6 +142,7 @@ files:
 - docs/customizing_babel_config.md
 - docs/deployment.md
 - docs/developing_webpacker.md
+- docs/style_loader_vs_mini_css.md
 - docs/troubleshooting.md
 - docs/using_esbuild_loader.md
 - docs/using_swc_loader.md
@@ -191,6 +192,7 @@ files:
 - lib/webpacker/railtie.rb
 - lib/webpacker/runner.rb
 - lib/webpacker/version.rb
+- lib/webpacker/version_checker.rb
 - lib/webpacker/webpack_runner.rb
 - package.json
 - package/__tests__/config.js
@@ -214,6 +216,9 @@ files:
 - package/esbuild/index.js
 - package/index.js
 - package/inliningCss.js
+- package/rules/__tests__/file.js
+- package/rules/__tests__/index.js
+- package/rules/__tests__/raw.js
 - package/rules/babel.js
 - package/rules/coffee.js
 - package/rules/css.js
@@ -237,6 +242,14 @@ files:
 - test/dev_server_test.rb
 - test/engine_rake_tasks_test.rb
 - test/env_test.rb
+- test/fixtures/beta_package.json
+- test/fixtures/git_url_package.json
+- test/fixtures/github_url_package.json
+- test/fixtures/normal_package.json
+- test/fixtures/relative_path_package.json
+- test/fixtures/semver_caret_package.json
+- test/fixtures/semver_tilde_package.json
+- test/fixtures/without_package.json
 - test/helper_test.rb
 - test/manifest_test.rb
 - test/mounted_app/Rakefile
@@ -261,6 +274,7 @@ files:
 - test/test_app/config/initializers/inspect_autoload_paths.rb
 - test/test_app/config/webpack/webpack.config.js
 - test/test_app/config/webpacker.yml
+- test/test_app/config/webpacker_manifest_path.yml
 - test/test_app/config/webpacker_other_location.yml
 - test/test_app/config/webpacker_public_root.yml
 - test/test_app/package.json
@@ -268,6 +282,7 @@ files:
 - test/test_app/some.config.js
 - test/test_app/yarn.lock
 - test/test_helper.rb
+- test/version_checker_test.rb
 - test/webpack_runner_test.rb
 - test/webpacker_test.rb
 - webpacker.gemspec
@@ -276,7 +291,7 @@ homepage: https://github.com/shakacode/shakapacker
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/shakacode/shakapacker/tree/v6.1.1
+  source_code_uri: https://github.com/shakacode/shakapacker/tree/v6.2.0
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -304,6 +319,14 @@ test_files:
 - test/dev_server_test.rb
 - test/engine_rake_tasks_test.rb
 - test/env_test.rb
+- test/fixtures/beta_package.json
+- test/fixtures/git_url_package.json
+- test/fixtures/github_url_package.json
+- test/fixtures/normal_package.json
+- test/fixtures/relative_path_package.json
+- test/fixtures/semver_caret_package.json
+- test/fixtures/semver_tilde_package.json
+- test/fixtures/without_package.json
 - test/helper_test.rb
 - test/manifest_test.rb
 - test/mounted_app/Rakefile
@@ -328,6 +351,7 @@ test_files:
 - test/test_app/config/initializers/inspect_autoload_paths.rb
 - test/test_app/config/webpack/webpack.config.js
 - test/test_app/config/webpacker.yml
+- test/test_app/config/webpacker_manifest_path.yml
 - test/test_app/config/webpacker_other_location.yml
 - test/test_app/config/webpacker_public_root.yml
 - test/test_app/package.json
@@ -335,5 +359,6 @@ test_files:
 - test/test_app/some.config.js
 - test/test_app/yarn.lock
 - test/test_helper.rb
+- test/version_checker_test.rb
 - test/webpack_runner_test.rb
 - test/webpacker_test.rb