geoblacklight 4.4.2 → 5.0.0.pre.alpha.11

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -8,15 +8,7 @@ class TestAppGenerator < Rails::Generators::Base
   def add_gems
     gem "blacklight"
 
-    # In CI, Javascript and Webpacker are removed when generating Rails 6.x
-    # applications to enable Vite. Disabling javascript during test app
-    # generation removes Turbolinks. This gem is required and needs to be
-    # re-added.
-    if ENV["RAILS_VERSION"] && Gem::Version.new(ENV["RAILS_VERSION"]) < Gem::Version.new("7.0")
-      gem "turbolinks"
-    end
-
-    Bundler.with_clean_env do
+    Bundler.with_unbundled_env do
       run "bundle install"
     end
   end
@@ -25,8 +17,8 @@ class TestAppGenerator < Rails::Generators::Base
     run "yarn install && yarn build"
   end
 
-  # Ensure local frontend build is linked so internal test app
-  # can use local javascript instead of npm package.
+  # This makes the assets available in the test app so that changes made in
+  # local development can be picked up automatically
   def link_frontend
     run "yarn link"
   end
@@ -34,7 +26,7 @@ class TestAppGenerator < Rails::Generators::Base
   def run_blacklight_generator
     say_status("warning", "GENERATING BL", :yellow)
 
-    generate "blacklight:install", "--devise"
+    generate "blacklight:install", "--devise", "--skip-solr"
   end
 
   # Install geoblacklight with the `test` option

data/template.rb

@@ -1,20 +1,22 @@
 # frozen_string_literal: true
 
-gem "blacklight", "~> 7.0"
-gem "geoblacklight", "~> 4.0"
-gem "sprockets", "< 4.0" # Use sprockets less than 4.0, let webpacker users set this up themselves
+gem "blacklight", "~> 8.0"
 
-# Hack for https://github.com/rails/rails/issues/35153
-# Adapted from https://github.com/projectblacklight/blacklight/pull/2065
-gemfile = File.expand_path("Gemfile")
-File.write(gemfile, File.open(gemfile) do |f|
-  text = f.read
-  text.gsub(/^gem 'sqlite3'$/, 'gem "sqlite3", "~> 1.3.6"')
-end)
+# Ensure the app generates with Propshaft; sprockets is no longer supported
+# https://github.com/geoblacklight/geoblacklight/issues/1265
+ENV["ENGINE_CART_RAILS_OPTIONS"] = ENV["ENGINE_CART_RAILS_OPTIONS"].to_s + " -a propshaft"
+
+# Install latest version of geoblacklight gem if running
+# generator with a development branch.
+if ENV["BRANCH"]
+  gem "geoblacklight", github: "geoblacklight/geoblacklight", branch: ENV["BRANCH"]
+else
+  gem "geoblacklight", "~> 4.0"
+end
 
 run "bundle install"
 
-generate "blacklight:install", "--devise"
+generate "blacklight:install", "--devise", "--skip-solr"
 generate "geoblacklight:install", "-f"
 
 rake "db:migrate"

data/test/leaflet/layers.test.js

@@ -0,0 +1,17 @@
+import { wmsLayer, wmtsLayer } from "../../app/javascript/leaflet/layers";
+import { describe, expect, it } from "vitest";
+
+describe("leaflet/layers", () => {
+  describe("wmsLayer", () => {
+    it("returns a WMS tile layer", () => {
+      const url = "http://example.com/wms";
+      const layerId = "layerId";
+      const opacity = 0.5;
+      const detectRetina = true;
+      const layer = wmsLayer(url, { layerId, opacity, detectRetina });
+      expect(layer.options.layers).toEqual(layerId);
+      expect(layer.options.opacity).toEqual(opacity);
+      expect(layer.options.detectRetina).toEqual(detectRetina);
+    });
+  });
+});

data/vite.config.ts

@@ -1,24 +1,35 @@
-import { resolve } from 'path'
-import { defineConfig } from 'vite'
-import { exec } from 'child_process'
+import { resolve } from "path";
+import { defineConfig } from "vite";
+import includePaths from "rollup-plugin-includepaths";
 
-export default defineConfig({
-  build: {
-    manifest: true,
-    minify: true,
-    reportCompressedSize: true,
-    lib: {
-      entry: resolve(__dirname, 'app/javascript/index.js'),
-      name: '@geoblacklight/frontend',
-      fileName: 'frontend'
-    }
-  },
-  "plugins": [
-    {
-      name: 'clobber internal test app vite files and cache',
-      buildEnd: async() => {
-        exec("cd .internal_test_app && bundle exec vite clobber")
-      }
-    }
-  ]
-})
+export default defineConfig(() => {
+  return {
+    build: {
+      outDir: "app/assets/javascripts/geoblacklight",
+      emptyOutDir: true,
+      manifest: true,
+      minify: false,
+      sourcemap: true,
+      lib: {
+        entry: resolve(__dirname, "app/javascript/geoblacklight/index.js"),
+        name: "@geoblacklight/frontend",
+        fileName: "geoblacklight",
+      },
+      // Rewrite importmap-friendly bare specifiers like geoblacklight/foo/bar
+      // to bundler-friendly local paths like ./foo/bar
+      rollupOptions: {
+        plugins: [
+          includePaths({
+            paths: ["app/javascript"],
+            extensions: [".js"],
+            include: {},
+            external: [],
+          }),
+        ],
+      },
+    },
+    test: {
+      environment: "jsdom",
+    },
+  };
+});