opal 1.8.1 → 1.8.3.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8af8b2b4d485065e48d45e66e00075cf3b2f3d58c358355f5cbf5c97c46cd607
-  data.tar.gz: 87b7e4d8443eeb45953d48ca6ebb321b27269d9e7bbe2c4770c5189bcd44bcf9
+  metadata.gz: 0b7bdbaa11982b36e41c9595ac6cba3ced898573fa40bee52b0d599aee66c0d9
+  data.tar.gz: 23b40fdd12f4b82aafb53ffcc376aff8ee7635e74f37fe7b711d99dbc2c315ac
 SHA512:
-  metadata.gz: 615891333955fa65566ccad7f18d7a2a65905076db6268775bb5e9f06604b56e4ebfcb8fc05d181353c1bcfbba64c195c2eb4f71b37f805e9f7984f990e56a41
-  data.tar.gz: 1566eb09bf04acbcb49c7386ab9259cd13f8d94810e9dfecadf109b57ad2eaf479d1df419359a4a776b11aba2c7cc97d7df761c9ade46a2b8512d2718503ab69
+  metadata.gz: 419a5ea103d370ec908f98bd2e4e24d79401d8704b781eea52b359041b12b6a012eb048caa01bd2ccedd34746e22b0b6a2fbce51802bc040157855a393b58244
+  data.tar.gz: 2ba934b813ebb3fb51291273cb4653f80652a1a2a02555b7fd97d8d4c1813fe13938c85495b18b426e59a384dc0cdf706b1e4df63a117163d8327418ac83ec2d

data/.github/workflows/build.yml

@@ -14,82 +14,64 @@ permissions:
 jobs:
   rake:
     name: ${{ matrix.combo.name || matrix.combo.ruby }}
+    env:
+      DEFAULT_RUBY: '3.3'
     strategy:
       fail-fast: false
       matrix:
         combo:
           - name: mspec-nodejs
-            ruby: '3.0'
             command: bin/rake mspec_nodejs
           - name: mspec-chrome
-            ruby: '3.0'
             command: bin/rake mspec_chrome
           - name: mspec-firefox
-            env:
-              # when changing version, also change it below
-              MOZILLA_FIREFOX_BINARY: '/opt/hostedtoolcache/firefox/106.0.4/x64/firefox'
-            ruby: '3.0'
+            firefox: '106.0.4'
             command: xvfb-run bin/rake mspec_firefox
           - name: minitest
-            ruby: '3.0'
             command: bin/rake minitest
           - name: minitest-strict-mode
-            ruby: '3.0'
             command: bin/rake minitest
             strict: 'true'
-          - name: head-ruby
-            ruby: head
-            permissive: true
+          # - name: head-ruby
+          #   ruby: head
+          #   permissive: true
           - name: current-ruby
-            ruby: 3.1
+            ruby: '3.3'
           - name: previous-ruby
-            ruby: '3.0'
+            ruby: '3.2'
           - name: older-ruby
-            ruby: 2.7
+            ruby: '3.1'
           - name: near-eol-ruby
-            ruby: 2.6
-          - name: smoke-test
             ruby: '3.0'
+          - name: smoke-test
             command: bin/rake smoke_test
           - name: windows-mspec-nodejs
             command: bundle exec rake mspec_nodejs
-            ruby: '3.0'
             os: windows-latest
           - name: windows-mspec-chrome
             command: bundle exec rake mspec_chrome
-            ruby: '3.0'
             os: windows-latest
           # - name: windows-mspec-firefox
-          #   env:
-          #     # when changing version, also change it below and above
-          #     MOZILLA_FIREFOX_BINARY: 'C:/Program Files/Firefox_106.0.4/firefox.exe'
-          #   ruby: '3.0'
+          #   firefox: '106.0.4'
           #   command: bundle exec rake mspec_firefox
           #   os: windows-latest
           - name: macos-mspec-safari
             command: bundle exec rake mspec_safari
-            ruby: '3.0'
             os: 'macos-latest'
           - name: windows-minitest
             command: bundle exec rake minitest
-            ruby: '3.0'
             os: windows-latest
           - name: windows
             command: bundle exec rake rspec
-            ruby: '3.0'
             os: windows-latest
           - name: macos
             command: bundle exec rake rspec
-            ruby: '3.0'
             os: 'macos-latest'
           - name: lint
             command: bin/rake lint
-            ruby: '3.0'
           - name: timezone
             command: bin/rake mspec_nodejs TZ="Pacific/Fiji"
