inline_forms_installer 8.1.65 → 8.1.66

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dcf1a3e74f85dca6e068bbcdaaa71099f1fc0b2e6507d4192e1305660c78b244
-  data.tar.gz: 5c20607e05a1ee5db7b1cc69bd979b94068e0d4f62e487391eb4cc151f3ceaea
+  metadata.gz: 189ba5e71c9aee58f109af59c1ee01054b3055f88991c1bbc1a9d2e56e710435
+  data.tar.gz: e587e52585904ff80d026fced739045a7fc6b1258e3050b65bf5913c740a3508
 SHA512:
-  metadata.gz: f8bd143a0eb3fed6bb2427022847f991e1d8f3519dc30e1bf4c07c575fe1b7b72ab5c7c1f327440ac607f033e630b5a6684469170ecb282e67b7cfac5e3718f5
-  data.tar.gz: 85e195581364c3a4d9a6d360589c3b7fea2cc52f77d271abddd3b36b612e62eaaf210d4a8b0e9d7a977f3937a59c9cdbdb761751d64ac52d27a7a79b6b73b6f6
+  metadata.gz: 630596a0231449683d571153e2764c8678868a76646730d977d8efc322c450ec9d2765c5feafb94bd61c46d486ebe5f620720e2e83148c70aba831f13ce821e2
+  data.tar.gz: c2329bc07c4804ac8e45ad70a8ac7951d969ef1a8f8dfd48bcf8787bea1d0815212d6c7b7057f7ce8847b7a1721d122d9288230baf1d00fa930b13da5c9e0246

data/lib/inline_forms_installer/version.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 
 module InlineFormsInstaller
-  VERSION = "8.1.65"
+  VERSION = "8.1.66"
 
   # Canonical bare Ruby version (must match gemspec `required_ruby_version`).
   # Written verbatim into generated apps' `.ruby-version` for rbenv/chruby/asdf/

data/lib/installer_templates/dartsass/devise_main.scss

@@ -1,2 +1,3 @@
-// Entry for dartsass (see config/initializers/inline_forms_dartsass_builds.rb).
-@use "inline_forms/devise" as *;
+// Entry for dartsass (see config/initializers/inline_forms_dartsass_builds.rb,
+// also for why the extension is written out).
+@use "inline_forms/devise.scss" as *;

data/lib/installer_templates/dartsass/inline_forms_dartsass_builds.rb

@@ -13,28 +13,14 @@ Rails.application.config.dartsass.builds = {
   "inline_forms_install/devise_main.scss" => "inline_forms/devise.css"
 }
 
-# SELF-IMPORT GUARD: put the inline_forms gem's stylesheet dir FIRST on the
-# Sass load path. Dartsass::Runner assembles
-#   dartsass <build_options> --load-path app/assets/stylesheets
-#            --load-path <each config.assets.paths entry> <in:out ...>
-# and Dart Sass takes the first load path that has a match. app/assets/builds
-# is on config.assets.paths BEFORE the gem, and a plain .css file is importable
-# by Sass, so `@use "inline_forms/inline_forms"` (and ".../devise") in the
-# inline_forms_install/*_main.scss entries would resolve to the PREVIOUS OUTPUT
-# app/assets/builds/inline_forms/{inline_forms,devise}.css instead of the gem's
-# .scss: from the second build on, each build re-imports its own stale result
-# and gem stylesheet changes never reach the app.
-#
-# The gem dir goes in front of the runner's own --load-path list, as a
-# separate argument: not in build_options (the runner splits every entry there
-# on whitespace, which breaks a gem path with a space in it) and not first on
-# config.assets.paths (Sprockets would then resolve inline_forms/*.css to the
-# gem's .scss instead of the compiled build).
-require "dartsass/runner"
-
-module InlineFormsDartsassLoadPath
-  def dartsass_load_paths
-    [ "--load-path", InlineForms::Engine.root.join("app/assets/stylesheets").to_s ] + super
-  end
-end
-Dartsass::Runner.singleton_class.prepend(InlineFormsDartsassLoadPath)
+# SELF-IMPORT GUARD: the two inline_forms_install/*_main.scss entries `@use`
+# the gem's stylesheets WITH their .scss extension. dartsass-rails passes
+# app/assets/stylesheets and then every config.assets.paths entry as a
+# --load-path, app/assets/builds comes before the gem, and a plain .css file
+# is importable by Sass: a bare `@use "inline_forms/inline_forms"` resolved to
+# the PREVIOUS OUTPUT app/assets/builds/inline_forms/inline_forms.css, so from
+# the second build on each build re-imported its own stale result and gem
+# stylesheet changes never reached the app. With the extension Dart Sass only
+# takes a .scss file (the gem's), and the build fails loudly if the gem ever
+# renames it. (Until 8.1.66 this file prepended the gem dir to
+# Dartsass::Runner.dartsass_load_paths, an internal of dartsass-rails.)

