From e1d3ee1c7d221826e290c494d85d7f34a80ab062 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20O=E2=80=99Shannessy?= Date: Fri, 25 Jul 2014 13:36:22 -0700 Subject: [PATCH 01/14] v0.11.1.0, using React v0.11.1 I'm skipping React v0.11.0 since it included several bugs. We didn't ship react-rails right away, so it should be find to skip. --- lib/react/rails/version.rb | 2 +- react-rails.gemspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/react/rails/version.rb b/lib/react/rails/version.rb index 968450111..b29940775 100644 --- a/lib/react/rails/version.rb +++ b/lib/react/rails/version.rb @@ -2,7 +2,7 @@ module React module Rails # Version numbers will track react-source, but we'll add another level so # that we can increment, but have some amount of stability. - VERSION = '0.10.0.0' + VERSION = '0.11.1.0' end end diff --git a/react-rails.gemspec b/react-rails.gemspec index c341ed92e..370fbdd91 100644 --- a/react-rails.gemspec +++ b/react-rails.gemspec @@ -20,7 +20,7 @@ Gem::Specification.new do |s| s.add_dependency 'execjs' s.add_dependency 'rails', '>= 3.1' - s.add_dependency 'react-source', '0.10.0' + s.add_dependency 'react-source', '0.11.1' s.files = Dir[ 'lib/**/*', From f89c7690873165aa4aa0f3eb4a26712af29ffe00 Mon Sep 17 00:00:00 2001 From: Griffin Smith Date: Mon, 18 Aug 2014 10:45:12 -0400 Subject: [PATCH 02/14] Point to 0.11 in README on 0.11 branch --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6f8a128a4..eaff6a34d 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ As with all gem dependencies, we strongly recommend adding `react-rails` to your ```ruby # Gemfile -gem 'react-rails', '~> 0.10.0.0' +gem 'react-rails', '~> 0.11.0.0' ``` From ad54110a98f6d4aee0abd38330d34cf5ab5f9258 Mon Sep 17 00:00:00 2001 From: William Meleyal Date: Tue, 9 Sep 2014 15:06:00 +0200 Subject: [PATCH 03/14] update readme with latest gem version, fixes #86 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index eaff6a34d..8ab33d23a 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ As with all gem dependencies, we strongly recommend adding `react-rails` to your ```ruby # Gemfile -gem 'react-rails', '~> 0.11.0.0' +gem 'react-rails', '~> 0.11.1.0' ``` From 25b9897fa6af705397f6e6a65a37581b80538130 Mon Sep 17 00:00:00 2001 From: Graham Ramsey Date: Tue, 28 Oct 2014 18:11:11 -0400 Subject: [PATCH 04/14] update to react-source 0.12 final (cherry picked from commit 2ebce5633b1a1e61481f6c84377e83bb2bb91100) Conflicts: react-rails.gemspec --- react-rails.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/react-rails.gemspec b/react-rails.gemspec index 370fbdd91..8e77e3ad0 100644 --- a/react-rails.gemspec +++ b/react-rails.gemspec @@ -20,7 +20,7 @@ Gem::Specification.new do |s| s.add_dependency 'execjs' s.add_dependency 'rails', '>= 3.1' - s.add_dependency 'react-source', '0.11.1' + s.add_dependency 'react-source', '0.12' s.files = Dir[ 'lib/**/*', From 90bb9806ae4b2f455ffaffd903c265e7d3ad8471 Mon Sep 17 00:00:00 2001 From: Graham Ramsey Date: Tue, 28 Oct 2014 18:47:19 -0400 Subject: [PATCH 05/14] update docs and test examples for changes in 0.12 (cherry picked from commit 4e81aff6250cd6a5bb71f65320accce331e01b80) Conflicts: README.md test/dummy/app/assets/javascripts/components/Todo.js.jsx.coffee test/dummy/app/assets/javascripts/components/TodoList.js.jsx test/dummy/app/assets/javascripts/example3.js.jsx test/helper_files/TodoListWithUpdates.js.jsx test/jsxtransform_test.rb test/react_renderer_test.rb --- README.md | 4 +--- test/dummy/app/assets/javascripts/example.js.jsx | 1 - .../assets/javascripts/example2.js.jsx.coffee | 2 -- test/jsxtransform_test.rb | 16 ++++------------ 4 files changed, 5 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 8ab33d23a..4e7ecc5d0 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ Alternatively, you can include it directly as a separate script tag: ### JSX -To transform your JSX into JS, simply create `.js.jsx` files, and ensure that the file has the `/** @jsx React.DOM */` docblock. These files will be transformed on request, or precompiled as part of the `assets:precompile` task. +To transform your JSX into JS, simply create `.js.jsx` files. These files will be transformed on request, or precompiled as part of the `assets:precompile` task. ## Configuring @@ -83,8 +83,6 @@ end It is possible to use JSX with CoffeeScript. The caveat is that you will still need to include the docblock. Since CoffeeScript doesn't allow `/* */` style comments, we need to do something a little different. We also need to embed JSX inside backticks so CoffeeScript ignores the syntax it doesn't understand. Here's an example: ```coffee -###* @jsx React.DOM ### - Component = React.createClass render: -> `` diff --git a/test/dummy/app/assets/javascripts/example.js.jsx b/test/dummy/app/assets/javascripts/example.js.jsx index 2611211ae..5becf72d5 100644 --- a/test/dummy/app/assets/javascripts/example.js.jsx +++ b/test/dummy/app/assets/javascripts/example.js.jsx @@ -1,2 +1 @@ -/** @jsx React.DOM */
; diff --git a/test/dummy/app/assets/javascripts/example2.js.jsx.coffee b/test/dummy/app/assets/javascripts/example2.js.jsx.coffee index 6bb2e5528..1bdfe5594 100644 --- a/test/dummy/app/assets/javascripts/example2.js.jsx.coffee +++ b/test/dummy/app/assets/javascripts/example2.js.jsx.coffee @@ -1,5 +1,3 @@ -###* @jsx React.DOM ### - Component = React.createClass render: -> `` diff --git a/test/jsxtransform_test.rb b/test/jsxtransform_test.rb index c1479fa95..33f7d75d1 100644 --- a/test/jsxtransform_test.rb +++ b/test/jsxtransform_test.rb @@ -2,21 +2,16 @@ # The transformer is inserting a newline after the docblock for some reason... EXPECTED_JS = < Date: Tue, 28 Oct 2014 22:20:32 -0400 Subject: [PATCH 06/14] fix deprecated calls and provide expected messages for 0.12 (cherry picked from commit 359cfbb7479ef1e5627561297e0dfaa991a8c679) Conflicts: gemfiles/rails_4.1.gemfile lib/assets/javascripts/react_ujs.js lib/react/renderer.rb test/react_renderer_test.rb --- gemfiles/rails_3.1.gemfile | 2 +- gemfiles/rails_3.2.gemfile | 2 +- gemfiles/rails_4.0.gemfile | 2 +- gemfiles/rails_4.0_with_therubyracer.gemfile | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gemfiles/rails_3.1.gemfile b/gemfiles/rails_3.1.gemfile index 58db7a878..fac5a109b 100644 --- a/gemfiles/rails_3.1.gemfile +++ b/gemfiles/rails_3.1.gemfile @@ -4,4 +4,4 @@ source "http://rubygems.org" gem "rails", "~> 3.1" -gemspec :path=>"../" \ No newline at end of file +gemspec :path => "../" diff --git a/gemfiles/rails_3.2.gemfile b/gemfiles/rails_3.2.gemfile index 779ce7c6e..0b2047cf5 100644 --- a/gemfiles/rails_3.2.gemfile +++ b/gemfiles/rails_3.2.gemfile @@ -4,4 +4,4 @@ source "http://rubygems.org" gem "rails", "~> 3.2" -gemspec :path=>"../" \ No newline at end of file +gemspec :path => "../" diff --git a/gemfiles/rails_4.0.gemfile b/gemfiles/rails_4.0.gemfile index d54014891..a3fdee2c0 100644 --- a/gemfiles/rails_4.0.gemfile +++ b/gemfiles/rails_4.0.gemfile @@ -4,4 +4,4 @@ source "http://rubygems.org" gem "rails", "~> 4.0" -gemspec :path=>"../" \ No newline at end of file +gemspec :path => "../" diff --git a/gemfiles/rails_4.0_with_therubyracer.gemfile b/gemfiles/rails_4.0_with_therubyracer.gemfile index ce64ea2ce..a8f5be006 100644 --- a/gemfiles/rails_4.0_with_therubyracer.gemfile +++ b/gemfiles/rails_4.0_with_therubyracer.gemfile @@ -3,6 +3,6 @@ source "http://rubygems.org" gem "rails", "~> 4.0" -gem "therubyracer", "0.12.0", :platform=>:mri +gem "therubyracer", "0.12.0", :platform => :mri -gemspec :path=>"../" \ No newline at end of file +gemspec :path => "../" From 3ecc42b7451f350d6c182846e7f95dc0e5c9fe3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20O=E2=80=99Shannessy?= Date: Thu, 6 Nov 2014 15:25:08 -0800 Subject: [PATCH 07/14] Update README for 0.12 branch --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4e7ecc5d0..97d46d33c 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ As with all gem dependencies, we strongly recommend adding `react-rails` to your ```ruby # Gemfile -gem 'react-rails', '~> 0.11.1.0' +gem 'react-rails', '~> 0.12.0.0' ``` @@ -80,7 +80,7 @@ end ## CoffeeScript -It is possible to use JSX with CoffeeScript. The caveat is that you will still need to include the docblock. Since CoffeeScript doesn't allow `/* */` style comments, we need to do something a little different. We also need to embed JSX inside backticks so CoffeeScript ignores the syntax it doesn't understand. Here's an example: +It is possible to use JSX with CoffeeScript. We need to embed JSX inside backticks so CoffeeScript ignores the syntax it doesn't understand. Here's an example: ```coffee Component = React.createClass From a50fc7072d91f1640b5b15c3562ea171badd0591 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20O=E2=80=99Shannessy?= Date: Thu, 6 Nov 2014 15:25:47 -0800 Subject: [PATCH 08/14] Bump version for 0.12.0.0 --- lib/react/rails/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/react/rails/version.rb b/lib/react/rails/version.rb index b29940775..54eac9dc8 100644 --- a/lib/react/rails/version.rb +++ b/lib/react/rails/version.rb @@ -2,7 +2,7 @@ module React module Rails # Version numbers will track react-source, but we'll add another level so # that we can increment, but have some amount of stability. - VERSION = '0.11.1.0' + VERSION = '0.12.0.0' end end From 96b98ebde101056a994f547c4b806eb7c350df69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20O=E2=80=99Shannessy?= Date: Mon, 8 Dec 2014 14:34:50 -0800 Subject: [PATCH 09/14] Use react-source@0.12.1 --- react-rails.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/react-rails.gemspec b/react-rails.gemspec index 8e77e3ad0..a8b26bb05 100644 --- a/react-rails.gemspec +++ b/react-rails.gemspec @@ -20,7 +20,7 @@ Gem::Specification.new do |s| s.add_dependency 'execjs' s.add_dependency 'rails', '>= 3.1' - s.add_dependency 'react-source', '0.12' + s.add_dependency 'react-source', '0.12.1' s.files = Dir[ 'lib/**/*', From a3b4ddc9aed285e1236aa78a4b01e9da51f24234 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20O=E2=80=99Shannessy?= Date: Mon, 8 Dec 2014 14:35:03 -0800 Subject: [PATCH 10/14] v0.12.1.0 --- lib/react/rails/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/react/rails/version.rb b/lib/react/rails/version.rb index 54eac9dc8..7a01a3b49 100644 --- a/lib/react/rails/version.rb +++ b/lib/react/rails/version.rb @@ -2,7 +2,7 @@ module React module Rails # Version numbers will track react-source, but we'll add another level so # that we can increment, but have some amount of stability. - VERSION = '0.12.0.0' + VERSION = '0.12.1.0' end end From e9ac34c44d2f88a236082f28f4e4c82a1dcfa494 Mon Sep 17 00:00:00 2001 From: Jordan Stephens Date: Fri, 2 Jan 2015 14:02:34 -0500 Subject: [PATCH 11/14] upgrade react-source to 0.12.2 --- react-rails.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/react-rails.gemspec b/react-rails.gemspec index a8b26bb05..43a1b95cb 100644 --- a/react-rails.gemspec +++ b/react-rails.gemspec @@ -20,7 +20,7 @@ Gem::Specification.new do |s| s.add_dependency 'execjs' s.add_dependency 'rails', '>= 3.1' - s.add_dependency 'react-source', '0.12.1' + s.add_dependency 'react-source', '0.12.2' s.files = Dir[ 'lib/**/*', From a80d91782a9c88838bb55a82e7cfc77ab8586fae Mon Sep 17 00:00:00 2001 From: Jordan Stephens Date: Fri, 2 Jan 2015 14:04:13 -0500 Subject: [PATCH 12/14] expect double-quoted displayName in transformed JSX after facebook/react@eddbb0c --- test/jsxtransform_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/jsxtransform_test.rb b/test/jsxtransform_test.rb index 33f7d75d1..8702f7c10 100644 --- a/test/jsxtransform_test.rb +++ b/test/jsxtransform_test.rb @@ -9,7 +9,7 @@ (function() { var Component; - Component = React.createClass({displayName: 'Component', + Component = React.createClass({displayName: "Component", render: function() { return React.createElement(ExampleComponent, {videos:this.props.videos} ); } From 4adbe403340f5944474d995a04cc8376c50cfb61 Mon Sep 17 00:00:00 2001 From: Jordan Stephens Date: Mon, 5 Jan 2015 18:37:21 -0500 Subject: [PATCH 13/14] use full path in integration tests looks like this is required after updating to actionpack 4.2.0 See change made in this commit: https://github.com/rails/rails/commit/4fd144dd4bb0e1ede5a4857c178138088353a3d1?diff=unified#diff-82ecef623242ece0e7d717577485d988L303 --- test/jsxtransform_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/jsxtransform_test.rb b/test/jsxtransform_test.rb index 8702f7c10..16b48a352 100644 --- a/test/jsxtransform_test.rb +++ b/test/jsxtransform_test.rb @@ -21,13 +21,13 @@ class JSXTransformTest < ActionDispatch::IntegrationTest test 'asset pipeline should transform JSX' do - get 'assets/example.js' + get '/assets/example.js' assert_response :success assert_equal EXPECTED_JS, @response.body end test 'asset pipeline should transform JSX + Coffeescript' do - get 'assets/example2.js' + get '/assets/example2.js' assert_response :success # Different coffee-script may generate slightly different outputs, # as some version inserts an extra "\n" at the beginning. From f5a0981897349c151ff321d7926b4b620bb4802e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20O=E2=80=99Shannessy?= Date: Mon, 5 Jan 2015 16:07:02 -0800 Subject: [PATCH 14/14] v0.12.2.0 --- lib/react/rails/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/react/rails/version.rb b/lib/react/rails/version.rb index 7a01a3b49..ef8be86c9 100644 --- a/lib/react/rails/version.rb +++ b/lib/react/rails/version.rb @@ -2,7 +2,7 @@ module React module Rails # Version numbers will track react-source, but we'll add another level so # that we can increment, but have some amount of stability. - VERSION = '0.12.1.0' + VERSION = '0.12.2.0' end end pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy