From 0098e9187accd9a75d35f5acc2344452072e5bee Mon Sep 17 00:00:00 2001 From: Dawa Ometto Date: Thu, 22 Sep 2022 01:14:46 +0200 Subject: [PATCH] Only require uglifier when precompiling --- .github/workflows/docker-test.yml | 4 ++-- Rakefile | 7 +++++++ lib/gollum/assets.rb | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml index b457ff75..7c73400a 100644 --- a/.github/workflows/docker-test.yml +++ b/.github/workflows/docker-test.yml @@ -47,8 +47,8 @@ jobs: sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 & # optional - name: Run gollum from Docker run: | - RUNNER_TRACKING_ID="" docker run --rm -p 4567:4567 -v $(pwd):/wiki -e CI=true ${{ env.CI_IMAGE }} & - netstat -lt + git clone test/examples/lotr.git lotr.git + RUNNER_TRACKING_ID="" docker run --rm -p 4567:4567 -v lotr.git:/wiki -e CI=true ${{ env.CI_IMAGE }} & sleep 10 netstat -lt - name: Run capybara tests against Dockerized instance diff --git a/Rakefile b/Rakefile index a126d085..4e0b2427 100644 --- a/Rakefile +++ b/Rakefile @@ -248,6 +248,13 @@ task :precompile do "It's possible that you just need to install `yarn` on your system." end + require 'uglifier' + module Precious + module Assets + JS_COMPRESSOR = ::Uglifier.new(harmony: true) + end + end + require './lib/gollum/app.rb' # Next, configure the Sprockets asset pipeline and precompile production- diff --git a/lib/gollum/assets.rb b/lib/gollum/assets.rb index 49dddef6..6ee0b95b 100644 --- a/lib/gollum/assets.rb +++ b/lib/gollum/assets.rb @@ -1,10 +1,10 @@ require 'octicons' -require 'uglifier' module Precious module Assets MANIFEST = %w(app.js editor.js mermaid.js app.css criticmarkup.css fileview.css ie7.css print.css *.png *.jpg *.svg *.eot *.ttf) ASSET_URL = 'gollum/assets' + JS_COMPRESSOR = :uglify unless defined?(JS_COMPRESSOR) def self.sprockets(dir = File.dirname(File.expand_path(__FILE__))) env = Sprockets::Environment.new @@ -17,7 +17,7 @@ module Precious env.append_path ::File.join(dir, 'public/gollum/images') env.append_path ::File.join(dir, 'public/gollum/fonts') - env.js_compressor = ::Uglifier.new(harmony: true) unless Precious::App.development? + env.js_compressor = Precious::Assets::JS_COMPRESSOR unless Precious::App.development? env.css_compressor = :scss env.context_class.class_eval do