-            ruby: '3.0'
           - name: performance
-            ruby: '3.0'
             permissive: true
             fetchdepth: '0'
             command: bin/rake performance:compare
@@ -102,29 +84,32 @@ jobs:
     runs-on: ${{ matrix.combo.os || 'ubuntu-latest' }}
     continue-on-error: ${{ matrix.combo.permissive || false }}
     steps:
-      - uses: browser-actions/setup-firefox@latest
+      - if: ${{ matrix.combo.firefox }}
+        id: setup-firefox
+        uses: browser-actions/setup-firefox@latest
         with:
-          # when changing version, also change it above
-          firefox-version: '106.0.4'
-      - uses: actions/checkout@v2
+          firefox-version: ${{ matrix.combo.firefox }}
+      - uses: actions/checkout@v4
         with:
           fetch-depth: ${{ fromJSON(matrix.combo.fetchdepth || '1') }}
       - if: ${{ matrix.combo.os != 'ryzen' }}
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: ${{ matrix.combo.ruby }}
+          ruby-version: ${{ matrix.combo.ruby || env.DEFAULT_RUBY }}
           bundler-cache: false
       - run: ruby bin/git-submodule-fast-install
       - run: bundle lock
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
+        env:
+          KEY_PREFIX: ${{ runner.os }}-${{ matrix.combo.ruby || env.DEFAULT_RUBY }}
         with:
           path: ./vendor/bundle
-          key: ${{ runner.os }}-${{ matrix.combo.ruby }}-gem-${{ github.ref }}-${{ hashFiles('**/Gemfile.lock') }}
+          key: ${{ env.KEY_PREFIX }}-gem-${{ github.ref }}-${{ hashFiles('**/Gemfile.lock') }}
           restore-keys: |
-            ${{ runner.os }}-${{ matrix.combo.ruby }}-gem-${{ github.ref }}
-            ${{ runner.os }}-${{ matrix.combo.ruby }}-gem-master
-            ${{ runner.os }}-${{ matrix.combo.ruby }}-gem-
-      - uses: actions/cache@v2
+            ${{ env.KEY_PREFIX }}-gem-${{ github.ref }}
+            ${{ env.KEY_PREFIX }}-gem-master
+            ${{ env.KEY_PREFIX }}-gem-
+      - uses: actions/cache@v4
         with:
           path: ./node_modules
           key: ${{ runner.os }}-npm-${{ github.ref }}-${{ hashFiles('**/yarn.lock') }}
@@ -138,8 +123,12 @@ jobs:
           bundle config path $PWD/vendor/bundle
           bundle install --jobs 4 --retry 3
           bundle clean
-      - name: set environment variables
+      - name: set environment variables USE_STRICT
         if: ${{ matrix.combo.strict == 'true' }}
         run: |
           echo "USE_STRICT=true" >> $GITHUB_ENV
+      - name: set environment variables MOZILLA_FIREFOX_BINARY
+        if: ${{ matrix.combo.firefox }}
+        run: |
+          echo "MOZILLA_FIREFOX_BINARY=${{ steps.setup-firefox.outputs.firefox-path }}" >> $GITHUB_ENV
       - run: ${{ matrix.combo.command || 'bin/rake rspec' }}

data/.rubocop.yml

@@ -214,7 +214,9 @@ Naming/BinaryOperatorParameterName:
 
 Naming/PredicateName:
   # Ruby has "has_key?" method
-  ForbiddenPrefixes: is_, have_
+  ForbiddenPrefixes: 
+    - is_
+    - have_
 
 Performance/FlatMap:
   Exclude:

data/CHANGELOG.md

@@ -16,7 +16,7 @@ Changes are grouped as follows:
 
 
 
-## [1.8.1](https://github.com/opal/opal/compare/v1.8.0...v1.8.1) - 2023-11-09
+## [1.8.2](https://github.com/opal/opal/compare/v1.8.1...v1.8.2) - 2023-11-23
 
 
 <!--
@@ -25,9 +25,21 @@ Changes are grouped as follows:
 ### Added
 ### Removed
 ### Deprecated
+-->
+
 ### Performance
