Build against Asciidoctor 2.0.22 (#1725)

asciidoctor · Mar 17, 2024 · c5b3e1b · c5b3e1b
1 parent 8a26db2
commit c5b3e1b
Show file tree

Hide file tree

Showing 7 changed files with 228 additions and 155 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -8,13 +8,13 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         node-version: [12.x, 14.x]
-        asciidoctor-core-version: [v2.0.17, main]
+        asciidoctor-core-version: [v2.0.22, main]
         experimental: [false]
         include:
           - node-version: 14.x
             os: macos-latest
             experimental: true
-            asciidoctor-core-version: v2.0.17
+            asciidoctor-core-version: v2.0.22
     runs-on: ${{ matrix.os }}
     continue-on-error: ${{ matrix.experimental }}
     steps:
@@ -46,7 +46,7 @@ jobs:
         node-version:
           - 12.x
           - 14.x
-        asciidoctor-core-version: [v2.0.17, main]
+        asciidoctor-core-version: [v2.0.22, main]
     steps:
       - uses: actions/checkout@v2
       - name: Set up Node ${{ matrix.node-version }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -23,7 +23,7 @@ jobs:
           npm ci --prefix packages/core
       - name: Lint, build and test
         env:
-          ASCIIDOCTOR_CORE_VERSION: v2.0.17
+          ASCIIDOCTOR_CORE_VERSION: v2.0.22
         run: |
           npm run lint
           npm run test
@@ -51,7 +51,7 @@ jobs:
       # package and publish
       - name: Package
         env:
-          ASCIIDOCTOR_CORE_VERSION: v2.0.17
+          ASCIIDOCTOR_CORE_VERSION: v2.0.22
         run: ./scripts/package.sh
       - name: Publish
         env:

diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
@@ -8,6 +8,30 @@ For a detailed view of what has changed, refer to the {uri-repo}/commits/master[
 
 == Unreleased
 
+Improvements::
+* Build against the latest release of Asciidoctor 2.0.22
+
+== 2.2.6 (2022-01-21)
+
+Bug Fixes::
+* Fix global variable leak by @mojavelinux in #1494 (backport)
+* Bridge common Ruby object methods by @ggrossetie in #1550
+
+Improvements::
+* Build against the latest release of Asciidoctor 2.0.17
+
+Infrastructure::
+* Build against Asciidoctor 2.0.17 by @ggrossetie in #1540
+* Upgrade development dependencies by @ggrossetie in #1549
+* Retrieve upstream from main branch by @mojavelinux in #1495
+
+Documentation::
+* Fix 404 links to the GraalVM docs by @StarfallProjects in #1413
+* Rename "JSDoc" to "API Reference" and add link to extension API reference by @hqurve in #1447
+* Update HTML5Converter instantiation method in docs by @danyill in #1437
+
+== 2.2.5 (2021-08-08)
+
 Bug Fixes::
 
 * Invoke `LoggerManager#setLogger` setter - thanks @mojavelinux (#1322)

diff --git a/packages/core/lib/asciidoctor/js/opal_ext.rb b/packages/core/lib/asciidoctor/js/opal_ext.rb
@@ -2,6 +2,7 @@
 require 'asciidoctor/js/opal_ext/file'
 require 'asciidoctor/js/opal_ext/match_data'
 require 'asciidoctor/js/opal_ext/string'
+require 'asciidoctor/js/opal_ext/array'
 require 'asciidoctor/js/opal_ext/uri'
 require 'asciidoctor/js/opal_ext/base64'
 require 'asciidoctor/js/opal_ext/number'

diff --git a/packages/core/lib/asciidoctor/js/opal_ext/array.rb b/packages/core/lib/asciidoctor/js/opal_ext/array.rb
@@ -0,0 +1,11 @@
+class Array
+  alias :_original_pack :pack
+
+  def pack format
+    if format == 'm0'
+      ::Base64.strict_encode64 self
+    else
+      _original_pack self
+    end
+  end
+end
diff --git a/packages/core/lib/asciidoctor/js/postscript.rb b/packages/core/lib/asciidoctor/js/postscript.rb
@@ -4,3 +4,5 @@
 
 require 'asciidoctor/js/asciidoctor_ext'
 require 'asciidoctor/js/opal_ext/logger' # override the built-in Logger
+
+Asciidoctor::InlineLinkRx = %r((^|link:|#{Asciidoctor::CG_BLANK}|\\?&lt;(?=\\?(?:https?|file|ftp|irc)(:))|[>\(\)\[\];"'])(\\?(?:https?|file|ftp|irc)://)(?:([^\s\[\]]+)\[(|#{Asciidoctor::CC_ALL}*?[^\\])\]|(?!\2)([^\s]*?)&gt;|([^\s\[\]<]*([^\s,.?!\[\]<\)]))))
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,3 +4,5 @@

		require 'asciidoctor/js/asciidoctor_ext'
		require 'asciidoctor/js/opal_ext/logger' # override the built-in Logger

		Asciidoctor::InlineLinkRx = %r((^\|link:\|#{Asciidoctor::CG_BLANK}\|\\?<(?=\\?(?:https?\|file\|ftp\|irc)(:))\|[>\(\)\[\];"'])(\\?(?:https?\|file\|ftp\|irc)://)(?:([^\s\[\]]+)\[(\|#{Asciidoctor::CC_ALL}?[^\\])\]\|(?!\2)([^\s]?)>\|([^\s\[\]<]*([^\s,.?!\[\]<\)]))))