jetpacker 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb8a3686b67bb46ee7205571d7004c0dcac165b1c130ec650f6a910896da06e7
-  data.tar.gz: '092db6937cd4464fa2ea16a1e25c3809ae13aed46cffbcbd0825dad413e50067'
+  metadata.gz: 3ef376547e26a82a74b3db3f483c830b57a3b89cdf9fa378704ae4251950bdf9
+  data.tar.gz: 2440c2040096006e6b5e23a2a3f9bb0162091cfb2fb564f24024cdd33a0e9b82
 SHA512:
-  metadata.gz: 48f3c698895bf3f3ac956ac47ec7683183b512297707c2494b909eb1a259e2e9c44c3f0d98a73f1e5a373dce7674f6ba2acc3f67cecf73eab60bafb59705672c
-  data.tar.gz: d7353bd7fe82d3863f58cd8d810a97aef9084054e2bab5e26a59206117026dc2ebd778ea79ce752c87892cc26a4a55c6cc4ac3c70963c30cbdd91ca165a32700
+  metadata.gz: 690b360e1613dfcb6d3365384339b58d64681c28cc0681b59c6de9366a5b2660504a9d3da12dd72841f947f3b6fd0e9d3b6b8bf1d00ce4a2c5a09948b9b8ece9
+  data.tar.gz: 36120b5f42350a51bfc9e2288513326ab70db8ec9bd869d285be351ab4cdbeb48ae5504c2c24b5a7b8970cd16eb74169e8b4a7a13b64e8a67320063a971e914f

data/.github/workflows/ruby.yml

@@ -29,18 +29,6 @@ jobs:
             gemfile: gemfiles/Gemfile-rails.6.0.x
         experimental: [false]
         include:
-          - ruby: head
-            os: ubuntu-latest
-            gemfile: gemfiles/Gemfile-rails.6.0.x
-            experimental: true
-          - ruby: head
-            os: ubuntu-latest
-            gemfile: gemfiles/Gemfile-rails-edge
-            experimental: true
-          - ruby: 2.6
-            os: ubuntu-latest
-            gemfile: gemfiles/Gemfile-rails-edge
-            experimental: true
           - ruby: 2.7
             os: ubuntu-latest
             gemfile: gemfiles/Gemfile-rails-edge

data/.gitignore

