Skip to content

Commit 9565736

Browse files
author
KAWACHI Takashi
committed
Use typescript-node gem
1 parent 49cf79d commit 9565736

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<%= TypeScript::Source.contents %>
1+
<%= TypeScript::Src.js_content %>

lib/typescript-rails.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
require "typescript"
1+
require "typescript-node"
22
require "typescript/rails/railtie"
33
require "typescript/rails/engine"
44
require "typescript/rails/template_handler"

lib/typescript/rails/template_handler.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def prepare
4141
end
4242

4343
def evaluate(scope, locals, &block)
44-
@output ||= TypeScript.compile(data, options)
44+
@output ||= TypeScript::Node.compile(data)
4545
end
4646

4747
def allows_script?
@@ -51,13 +51,13 @@ def allows_script?
5151

5252
class TemplateHandler
5353

54-
def self.erb_handler
54+
def self.erb_handler
5555
@@erb_handler ||= ActionView::Template.registered_template_handler(:erb)
5656
end
5757

5858
def self.call(template)
5959
compiled_source = erb_handler.call(template)
60-
"TypeScript.compile(begin;#{compiled_source};end)"
60+
"TypeScript::Node.compile(begin;#{compiled_source};end)"
6161
end
6262
end
6363
end

test/template_handler_test.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ def app
2121
test "typescript views are served as javascript" do
2222
get "/site/index.js"
2323

24-
assert_match "var x = 5;\n", last_response.body
24+
assert_match "var x = 5;\r\n", last_response.body
2525
end
26-
end
26+
end

typescript-rails.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
1616

1717
gem.rubyforge_project = "typescript-rails"
1818

19-
gem.add_runtime_dependency 'typescript', '~> 0.1.1'
19+
gem.add_runtime_dependency 'typescript-node', '~> 0.0.1'
2020
gem.add_runtime_dependency 'tilt', '~> 1.3'
2121
gem.add_runtime_dependency 'railties'
2222

0 commit comments

Comments
 (0)