data/lib/installer_templates/dartsass/inline_forms_main.scss

@@ -1,2 +1,3 @@
-// Entry for dartsass (see config/initializers/inline_forms_dartsass_builds.rb).
-@use "inline_forms/inline_forms" as *;
+// Entry for dartsass (see config/initializers/inline_forms_dartsass_builds.rb,
+// also for why the extension is written out).
+@use "inline_forms/inline_forms.scss" as *;

data/lib/installer_templates/example_app_tests/test/integration/example_app_dartsass_build_test.rb

@@ -1,27 +1,31 @@
 # frozen_string_literal: true
 
 require "test_helper"
-require "dartsass/runner"
 require "sass-embedded"
 
-# config/initializers/inline_forms_dartsass_builds.rb puts the gem's
-# stylesheet dir first on the Sass load path. Without it,
-# app/assets/builds (ahead of the gem in config.assets.paths) shadows the
-# gem's .scss: `@use "inline_forms/inline_forms"` in the
-# inline_forms_install/*_main.scss entries re-imports the app's previous
-# compiled CSS, and gem stylesheet changes never reach the app after its
-# first build. test_helper runs dartsass:build, so by now builds/ already held
-# a previous build when this run's one ran.
+# The inline_forms_install/*_main.scss entries `@use` the gem's stylesheets
+# with an explicit .scss extension (config/initializers/
+# inline_forms_dartsass_builds.rb). Without it app/assets/builds (ahead of the
+# gem on the Sass load path) shadows the gem's .scss: a bare
+# `@use "inline_forms/inline_forms"` re-imports the app's previous compiled
+# CSS, and gem stylesheet changes never reach the app after its first build.
+# test_helper runs dartsass:build, so by now builds/ already held a previous
+# build when this run's one ran.
 class ExampleAppDartsassBuildTest < ActiveSupport::TestCase
-  test "the gem stylesheet dir is the first Sass load path" do
-    command = Dartsass::Runner.dartsass_compile_command
-    first_load_path = command.index { |arg| arg == "--load-path" || arg.start_with?("--load-path=") }
+  test "the initializer no longer patches dartsass-rails' load paths" do
+    code = Rails.root.join("config/initializers/inline_forms_dartsass_builds.rb").readlines
+                .reject { |line| line.lstrip.start_with?("#") }.join
 
-    # Two arguments, so a gem path with a space stays one argument.
-    assert_equal [ "--load-path", gem_stylesheets ], command[first_load_path, 2]
+    refute_includes code, "Dartsass::Runner"
   end
 
   %w[inline_forms devise].each do |entry|
+    test "inline_forms_install/#{entry}_main.scss uses the gem's #{entry}.scss with its extension" do
+      main = Rails.root.join("app/assets/stylesheets/inline_forms_install/#{entry}_main.scss").read
+
+      assert_includes main, %(@use "inline_forms/#{entry}.scss" as *;)
+    end
+
     test "builds/inline_forms/#{entry}.css is compiled from the gem's #{entry}.scss" do
       built = Rails.root.join("app/assets/builds/inline_forms/#{entry}.css")
       assert built.file?, "#{built} missing; dartsass:build did not run"