+
+- Optimize `Hash#rehash` for the common case, avoid calling `$slice` when no hash collision is present ([#2571](https://github.com/opal/opal/pull/2571))
+
 ### Fixed
--->
+
+- `String#{r,l,}strip`: Make them work like in MRI for non-breaking white-space ([#2612](https://github.com/opal/opal/pull/2612))
+- Compat regression fix: `Hash#to_n` should return a JS object ([#2613](https://github.com/opal/opal/pull/2613))
+
+
+
+
+## [1.8.1](https://github.com/opal/opal/compare/v1.8.0...v1.8.1) - 2023-11-09
 
 
 ### Fixed

data/Gemfile

@@ -40,6 +40,7 @@ group :development do
   gem 'rb-fsevent'
   gem 'guard', require: false
   gem 'listen', require: false
+  gem 'simplecov', require: false
 
   if RUBY_PLATFORM =~ /darwin/
     gem 'terminal-notifier-guard'

data/UNRELEASED.md

@@ -1,10 +1,20 @@
 <!--
-### Internal
-### Changed
 ### Added
 ### Removed
 ### Deprecated
 ### Performance
-### Fixed
 -->
 
+### Changed
+- Use of `JS` constant is now deprecated. The constant has been renamed to `Opal::Raw`. Throw a warning if such a constant is in use (#2525)
+
+### Fixed
+- `String#chars`: Fix iteration over out-of-BMP characters (#2620)
+- Fix `Array#include?` to respect nil return value (#2661)
+- Fix `opal-build` command line utility for newer Ruby versions (#2675)
+- Depend on `base64` gem for Ruby 3.4 compatibility (#2652)
+
+### Internal
+- Ensure we default to later Ruby versions in CI (#2624)
+- Unassorted CI/Rubocop/testing system changes (#2676, #2654, #2644, #2631, #2627, #2626)
+

data/docs/compiled_ruby.md

@@ -423,48 +423,48 @@ foo. JS[:a]
 
 ### Calling JavaScript Operators
 
-Opal has a `js` library in the stdlib that provides a `JS` module which can
+Opal has a `opal/raw` library in the stdlib that provides a `Opal::Raw` module which can
 be used to call JavaScript operators such as `new`.  Example:
 
 ```ruby
-require 'js'
+require 'opal/raw'
 
 # new foo(bar)
-JS.new(foo, bar)
+Opal::Raw.new(foo, bar)
 
 # delete foo["bar"]
-JS.delete(foo, :bar)
+Opal::Raw.delete(foo, :bar)
 
 # "bar" in foo
-JS.in(:bar, foo)
+Opal::Raw.in(:bar, foo)
 
 # foo instanceof bar
-JS.instanceof(foo, bar)
+Opal::Raw.instanceof(foo, bar)
 
 # typeof foo
-JS.typeof(foo)
+Opal::Raw.typeof(foo)
 ```
 
 ### Calling JavaScript Global Functions
 
-You can also use the `js` library to call JavaScript global functions via
-`JS.call`:
+You can also use the `opal/raw` library to call JavaScript global functions via
+`Opal::Raw.call`:
 
 ```ruby
-require 'js'
+require 'opal/raw'
 
 # parseFloat("1.1")
-JS.call(:parseFloat, "1.1")
+Opal::Raw.call(:parseFloat, "1.1")
 ```
 
 For convenience, `method_missing` is aliased to call, allowing you to call
-global JavaScript methods directly on the `JS` module:
+global JavaScript methods directly on the `Opal::Raw` module:
 
 ```ruby
-require 'js'
+require 'opal/raw'
 
 # parseFloat("1.1")
-JS.parseFloat("1.1")
+Opal::Raw.parseFloat("1.1")
 ```
 
 

data/docs/releasing.md

@@ -21,7 +21,7 @@ All of the following is now covered by `bin/rake release:prepare VERSION=v1.2.3`
 
 ## Release!
 
-- Push the commit to `master`
+- Push the commit to `master` or the current stable branch
 - Run `bin/rake release` to release the new version to Rubygems
 - Go to GitHub releases and create a new release from the latest tag pasting the contents from CHANGELOG.md (or UNRELEASED.md for pre-releases)
 
@@ -36,7 +36,9 @@ All of the following is now covered by `bin/rake release:prepare VERSION=v1.2.3`
 
 ### [skip for pre-releases] Opal site
 
-- Open `opal.github.io` and update the opal version in the `Gemfile`
+- Open `opal.github.io`
+- checkout the `source` branch
+- update the opal version in the `Gemfile` with `bundle update opal`
 - run `bin/build`
 - `git push` the latest changes
 

data/exe/opal-build

@@ -71,7 +71,7 @@ else
   lib_name = ARGV.first
 
   output = options[:output] ? File.open(options[:output], 'w') : $stdout
-  output.puts Opal::Builder.build(lib_name.dup.untaint)
+  output.puts Opal::Builder.build(lib_name.dup)
 end
 
 

data/lib/opal/compiler.rb

@@ -190,7 +190,7 @@ module Opal
 
     # @!method backtick_javascript?
     #
-    # Allows use of a backtick operator (and `%x{}``) to embed verbatim JavaScript.
+    # Allows use of a backtick operator (and `%x{}`) to embed verbatim JavaScript.
     # If false, backtick operator will
     compiler_option :backtick_javascript, default: nil, as: :backtick_javascript?, magic_comment: true
 

data/lib/opal/nodes/call_special.rb

@@ -37,7 +37,7 @@ module Opal
         # For .JS. call we pass a block
         # as a plain JS callback
         if @iter
-          @arglist = @arglist << @iter
+          @arglist <<= @iter
         end
         @iter = nil
       end

data/lib/opal/nodes/literal.rb

@@ -132,7 +132,7 @@ module Opal
           if SUPPORTED_FLAGS =~ flag
             true
           else
-            compiler.warning "Skipping the '#{flag}' Regexp flag as it's not widely supported by JavaScript vendors."
+            compiler.warning "Skipping the '#{flag}' Regexp flag as it's not widely supported by JavaScript vendors.", @sexp.line
             false
           end
         end

data/lib/opal/nodes/rescue.rb

@@ -221,7 +221,7 @@ module Opal
       end
 
       def rescue_body
-        body_code = (body || s(:nil))
+        body_code = body || s(:nil)
         body_code = compiler.returns(body_code) unless stmt?
         body_code
       end

data/lib/opal/nodes/scope.rb

@@ -267,7 +267,7 @@ module Opal
           @identity = "$$#{mid}"
         else
           # Parent scope is the defining module/class
-          name ||= [(parent && (parent.name || parent.scope_name)), mid].compact.join('_')
+          name ||= [parent && (parent.name || parent.scope_name), mid].compact.join('_')
           @identity = @compiler.unique_temp(name)
         end
 

data/lib/opal/version.rb

@@ -3,5 +3,5 @@
 module Opal
   # WHEN RELEASING:
   # Remember to update RUBY_ENGINE_VERSION in opal/corelib/constants.rb too!
-  VERSION = '1.8.1'
+  VERSION = '1.8.3.rc1'
 end

data/opal/corelib/array.rb

@@ -1322,7 +1322,7 @@ class ::Array < `Array`
   def include?(member)
     %x{
       for (var i = 0, length = self.length; i < length; i++) {
-        if (#{`self[i]` == member}) {
+        if ($eqeq(self[i], member)) {
           return true;
         }
       }

data/opal/corelib/basic_object.rb

@@ -63,7 +63,7 @@ class ::BasicObject
       ::Kernel.raise ::ArgumentError, 'wrong number of arguments (0 for 1..3)' unless (1..3).cover? args.size
 
       string, file, _lineno = *args
-      default_eval_options = { file: (file || '(eval)'), eval: true }
+      default_eval_options = { file: file || '(eval)', eval: true }
       compiling_options = __OPAL_COMPILER_CONFIG__.merge(default_eval_options)
       compiled = ::Opal.compile string, compiling_options
       block = ::Kernel.proc do

data/opal/corelib/constants.rb

@@ -1,9 +1,9 @@
 ::RUBY_PLATFORM       = 'opal'
 ::RUBY_ENGINE         = 'opal'
 ::RUBY_VERSION        = '3.2.0'
-::RUBY_ENGINE_VERSION = '1.8.1'
-::RUBY_RELEASE_DATE   = '2023-11-09'
+::RUBY_ENGINE_VERSION = '1.8.3.rc1'
+::RUBY_RELEASE_DATE   = '2024-08-08'
 ::RUBY_PATCHLEVEL     = 0
 ::RUBY_REVISION       = '0'
-::RUBY_COPYRIGHT      = 'opal - Copyright (C) 2011-2023 Adam Beynon and the Opal contributors'
+::RUBY_COPYRIGHT      = 'opal - Copyright (C) 2011-2024 Adam Beynon and the Opal contributors'
 ::RUBY_DESCRIPTION    = "opal #{::RUBY_ENGINE_VERSION} (#{::RUBY_RELEASE_DATE} revision #{::RUBY_REVISION})"

data/opal/corelib/error.rb

@@ -326,7 +326,22 @@ class ::LocalJumpError
   end
 end
 
+module ::Opal
+  module Raw
+    class Error
+    end
+  end
+end
+
 module ::JS
-  class Error
+  def self.const_missing(const)
+    if const == :Error
+      warn '[Opal] JS::Error class has been renamed to Opal::Raw::Error and will change semantics in Opal 2.1. ' \
+           'To ensure forward compatibility, please update your rescue clauses.'
+
+      ::JS::Raw::Error
+    else
+      super
+    end
   end
 end

data/opal/corelib/hash.rb

@@ -127,7 +127,7 @@ class ::Hash < `Map`
 
     result = true
 
-    other.each do |other_key, other_val|
+    other.each do |other_key, other_val| # rubocop:disable Style/HashEachMethods
       val = fetch(other_key, `null`)
 
       %x{

data/opal/corelib/io.rb

@@ -157,7 +157,7 @@ class ::IO
     end while data = sysread_noraise(sep == '' ? 65_536 : 1)
 
     unless ret
-      ret, @read_buffer = (@read_buffer || ''), ''
+      ret, @read_buffer = @read_buffer || '', ''
       ret = nil if ret == ''
     end
 

data/opal/corelib/module.rb

@@ -581,7 +581,7 @@ class ::Module
       ::Kernel.raise ::ArgumentError, 'wrong number of arguments (0 for 1..3)' unless (1..3).cover? args.size
 
       string, file, _lineno = *args
-      default_eval_options = { file: (file || '(eval)'), eval: true }
+      default_eval_options = { file: file || '(eval)', eval: true }
       compiling_options = __OPAL_COMPILER_CONFIG__.merge(default_eval_options)
       compiled = ::Opal.compile string, compiling_options
       block = ::Kernel.proc do

data/opal/corelib/object_space.rb

@@ -55,7 +55,7 @@ module ::ObjectSpace
   end
 
   def undefine_finalizer(obj)
-    %{
+    %x{
       var id = #{obj.__id__};
       registry.unregister(obj);
       delete_callers(id);

data/opal/corelib/runtime.js

@@ -1747,7 +1747,7 @@
           return result;
         }
       }
-      else if (candidate === Opal.JS.Error || candidate['$==='](exception)) {
+      else if ((Opal.Opal.Raw && candidate === Opal.Opal.Raw.Error) || candidate['$==='](exception)) {
         return candidate;
       }
     }
@@ -2403,7 +2403,7 @@
       }
 
       var objects = keys.get(key_hash),
-          objects_copy = $slice(objects),
+          objects_copy = (objects.length === 1) ? objects : $slice(objects),
           object;
 
       for (var i=0; i<objects_copy.length; i++) {

data/opal/corelib/string/encoding.rb

@@ -75,16 +75,16 @@ class ::Encoding
 
   def each_char(string, &block)
     %x{
-      var low_surrogate = "";
+      var high_surrogate = "";
       for (var i = 0, length = string.length; i < length; i++) {
         var charcode = string.charCodeAt(i);
         var chr = string.charAt(i);
-        if (charcode >= 0xDC00 && charcode <= 0xDFFF) {
-          low_surrogate = chr;
+        if (charcode >= 0xD800 && charcode <= 0xDBFF) {
+          high_surrogate = chr;
           continue;
         }
-        else if (charcode >= 0xD800 && charcode <= 0xDBFF) {
-          chr = low_surrogate + chr;
+        else if (charcode >= 0xDC00 && charcode <= 0xDFFF) {
+          chr = high_surrogate + chr;
         }
         if (string.encoding.name != "UTF-8") {
           chr = new String(chr);
@@ -400,7 +400,7 @@ class ::String
   end
 
   def initialize_copy(other)
-    %{
+    %x{
       self.encoding = other.encoding;
       self.internal_encoding = other.internal_encoding;
     }

data/opal/corelib/string.rb

@@ -724,7 +724,7 @@ class ::String < `String`
   end
 
   def lstrip
-    `self.replace(/^[\u0000\s]*/, '')`
+    `self.replace(/^[\x00\x09\x0a-\x0d\x20]*/, '')`
   end
 
   def ascii_only?
@@ -1023,7 +1023,7 @@ class ::String < `String`
   end
 
   def rstrip
-    `self.replace(/[\s\u0000]*$/, '')`
+    `self.replace(/[\x00\x09\x0a-\x0d\x20]*$/, '')`
   end
 
   def scan(pattern, no_matchdata: false, &block)
@@ -1201,7 +1201,7 @@ class ::String < `String`
   end
 
   def strip
-    `self.replace(/^[\s\u0000]*|[\s\u0000]*$/g, '')`
+    `self.replace(/^[\x00\x09\x0a-\x0d\x20]*|[\x00\x09\x0a-\x0d\x20]*$/g, '')`
   end
 
   def sub(pattern, replacement = undefined, &block)

data/opal.gemspec

@@ -34,6 +34,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.3'
 
   spec.add_dependency 'ast', '>= 2.3.0'
+  spec.add_dependency 'base64', '>= 0.2.0'
   spec.add_dependency 'parser', ['~> 3.0', '>= 3.0.3.2']
 
   spec.add_development_dependency 'sourcemap', '~> 0.1.0'
@@ -44,7 +45,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rack-test'
   spec.add_development_dependency 'selenium-webdriver'
   spec.add_development_dependency 'benchmark-ips', '< 2.8'
-  spec.add_development_dependency 'sinatra', '~> 3.0'
+  spec.add_development_dependency 'sinatra', '~> 3.2'
   spec.add_development_dependency 'rubocop', '~> 1.50'
   spec.add_development_dependency 'rubocop-performance', '~> 1.1'
   spec.add_development_dependency 'rack', '~> 2.2'

data/spec/lib/compiler_spec.rb

@@ -487,7 +487,7 @@ RSpec.describe Opal::Compiler do
       options = options.merge(eval: true)
       warnings_number = 0
       compiler = Opal::Compiler.new(code, options)
-      allow(compiler).to receive(:warning) { warnings_number += 1}
+      allow(compiler).to receive(:warning) { warnings_number += 1 }
       compiler.compile
       expect(warnings_number)
     end
@@ -644,12 +644,12 @@ RSpec.describe Opal::Compiler do
       it 'adds the file and line to the backtrace' do
         error = nil
         begin
-          compiled('BEGIN {}', file: 'foobar.js.rb')
+          compiled('BEGIN {}', file: "#{File.basename(__FILE__)}/foobar.js.rb")
         rescue Opal::SyntaxError => syntax_error
           error = syntax_error
         end
 
-        expect(error.backtrace[0]).to eq("foobar.js.rb:in `BEGIN {}'")
+        expect(error.backtrace[0]).to eq("#{File.basename(__FILE__)}/foobar.js.rb:in `BEGIN {}'")
         expect(compiler_backtrace(error)[0]).to end_with(":in `error'")
         expect(compiler_backtrace(error)[-3]).to end_with(":in `block in compile'")
         expect(compiler_backtrace(error)[-1]).to end_with(":in `compile'")
@@ -660,14 +660,21 @@ RSpec.describe Opal::Compiler do
     context 'at parse time' do
       it 'adds the file and line to the backtrace' do
         error = nil
+
         begin
-          parsed('def foo', file: 'foobar.js.rb')
+          parsed('def foo', file: "#{File.basename(__FILE__)}/foobar.js.rb")
         rescue Opal::SyntaxError => syntax_error
           error = syntax_error
         end
-        expect(error.backtrace[0]).to eq("foobar.js.rb:1:in `def foo'")
+        expect(error.backtrace[0]).to eq("#{File.basename(__FILE__)}/foobar.js.rb:1:in `def foo'")
         expect(compiler_backtrace(error)[0]).to end_with(":in `block in parse'")
         expect(error.backtrace.size).to be > 1
+
+        expect($diagnostic_messages.flatten).to eq([
+          "#{File.basename(__FILE__)}/foobar.js.rb:1:8: error: unexpected token $end",
+          "#{File.basename(__FILE__)}/foobar.js.rb:1: def foo",
+          "#{File.basename(__FILE__)}/foobar.js.rb:1:        ",
+        ])
       end
     end
 
@@ -707,7 +714,10 @@ RSpec.describe Opal::Compiler do
   end
 
   def compiled(code, options = compiler_options)
-    Opal::Compiler.new(code, options).compile
+    compiler = Opal::Compiler.new(code, options)
+    @compiler_warnings = []
+    allow(compiler).to receive(:warning) { |*args| @compiler_warnings << args }
+    compiler.compile
   end
 
   def parsed(code, options = compiler_options)

data/spec/lib/fixtures/build_order/file5.rb.erb

@@ -1,4 +1,4 @@
 # Try loading a file with an absolute path.
-require "<%= p __dir__.inspect[1..-2] %>/file51.js"
+require "<%= __dir__.inspect[1..-2] %>/file51.js"
 
 FILE_5 = true