@@ -9,3 +9,4 @@ yarn-error.log*
 .yarn-integrity
 /log
 gemfiles/*.lock
+Gemfile.lock

data/.rubocop.yml

@@ -1,6 +1,6 @@
 require: rubocop-performance
 AllCops:
-  TargetRubyVersion: 2.2
+  TargetRubyVersion: 2.4
   # RuboCop has a bunch of cops enabled by default. This setting tells RuboCop
   # to ignore them, so only the ones explicitly set in this file are enabled.
   DisabledByDefault: true
@@ -13,11 +13,6 @@ AllCops:
 Style/AndOr:
   Enabled: true
 
-# Do not use braces for hash literals when they are the last argument of a
-# method call.
-Style/BracesAroundHashParameters:
-  Enabled: true
-
 # Align `when` with `case`.
 Layout/CaseIndentation:
   Enabled: true
@@ -50,7 +45,11 @@ Style/HashSyntax:
 # extra level of indentation.
 Layout/IndentationConsistency:
   Enabled: true
-  EnforcedStyle: rails
+  EnforcedStyle: indented_internal_methods
+
+# Detect hard tabs, no hard tabs.
+Layout/IndentationStyle:
+  Enabled: true
 
 # Two spaces, no tabs (for indentation).
 Layout/IndentationWidth:
@@ -98,12 +97,8 @@ Style/StringLiterals:
   Enabled: true
   EnforcedStyle: double_quotes
 
-# Detect hard tabs, no hard tabs.
-Layout/Tab:
-  Enabled: true
-
 # Blank lines should not have any spaces.
-Layout/TrailingBlankLines:
+Layout/TrailingEmptyLines:
   Enabled: true
 
 # No trailing whitespace.
@@ -111,7 +106,7 @@ Layout/TrailingWhitespace:
   Enabled: true
 
 # Use quotes for string literals when they are enough.
-Style/UnneededPercentQ:
+Style/RedundantPercentQ:
   Enabled: true
 
 # Align `end` with the matching keyword or starting expression except for
@@ -123,3 +118,108 @@ Layout/EndAlignment:
 # Use my_method(my_arg) not my_method( my_arg ) or my_method my_arg.
 Lint/RequireParentheses:
   Enabled: true
+
+# Use `bind_call(obj, args, ...)` instead of `bind(obj).call(args, ...)`.
+Performance/BindCall:
+  Enabled: true
+
+# Use `caller(n..n)` instead of `caller`.
+Performance/Caller:
+  Enabled: true
+
+# Use `casecmp` for case comparison.
+Performance/Casecmp:
+  Enabled: true
+
+# Extract Array and Hash literals outside of loops into local variables or constants.
+Performance/CollectionLiteralInLoop:
+  Enabled: true
+
+# Prefer `sort_by(&:foo)` instead of `sort { |a, b| a.foo <=> b.foo }`.
+Performance/CompareWithBlock:
+  Enabled: true
+
+# Use `count` instead of `{select,find_all,filter,reject}...{size,count,length}`.
+Performance/Count:
+  Enabled: true
+
+# Use `delete_prefix` instead of `gsub`.
+Performance/DeletePrefix:
+  Enabled: true
+
+# Use `delete_suffix` instead of `gsub`.
+Performance/DeleteSuffix:
+  Enabled: true
+
+# Use `detect` instead of `select.first`, `find_all.first`, `filter.first`, `select.last`, `find_all.last`, and `filter.last`.
+Performance/Detect:
+  Enabled: true
+
+# Use `str.{start,end}_with?(x, ..., y, ...)` instead of `str.{start,end}_with?(x, ...) || str.{start,end}_with?(y, ...)`.
+Performance/DoubleStartEndWith:
+  Enabled: true
+
+# Use `end_with?` instead of a regex match anchored to the end of a string.
+Performance/EndWith:
+  Enabled: true
+
+# Do not compute the size of statically sized objects except in constants.
+Performance/FixedSize:
+  Enabled: true
+
+# Use `Enumerable#flat_map` instead of `Enumerable#map...Array#flatten(1).
+Performance/FlatMap:
+  Enabled: true
+
+# Use `key?` or `value?` instead of `keys.include?` or `values.include?`.
+Performance/InefficientHashSearch:
+  Enabled: true
+
+# Use `Range#cover?` instead of `Range#include?` (or `Range#member?`).
+Performance/RangeInclude:
+  Enabled: true
+
+# Use `yield` instead of `block.call`.
+Performance/RedundantBlockCall:
+  Enabled: true
+
+# Use `=~` instead of `String#match` or `Regexp#match` in a context where the returned `MatchData` is not needed.
+Performance/RedundantMatch:
+  Enabled: true
+
+# Use Hash#[]=, rather than Hash#merge! with a single key-value pair.
+Performance/RedundantMerge:
+  Enabled: true
+
+# Use `match?` instead of `Regexp#match`, `String#match`, `Symbol#match`, `Regexp#===`, or `=~` when `MatchData` is not used.
+Performance/RegexpMatch:
+  Enabled: true
+
+# Use `reverse_each` instead of `reverse.each`.
+Performance/ReverseEach:
+  Enabled: true
+
+# Use `size` instead of `count` for counting the number of elements in `Array` and `Hash`.
+Performance/Size:
+  Enabled: true
+
+# Use `start_with?` instead of a regex match anchored to the beginning of a string.
+Performance/StartWith:
+  Enabled: true
+
+# Use `tr` instead of `gsub` when you are replacing the same number of characters.
+# Use `delete` instead of `gsub` when you are deleting characters.
+Performance/StringReplacement:
+  Enabled: true
+
+# Checks for .times.map calls.
+Performance/TimesMap:
+  Enabled: true
+
+# Use unary plus to get an unfrozen string literal.
+Performance/UnfreezeString:
+  Enabled: true
+
+# Use `URI::DEFAULT_PARSER` instead of `URI::Parser.new`.
+Performance/UriDefaultParser:
+  Enabled: true

data/CHANGELOG.md

@@ -2,11 +2,35 @@
 
 **Please note that Webpacker 4.1.0 has an installer bug. Please use 4.2.0 or above**
 
-## [[5.2.1]](https://github.com/rails/webpacker/compare/v5.2.0...5.2.1) - 2020-08-17
+## [[5.4.2]](https://github.com/rails/webpacker/compare/v5.4.0...v5.4.1) - 2021-08-20
+
+- Fix babel warning about private-methods in @babel/plugin-proposal-private-property-in-object as well.
+
+## [[5.4.1]](https://github.com/rails/webpacker/compare/v5.4.0...v5.4.1) - 2021-08-20
+
+- Update all dependencies within the same major version (#3120)
+
+- Fix babel warning about private-methods (#3016)
+
+## [[5.4.0]](https://github.com/rails/webpacker/compare/v5.3.0...v5.4.0) - 2021-05-18
+
+- Fix compatibility with Psych 4
+
+## [[5.3.0]](https://github.com/rails/webpacker/compare/v5.2.1...v5.3.0) - 2021-04-27
+
+- Adds experimental Yarn 2 support. Note you must manually set `nodeLinker: node-modules` in your `.yarnrc.yml`.
+
+- Keep backups, even when they're old [#2912](https://github.com/rails/webpacker/pull/2912)
+
+## [[5.2.2]](https://github.com/rails/webpacker/compare/v5.2.1...v5.2.2) - 2021-04-27
+
+- Bump deps and remove node-sass [#2997](https://github.com/rails/webpacker/pull/2997).
+
+## [[5.2.1]](https://github.com/rails/webpacker/compare/v5.2.0...v5.2.1) - 2020-08-17
 
 - Revert [#1311](https://github.com/rails/webpacker/pull/1311).
 
-## [[5.2.0]](https://github.com/rails/webpacker/compare/v5.1.1...5.2.0) - 2020-08-16
+## [[5.2.0]](https://github.com/rails/webpacker/compare/v5.1.1...v5.2.0) - 2020-08-16
 
 - Bump dependencies and fixes. See [diff](https://github.com/rails/webpacker/compare/v5.1.1...5-x-stable) for changes.
 

data/gemfiles/Gemfile-rails-edge

@@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 gemspec path: "../"
 
-gem "rails", github: "rails/rails"
+gem "rails", github: "rails/rails", branch: "main"
 gem "arel", github: "rails/arel"
 gem "rake", ">= 11.1"
 gem "rack-proxy", require: false

data/lib/install/config/babel.config.js

@@ -53,6 +53,18 @@ module.exports = function(api) {
           useBuiltIns: true
         }
       ],
+      [
+        '@babel/plugin-proposal-private-methods',
+        {
+          loose: true
+        }
+      ],
+      [
+        '@babel/plugin-proposal-private-property-in-object',
+        {
+          loose: true
+        }
+      ],
       [
         '@babel/plugin-transform-runtime',
         {

data/lib/install/examples/react/babel.config.js

@@ -62,6 +62,18 @@ module.exports = function(api) {
           useBuiltIns: true
         }
       ],
+      [
+        '@babel/plugin-proposal-private-methods',
+        {
+          loose: true
+        }
+      ],
+      [
+        '@babel/plugin-proposal-private-property-in-object',
+        {
+          loose: true
+        }
+      ],
       [
         '@babel/plugin-transform-runtime',
         {

data/lib/install/template.rb

@@ -34,7 +34,7 @@ if File.exists?(".gitignore")
   end
 end
 
-if Webpacker::VERSION =~ /^[0-9]+\.[0-9]+\.[0-9]+$/
+if Webpacker::VERSION.match?(/^[0-9]+\.[0-9]+\.[0-9]+$/)
   say "Installing all JavaScript dependencies [#{Webpacker::VERSION}]"
   run "yarn add @rails/webpacker@#{Webpacker::VERSION}"
 else
@@ -42,8 +42,16 @@ else
   run "yarn add @rails/webpacker@next"
 end
 
+package_json = File.read("#{__dir__}/../../package.json")
+webpack_version = package_json.match(/"webpack": "(.*)"/)[1]
+webpack_cli_version = package_json.match(/"webpack-cli": "(.*)"/)[1]
+
+# needed for experimental Yarn 2 support and should not harm Yarn 1
+say "Installing webpack and webpack-cli as direct dependencies"
+run "yarn add webpack@#{webpack_version} webpack-cli@#{webpack_cli_version}"
+
 say "Installing dev server for live reloading"
-run "yarn add --dev webpack-dev-server"
+run "yarn add --dev webpack-dev-server@^3"
 
 if Rails::VERSION::MAJOR == 5 && Rails::VERSION::MINOR > 1
   say "You need to allow webpack-dev-server host as allowed origin for connect-src.", :yellow

data/lib/install/typescript.rb

@@ -9,7 +9,7 @@ if File.exist?(package_json)
   package = JSON.parse(File.read(package_json))
   package["dependencies"] ||= {}
 
-  if package["dependencies"].keys.include?("react")
+  if package["dependencies"].key?("react")
     additional_packages = "@types/react @types/react-dom"
     example_source = "react"
   end

data/lib/jetpacker/version.rb

@@ -1,4 +1,4 @@
 # Separate version from Webpacker version for the jetpacker gem
 module Jetpacker
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/lib/tasks/webpacker/check_yarn.rake

@@ -9,13 +9,12 @@ namespace :webpacker do
       pkg_path = Pathname.new("#{__dir__}/../../../package.json").realpath
       yarn_range = JSON.parse(pkg_path.read)["engines"]["yarn"]
       is_valid = SemanticRange.satisfies?(yarn_version, yarn_range) rescue false
-      is_unsupported = SemanticRange.satisfies?(yarn_version, ">=2.0.0") rescue false
+      is_unsupported = SemanticRange.satisfies?(yarn_version, ">=4.0.0") rescue false
 
       unless is_valid
         $stderr.puts "Webpacker requires Yarn \"#{yarn_range}\" and you are using #{yarn_version}"
         if is_unsupported
           $stderr.puts "This version of Webpacker does not support Yarn #{yarn_version}. Please downgrade to a supported version of Yarn https://yarnpkg.com/lang/en/docs/install/"
-          $stderr.puts "For information on using Webpacker with Yarn 2.0, see https://github.com/rails/webpacker/issues/2112"
         else
           $stderr.puts "Please upgrade Yarn https://yarnpkg.com/lang/en/docs/install/"
         end

data/lib/tasks/webpacker/yarn_install.rake

@@ -5,6 +5,12 @@ namespace :webpacker do
     node_env = ENV.fetch("NODE_ENV") do
       valid_node_envs.include?(Jets.env) ? Jets.env : "production"
     end
-    system({ "NODE_ENV" => node_env }, "yarn install --no-progress --frozen-lockfile")
+    yarn_flags =
+      if `yarn --version`.start_with?("1")
+        "--no-progress --frozen-lockfile"
+      else
+        "--immutable"
+      end
+    system({ "NODE_ENV" => node_env }, "yarn install #{yarn_flags}")
   end
 end

data/lib/webpacker/commands.rb

@@ -23,7 +23,7 @@ class Webpacker::Commands
         .each_with_index
         .drop_while do |(mtime, _), index|
           max_age = [0, Time.now - Time.at(mtime)].max
-          max_age < age && index < count
+          max_age < age || index < count
         end
         .each do |(_, files), index|
           files.each do |file|

data/lib/webpacker/configuration.rb

@@ -93,8 +93,12 @@ class Webpacker::Configuration
     end
 
     def load
-      YAML.load(config_path.read)[env].deep_symbolize_keys
-
+      config = begin
+        YAML.load_file(config_path.to_s, aliases: true)
+      rescue ArgumentError
+        YAML.load_file(config_path.to_s)
+      end
+      config[env].deep_symbolize_keys
     rescue Errno::ENOENT => e
       raise "Webpacker configuration file not found #{config_path}. " \
             "Please run rails webpacker:install " \
@@ -107,8 +111,15 @@ class Webpacker::Configuration
     end
 
     def defaults
-      @defaults ||= \
-        HashWithIndifferentAccess.new(YAML.load_file(File.expand_path("../../install/config/webpacker.yml", __FILE__))[env])
+      @defaults ||= begin
+        path = File.expand_path("../../install/config/webpacker.yml", __FILE__)
+        config = begin
+          YAML.load_file(path, aliases: true)
+        rescue ArgumentError
+          YAML.load_file(path)
+        end
+        HashWithIndifferentAccess.new(config[env])
+      end
     end
 
     def globbed_path_with_extensions(path)

data/lib/webpacker/env.rb

@@ -27,7 +27,11 @@ class Webpacker::Env
 
     def available_environments
       if config_path.exist?
-        YAML.load(config_path.read).keys
+        begin
+          YAML.load_file(config_path.to_s, aliases: true)
+        rescue ArgumentError
+          YAML.load_file(config_path.to_s)
+        end
       else
         [].freeze
       end

data/lib/webpacker/version.rb

@@ -1,4 +1,4 @@
 module Webpacker
   # Change the version in package.json too, please!
-  VERSION = "5.2.1".freeze
+  VERSION = "5.4.3".freeze
 end

data/package/rules/file.js

@@ -1,4 +1,4 @@
-const { join } = require('path')
+const { join, normalize } = require('path')
 const { source_path: sourcePath, static_assets_extensions: fileExtensions } = require('../config')
 
 module.exports = {
@@ -8,7 +8,7 @@ module.exports = {
       loader: 'file-loader',
       options: {
         name(file) {
-          if (file.includes(sourcePath)) {
+          if (file.includes(normalize(sourcePath))) {
             return 'media/[path][name]-[hash].[ext]'
           }
           return 'media/[folder]/[name]-[hash:8].[ext]'

data/package/rules/sass.js

@@ -1,3 +1,5 @@
+/* eslint global-require: 0 */
+
 const getStyleRule = require('../utils/get_style_rule')
 const { additional_paths: includePaths } = require('../config')
 
@@ -6,6 +8,7 @@ module.exports = getStyleRule(/\.(scss|sass)(\.erb)?$/i, false, [
     loader: 'sass-loader',
     options: {
       sourceMap: true,
+      implementation: require('sass'),
       sassOptions: {
         includePaths
       }

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rails/webpacker",
-  "version": "5.2.1",
+  "version": "5.4.3",
   "description": "Use webpack to manage app-like JavaScript modules in Rails",
   "main": "package/index.js",
   "files": [
@@ -9,55 +9,55 @@
   ],
   "engines": {
     "node": ">=10.17.0",
-    "yarn": ">=1 <2"
+    "yarn": ">=1 <4"
   },
   "dependencies": {
-    "@babel/core": "^7.11.1",
-    "@babel/plugin-proposal-class-properties": "^7.10.4",
-    "@babel/plugin-proposal-object-rest-spread": "^7.10.1",
+    "@babel/core": "^7.15.0",
+    "@babel/plugin-proposal-class-properties": "^7.14.5",
+    "@babel/plugin-proposal-object-rest-spread": "^7.14.7",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/plugin-transform-destructuring": "^7.10.1",
-    "@babel/plugin-transform-regenerator": "^7.10.1",
-    "@babel/plugin-transform-runtime": "^7.11.0",
-    "@babel/preset-env": "^7.11.0",
-    "@babel/runtime": "^7.11.2",
-    "babel-loader": "^8.1.0",
+    "@babel/plugin-transform-destructuring": "^7.14.7",
+    "@babel/plugin-transform-regenerator": "^7.14.5",
+    "@babel/plugin-transform-runtime": "^7.15.0",
+    "@babel/preset-env": "^7.15.0",
+    "@babel/runtime": "^7.15.3",
+    "babel-loader": "^8.2.2",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-macros": "^2.8.0",
-    "case-sensitive-paths-webpack-plugin": "^2.3.0",
-    "compression-webpack-plugin": "^4.0.0",
-    "core-js": "^3.6.5",
-    "css-loader": "^3.5.3",
-    "file-loader": "^6.0.0",
-    "flatted": "^3.0.4",
-    "glob": "^7.1.6",
-    "js-yaml": "^3.14.0",
+    "case-sensitive-paths-webpack-plugin": "^2.4.0",
+    "compression-webpack-plugin": "^4.0.1",
+    "core-js": "^3.16.2",
+    "css-loader": "^3.6.0",
+    "file-loader": "^6.2.0",
+    "flatted": "^3.2.2",
+    "glob": "^7.1.7",
+    "js-yaml": "^3.14.1",
     "mini-css-extract-plugin": "^0.9.0",
-    "node-sass": "^4.14.1",
-    "optimize-css-assets-webpack-plugin": "^5.0.3",
+    "optimize-css-assets-webpack-plugin": "^5.0.8",
     "path-complete-extname": "^1.0.0",
-    "pnp-webpack-plugin": "^1.6.4",
+    "pnp-webpack-plugin": "^1.7.0",
     "postcss-flexbugs-fixes": "^4.2.1",
     "postcss-import": "^12.0.1",
     "postcss-loader": "^3.0.0",
     "postcss-preset-env": "^6.7.0",
     "postcss-safe-parser": "^4.0.2",
-    "regenerator-runtime": "^0.13.7",
-    "sass-loader": "^8.0.2",
-    "style-loader": "^1.2.1",
-    "terser-webpack-plugin": "^4.0.0",
-    "webpack": "^4.44.1",
+    "regenerator-runtime": "^0.13.9",
+    "sass": "^1.38.0",
+    "sass-loader": "10.1.1",
+    "style-loader": "^1.3.0",
+    "terser-webpack-plugin": "^4.2.3",
+    "webpack": "^4.46.0",
     "webpack-assets-manifest": "^3.1.1",
     "webpack-cli": "^3.3.12",
     "webpack-sources": "^1.4.3"
   },
   "devDependencies": {
-    "eslint": "^7.6.0",
-    "eslint-config-airbnb": "^18.2.0",
-    "eslint-plugin-import": "^2.22.0",
-    "eslint-plugin-jsx-a11y": "^6.3.1",
-    "eslint-plugin-react": "^7.20.5",
-    "jest": "^26.2.2"
+    "eslint": "^7.32.0",
+    "eslint-config-airbnb": "^18.2.1",
+    "eslint-plugin-import": "^2.24.0",
+    "eslint-plugin-jsx-a11y": "^6.4.1",
+    "eslint-plugin-react": "^7.24.0",
+    "jest": "^27.0.6"
   },
   "jest": {
     "testRegex": "(/__tests__/.*|(\\.|/))\\.jsx?$",

data/test/helper_test.rb

@@ -117,29 +117,41 @@ class HelperTest < ActionView::TestCase
   end
 
   def test_stylesheet_pack_tag_split_chunks
-    assert_equal \
-      %(<link rel="stylesheet" media="screen" href="/packs/1-c20632e7baf2c81200d3.chunk.css" />\n) +
+    assert_equal stylesheet_packs_with_chunks_tag("application", "hello_stimulus").in?([
+        %(<link rel="stylesheet" href="/packs/1-c20632e7baf2c81200d3.chunk.css" media="screen" />\n) +
+        %(<link rel="stylesheet" href="/packs/application-k344a6d59eef8632c9d1.chunk.css" media="screen" />\n) +
+        %(<link rel="stylesheet" href="/packs/hello_stimulus-k344a6d59eef8632c9d1.chunk.css" media="screen" />),
+
+        %(<link rel="stylesheet" media="screen" href="/packs/1-c20632e7baf2c81200d3.chunk.css" />\n) +
         %(<link rel="stylesheet" media="screen" href="/packs/application-k344a6d59eef8632c9d1.chunk.css" />\n) +
         %(<link rel="stylesheet" media="screen" href="/packs/hello_stimulus-k344a6d59eef8632c9d1.chunk.css" />),
-      stylesheet_packs_with_chunks_tag("application", "hello_stimulus")
+      ]),
+      true
   end
 
   def test_stylesheet_pack_tag
-    assert_equal \
+    assert_equal stylesheet_pack_tag("bootstrap.css").in?([
+      %(<link rel="stylesheet" href="/packs/bootstrap-c38deda30895059837cf.css" media="screen" />),
+
       %(<link rel="stylesheet" media="screen" href="/packs/bootstrap-c38deda30895059837cf.css" />),
-      stylesheet_pack_tag("bootstrap.css")
+    ]), true
   end
 
   def test_stylesheet_pack_tag_symbol
-    assert_equal \
+    assert_equal stylesheet_pack_tag(:bootstrap).in?([
+      %(<link rel="stylesheet" href="/packs/bootstrap-c38deda30895059837cf.css" media="screen" />),
+
       %(<link rel="stylesheet" media="screen" href="/packs/bootstrap-c38deda30895059837cf.css" />),
-      stylesheet_pack_tag(:bootstrap)
+    ]), true
   end
 
   def test_stylesheet_pack_tag_splat
-    assert_equal \
+    assert_equal stylesheet_pack_tag("bootstrap.css", "application.css", media: "all").in?([
+      %(<link rel="stylesheet" href="/packs/bootstrap-c38deda30895059837cf.css" media="all" />\n) +
+        %(<link rel="stylesheet" href="/packs/application-dd6b1cd38bfa093df600.css" media="all" />),
+
       %(<link rel="stylesheet" media="all" href="/packs/bootstrap-c38deda30895059837cf.css" />\n) +
         %(<link rel="stylesheet" media="all" href="/packs/application-dd6b1cd38bfa093df600.css" />),
-      stylesheet_pack_tag("bootstrap.css", "application.css", media: "all")
+    ]), true
   end
 end