data/lib/installer_templates/example_app_tests/test/integration/example_app_layout_title_test.rb

@@ -43,7 +43,7 @@ class ExampleAppLayoutTitleTest < ExampleAppIntegrationTestCase
     get apartments_path
 
     assert_response :success
-    assert_includes @response.body, %(<html lang="nl">)
+    assert_includes @response.body, %(<html lang="nl" class="no-js">)
     assert_equal expected_title, page_title
   ensure
     en = Locale.find_by(name: "en")

data/lib/installer_templates/example_app_tests/test/integration/example_app_stylesheet_test.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+# The compiled admin and devise stylesheets (test_helper runs dartsass:build).
+# Tippy's CSS was a plain CSS `@import '…/tippy.css'` that the browser
+# resolved to /vendor/assets/stylesheets/tippy.css, a 404 on every page; the
+# gem now inlines it. And the top-bar submenus stay hidden until Foundation
+# initialises them, also after a Turbo Drive visit (html.no-js is gone then).
+class ExampleAppStylesheetTest < ActiveSupport::TestCase
+  %w[inline_forms devise].each do |entry|
+    test "builds/inline_forms/#{entry}.css inlines tippy and has no CSS @import" do
+      css = built(entry)
+
+      assert_empty css.scan(/@import[^;]*;/), "#{entry}.css: the browser would fetch these"
+      assert_includes css, ".tippy-box{position:relative"
+    end
+  end
+
+  test "uninitialised top-bar submenus are hidden" do
+    assert_includes built("inline_forms"), ".dropdown.menu>li>ul.menu:not(.is-dropdown-submenu){display:none}"
+  end
+
+  private
+
+  def built(entry)
+    path = Rails.root.join("app/assets/builds/inline_forms/#{entry}.css")
+    assert path.file?, "#{path} missing; dartsass:build did not run"
+    path.read
+  end
+end

data/lib/installer_templates/example_app_tests/test/integration/example_app_user_locale_test.rb

@@ -11,7 +11,7 @@ class ExampleAppUserLocaleTest < ExampleAppIntegrationTestCase
     get apartments_path
 
     assert_response :success
-    assert_includes @response.body, %(<html lang="en">)
+    assert_includes @response.body, %(<html lang="en" class="no-js">)
   end
 
   test "user locale preference switches I18n for the request" do
@@ -23,7 +23,7 @@ class ExampleAppUserLocaleTest < ExampleAppIntegrationTestCase
     get apartments_path
 
     assert_response :success
-    assert_includes @response.body, %(<html lang="nl">)
+    assert_includes @response.body, %(<html lang="nl" class="no-js">)
   ensure
     en = Locale.find_by(name: "en")
     admin&.update!(locale: en) if en
@@ -38,7 +38,7 @@ class ExampleAppUserLocaleTest < ExampleAppIntegrationTestCase
     get apartments_path
 
     assert_response :success
-    assert_includes @response.body, %(<html lang="en">)
+    assert_includes @response.body, %(<html lang="en" class="no-js">)
   ensure
     en = Locale.find_by(name: "en")
     admin&.update!(locale: en) if en

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inline_forms_installer
 version: !ruby/object:Gem::Version
-  version: 8.1.65
+  version: 8.1.66
 platform: ruby
 authors:
 - Ace Suares
@@ -125,6 +125,7 @@ files:
 - lib/installer_templates/example_app_tests/test/integration/example_app_showcase_row_turbo_test.rb
 - lib/installer_templates/example_app_tests/test/integration/example_app_showcase_text_fields_test.rb
 - lib/installer_templates/example_app_tests/test/integration/example_app_showcase_validation_hints_test.rb
+- lib/installer_templates/example_app_tests/test/integration/example_app_stylesheet_test.rb
 - lib/installer_templates/example_app_tests/test/integration/example_app_turbo_layout_test.rb
 - lib/installer_templates/example_app_tests/test/integration/example_app_user_locale_test.rb
 - lib/installer_templates/example_app_tests/test/integration/example_app_user_theme_test.rb