Skip to content

Commit 0549611

Browse files
authored
Merge pull request opal#1543 from opal/elia/extract-sprockets
extract sprockets to opal-sprockets gem
2 parents e1ca27a + 284b9b0 commit 0549611

22 files changed

+21
-947
lines changed

.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ matrix:
2424
- rvm: 2.3.1
2525
env: RUN=mspec_ruby_nodejs TZ="/usr/share/zoneinfo/Pacific/Fiji"
2626

27-
- rvm: 2.3.1
28-
env: RUN=mspec_ruby_sprockets_phantomjs
27+
# - rvm: 2.3.1
28+
# env: RUN=mspec_ruby_sprockets_phantomjs
2929

3030
- rvm: 2.3.1
3131
env: RUN=minitest

CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,15 @@ Whitespace conventions:
6161
* `Number#positive?` (to return false for 0)
6262

6363

64+
### Deprecated
65+
66+
- `require 'opal/server` and `Opal::Server` are deprecated in favor of `require 'opal/sprockets/server'` and `Opal::Sprockets::Server` (now part of the opal-sprockets gem).
67+
68+
6469
### Removed
6570

6671
- Removed `yaml` from stdlib, the older implementation was only available for NodeJS and not tested. Replace with `require 'nodejs/yaml'`
72+
- Extracted sprockets support to `opal-sprockets` which should allow for wider support and less coupling (e.g. the `opal` gem will now be able to improve the compiler without worrying about `sprockets` updates). All the old behavior is preserved except for `Opal::Server` that has become `Opal::Sprockets::Server` (see Deprecated section above).
6773

6874

6975
### Fixed

lib/opal.rb

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1+
require 'opal/config'
12
require 'opal/compiler'
23
require 'opal/builder'
34
require 'opal/erb'
4-
require 'opal/sprockets'
55
require 'opal/paths'
66
require 'opal/version'
77
require 'opal/errors'
8+
require 'opal/source_map'
89

910
# Opal is a ruby to javascript compiler, with a runtime for running
1011
# in any JavaScript environment.
1112
module Opal
13+
autoload :Server, 'opal/server'
1214
end

lib/opal/server.rb

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
warn "DEPRECATED: `require 'opal/server` and `Opal::Server` are deprecated in favor of `require 'opal/sprockets/server'` and `Opal::Sprockets::Server` (now part of the opal-sprockets gem)."
2+
require 'opal/sprockets/server'
3+
Opal::Server = Opal::Sprockets::Server

lib/opal/sprockets.rb

-91
This file was deleted.

lib/opal/sprockets/environment.rb

-23
This file was deleted.

lib/opal/sprockets/erb.rb

-23
This file was deleted.

lib/opal/sprockets/path_reader.rb

-36
This file was deleted.

lib/opal/sprockets/processor.rb

-145
This file was deleted.

0 commit comments

Comments
 (0)