Merge pull request #240 from obilodeau/sync-asciidoctorjs-1.5.9

Javascript/Node: Sync with Asciidoctor.js 1.5.9 (fixes #227)
asciidoctor · Feb 9, 2019 · c10e859 · c10e859
2 parents f756e95 + b15c63a
commit c10e859
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/Gemfile b/Gemfile
@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in asciidoctor-revealjs.gemspec
 gemspec
+# Asciidoctor.js 1.5.9 requires an unreleased Opal 0.11.99.dev (6703d8d)
+gem 'opal', :git => 'https://github.com/opal/opal.git', :ref => '6703d8d'
diff --git a/Gemfile.upstream b/Gemfile.upstream
@@ -3,3 +3,5 @@
 source 'https://rubygems.org'
 gemspec
 gem 'asciidoctor', :git => 'https://github.com/asciidoctor/asciidoctor', :branch => 'master'
+# Asciidoctor.js 1.5.9 requires an unreleased Opal 0.11.99.dev (6703d8d)
+gem 'opal', :git => 'https://github.com/opal/opal.git', :ref => '6703d8d'
diff --git a/asciidoctor-revealjs.gemspec b/asciidoctor-revealjs.gemspec
@@ -43,5 +43,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'asciidoctor-templates-compiler', '~> 0.4.2'
   s.add_development_dependency 'slim', '~> 3.0.6'
   s.add_development_dependency 'slim-htag', '~> 0.1.0'
-  s.add_development_dependency 'opal', '~> 0.11.1'
+  # Overriden in Gemfile and Gemfile.upstream for now
+  #s.add_development_dependency 'opal', '~> 0.11.1'
 end
diff --git a/package.json b/package.json
@@ -41,7 +41,7 @@
   },
   "homepage": "https://github.com/asciidoctor/asciidoctor-reveal.js",
   "dependencies": {
-    "asciidoctor.js": "1.5.6",
+    "asciidoctor.js": "1.5.9",
     "reveal.js": "3.7.0"
   },
   "devDependencies": {