react_on_rails 11.1.4 → 12.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (114) hide show
  1. checksums.yaml +4 -4
  2. data/.circleci/config.yml +320 -0
  3. data/.eslintignore +2 -1
  4. data/.eslintrc +30 -2
  5. data/.github/FUNDING.yml +1 -0
  6. data/.gitignore +3 -1
  7. data/.prettierignore +10 -0
  8. data/.prettierrc +23 -0
  9. data/.release-it.json +3 -0
  10. data/.rubocop.yml +37 -11
  11. data/.travis.yml +10 -20
  12. data/CHANGELOG.md +126 -4
  13. data/CONTRIBUTING.md +61 -80
  14. data/Gemfile +3 -5
  15. data/KUDOS.md +4 -1
  16. data/REACT-ON-RAILS-PRO-LICENSE +95 -0
  17. data/README.md +148 -89
  18. data/Rakefile +0 -7
  19. data/SUMMARY.md +12 -12
  20. data/book.json +5 -5
  21. data/docs/additional-reading/asset-pipeline.md +8 -16
  22. data/docs/additional-reading/images.md +1 -1
  23. data/docs/additional-reading/rails_view_rendering_from_inline_javascript.md +2 -1
  24. data/docs/additional-reading/react-helmet.md +30 -10
  25. data/docs/additional-reading/react-router.md +52 -75
  26. data/docs/additional-reading/server-rendering-tips.md +12 -7
  27. data/docs/additional-reading/upgrade-webpacker-v3-to-v4.md +10 -0
  28. data/docs/api/javascript-api.md +3 -3
  29. data/docs/api/redux-store-api.md +4 -2
  30. data/docs/api/view-helpers-api.md +17 -14
  31. data/docs/basics/client-vs-server-rendering.md +8 -2
  32. data/docs/basics/configuration.md +87 -73
  33. data/docs/basics/deployment.md +2 -4
  34. data/docs/basics/generator-details.md +1 -1
  35. data/docs/basics/heroku-deployment.md +24 -0
  36. data/docs/basics/hmr-and-hot-reloading-with-the-webpack-dev-server.md +49 -0
  37. data/docs/basics/i18n.md +45 -23
  38. data/docs/basics/installation-into-an-existing-rails-app.md +4 -9
  39. data/docs/basics/minitest-configuration.md +31 -0
  40. data/docs/basics/react-server-rendering.md +3 -1
  41. data/docs/basics/recommended-project-structure.md +21 -15
  42. data/docs/basics/{generator-functions-and-railscontext.md → render-functions-and-railscontext.md} +59 -21
  43. data/docs/basics/rspec-configuration.md +29 -18
  44. data/docs/basics/upgrading-react-on-rails.md +74 -3
  45. data/docs/basics/webpack-configuration.md +29 -8
  46. data/docs/contributor-info/errors-with-hooks.md +45 -0
  47. data/docs/contributor-info/pull-requests.md +44 -0
  48. data/docs/misc/doctrine.md +1 -1
  49. data/docs/{misc-pending → outdated}/code-splitting.md +13 -9
  50. data/docs/{basics → outdated}/how-react-on-rails-works.md +8 -4
  51. data/docs/{misc-pending → outdated}/manual-installation-overview.md +5 -5
  52. data/docs/{additional-reading → outdated}/rails-assets-relative-paths.md +3 -3
  53. data/docs/{misc-pending → outdated}/rails-assets.md +2 -12
  54. data/docs/testimonials/hvmn.md +25 -0
  55. data/docs/testimonials/resortpass.md +13 -0
  56. data/docs/testimonials/testimonials.md +28 -0
  57. data/docs/tutorial.md +182 -44
  58. data/jest.config.js +4 -0
  59. data/lib/generators/react_on_rails/base_generator.rb +2 -2
  60. data/lib/generators/react_on_rails/dev_tests_generator.rb +2 -1
  61. data/lib/generators/react_on_rails/generator_helper.rb +4 -6
  62. data/lib/generators/react_on_rails/install_generator.rb +2 -0
  63. data/lib/generators/react_on_rails/templates/base/base/Procfile.dev +3 -1
  64. data/lib/generators/react_on_rails/templates/base/base/Procfile.dev-hmr +26 -0
  65. data/lib/generators/react_on_rails/templates/base/base/app/javascript/bundles/HelloWorld/components/HelloWorld.jsx +20 -40
  66. data/lib/generators/react_on_rails/templates/base/base/config/initializers/react_on_rails.rb +4 -1
  67. data/lib/generators/react_on_rails/templates/redux/base/app/javascript/bundles/HelloWorld/components/HelloWorld.jsx +4 -8
  68. data/lib/generators/react_on_rails/templates/redux/base/app/javascript/bundles/HelloWorld/store/helloWorldStore.js +1 -3
  69. data/lib/react_on_rails/configuration.rb +60 -29
  70. data/lib/react_on_rails/error.rb +2 -0
  71. data/lib/react_on_rails/git_utils.rb +2 -0
  72. data/lib/react_on_rails/helper.rb +110 -159
  73. data/lib/react_on_rails/json_output.rb +1 -1
  74. data/lib/react_on_rails/json_parse_error.rb +2 -0
  75. data/lib/react_on_rails/locales/base.rb +150 -0
  76. data/lib/react_on_rails/locales/to_js.rb +37 -0
  77. data/lib/react_on_rails/locales/to_json.rb +27 -0
  78. data/lib/react_on_rails/prerender_error.rb +11 -15
  79. data/lib/react_on_rails/react_component/render_options.rb +4 -0
  80. data/lib/react_on_rails/server_rendering_js_code.rb +42 -0
  81. data/lib/react_on_rails/server_rendering_pool/ruby_embedded_java_script.rb +85 -60
  82. data/lib/react_on_rails/test_helper/ensure_assets_compiled.rb +7 -8
  83. data/lib/react_on_rails/test_helper/webpack_assets_compiler.rb +17 -0
  84. data/lib/react_on_rails/utils.rb +19 -20
  85. data/lib/react_on_rails/version.rb +1 -1
  86. data/lib/react_on_rails/version_checker.rb +5 -1
  87. data/lib/react_on_rails/webpacker_utils.rb +27 -2
  88. data/lib/react_on_rails.rb +4 -1
  89. data/lib/tasks/assets.rake +33 -46
  90. data/lib/tasks/locale.rake +4 -2
  91. data/package-scripts.yml +49 -0
  92. data/package.json +41 -31
  93. data/rakelib/dummy_apps.rake +1 -9
  94. data/rakelib/example_type.rb +3 -1
  95. data/rakelib/examples.rake +3 -0
  96. data/rakelib/lint.rake +2 -7
  97. data/rakelib/node_package.rake +2 -2
  98. data/rakelib/release.rake +3 -8
  99. data/rakelib/run_rspec.rake +5 -18
  100. data/react_on_rails.gemspec +4 -5
  101. data/tsconfig.json +14 -0
  102. data/webpackConfigLoader.js +5 -4
  103. data/yarn.lock +7177 -2311
  104. metadata +54 -55
  105. data/Gemfile.rails32 +0 -74
  106. data/docs/additional-reading/babel.md +0 -5
  107. data/docs/additional-reading/heroku-deployment.md +0 -92
  108. data/docs/additional-reading/hot-reloading-rails-development.md +0 -57
  109. data/docs/api/ruby-api-hot-reload-view-helpers.md +0 -44
  110. data/docs/testimonials.md +0 -11
  111. data/lib/generators/react_on_rails/templates/base/base/Procfile.dev-server +0 -12
  112. data/lib/react_on_rails/assets_precompile.rb +0 -150
  113. data/lib/react_on_rails/locales_to_js.rb +0 -134
  114. /data/docs/{misc → outdated}/rails3.md +0 -0
@@ -5,7 +5,8 @@ module ReactOnRails
5
5
  # against each otherat runtime.
6
6
  class VersionChecker
7
7
  attr_reader :node_package_version
8
- MAJOR_MINOR_PATCH_VERSION_REGEX = /(\d+)\.(\d+)\.(\d+)/
8
+
9
+ MAJOR_MINOR_PATCH_VERSION_REGEX = /(\d+)\.(\d+)\.(\d+)/.freeze
9
10
 
10
11
  def self.build
11
12
  new(NodePackageVersion.build)
@@ -20,6 +21,7 @@ module ReactOnRails
20
21
  # warning if they do not.
21
22
  def raise_if_gem_and_node_package_versions_differ
22
23
  return if node_package_version.relative_path?
24
+
23
25
  node_major_minor_patch = node_package_version.major_minor_patch
24
26
  gem_major_minor_patch = gem_major_minor_patch_version
25
27
  versions_match = node_major_minor_patch[0] == gem_major_minor_patch[0] &&
@@ -99,10 +101,12 @@ module ReactOnRails
99
101
 
100
102
  def major_minor_patch
101
103
  return if relative_path?
104
+
102
105
  match = raw.match(MAJOR_MINOR_PATCH_VERSION_REGEX)
103
106
  unless match
104
107
  raise ReactOnRails::Error, "Cannot parse version number '#{raw}' (wildcard versions are not supported)"
105
108
  end
109
+
106
110
  [match[1], match[2], match[3]]
107
111
  end
108
112
 
@@ -1,17 +1,41 @@
1
+ # frozen_string_literal: true
2
+
1
3
  module ReactOnRails
2
4
  module WebpackerUtils
3
5
  def self.using_webpacker?
4
6
  ReactOnRails::Utils.gem_available?("webpacker")
5
7
  end
6
8
 
7
- def self.bundle_js_file_path_from_webpacker(bundle_name)
9
+ def self.webpacker_webpack_production_config_exists?
10
+ webpacker_webpack_config_abs_path = File.join(Rails.root,
11
+ "config/webpack/production.js")
12
+ File.exist?(webpacker_webpack_config_abs_path)
13
+ end
14
+
15
+ def self.dev_server_running?
16
+ return false unless using_webpacker?
17
+
18
+ Webpacker.dev_server.running?
19
+ end
20
+
21
+ # This returns either a URL for the webpack-dev-server, non-server bundle or
22
+ # the hashed server bundle if using the same bundle for the client.
23
+ # Otherwise returns a file path.
24
+ def self.bundle_js_uri_from_webpacker(bundle_name)
8
25
  # Note Webpacker 3.4.3 manifest lookup is inside of the public_output_path
9
26
  # [2] (pry) ReactOnRails::WebpackerUtils: 0> Webpacker.manifest.lookup("app-bundle.js")
10
27
  # "/webpack/development/app-bundle-c1d2b6ab73dffa7d9c0e.js"
11
28
  # Next line will throw if the file or manifest does not exist
12
29
  hashed_bundle_name = Webpacker.manifest.lookup!(bundle_name)
13
30
 
14
- if Webpacker.dev_server.running?
31
+ # support for hashing the server-bundle and having that built
32
+ # by a webpack watch process and not served by the webpack-dev-server, then we
33
+ # need an extra config value "same_bundle_for_client_and_server" where a value of false
34
+ # would mean that the bundle is created by a separate webpack watch process.
35
+ is_server_bundle = bundle_name == ReactOnRails.configuration.server_bundle_js_file
36
+
37
+ if Webpacker.dev_server.running? && (!is_server_bundle ||
38
+ ReactOnRails.configuration.same_bundle_for_client_and_server)
15
39
  "#{Webpacker.dev_server.protocol}://#{Webpacker.dev_server.host_with_port}#{hashed_bundle_name}"
16
40
  else
17
41
  File.expand_path(File.join("public", hashed_bundle_name)).to_s
@@ -39,6 +63,7 @@ module ReactOnRails
39
63
 
40
64
  def self.check_manifest_not_cached
41
65
  return unless using_webpacker? && Webpacker.config.cache_manifest?
66
+
42
67
  msg = <<-MSG.strip_heredoc
43
68
  ERROR: you have enabled cache_manifest in the #{Rails.env} env when using the
44
69
  ReactOnRails::TestHelper.configure_rspec_to_compile_assets helper
@@ -11,6 +11,7 @@ require "react_on_rails/version"
11
11
  require "react_on_rails/version_checker"
12
12
  require "react_on_rails/configuration"
13
13
  require "react_on_rails/server_rendering_pool"
14
+ require "react_on_rails/server_rendering_js_code"
14
15
  require "react_on_rails/engine"
15
16
  require "react_on_rails/react_component/render_options"
16
17
  require "react_on_rails/version_syntax_converter"
@@ -21,4 +22,6 @@ require "react_on_rails/webpacker_utils"
21
22
  require "react_on_rails/test_helper/webpack_assets_compiler"
22
23
  require "react_on_rails/test_helper/webpack_assets_status_checker"
23
24
  require "react_on_rails/test_helper/ensure_assets_compiled"
24
- require "react_on_rails/locales_to_js"
25
+ require "react_on_rails/locales/base"
26
+ require "react_on_rails/locales/to_js"
27
+ require "react_on_rails/locales/to_json"
@@ -1,69 +1,56 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require "react_on_rails/assets_precompile"
4
- require "active_support"
3
+ # Important: The default assets:precompile is modified ONLY if the rails/webpacker webpack config
4
+ # does not exist!
5
5
 
6
- if defined?(Sprockets)
7
- namespace :react_on_rails do
8
- namespace :assets do
9
- desc "Creates non-digested symlinks for the assets in the public asset dir"
10
- task symlink_non_digested_assets: :"assets:environment" do
11
- ReactOnRails::AssetsPrecompile.new.symlink_non_digested_assets
12
- end
6
+ require "active_support"
13
7
 
14
- desc "Cleans all broken symlinks for the assets in the public asset dir"
15
- task delete_broken_symlinks: :"assets:environment" do
16
- ReactOnRails::AssetsPrecompile.new.delete_broken_symlinks
17
- end
8
+ ENV["RAILS_ENV"] ||= ENV["RACK_ENV"] || "development"
9
+ ENV["NODE_ENV"] ||= "development"
18
10
 
19
- # In this task, set prerequisites for the assets:precompile task
20
- desc <<-DESC.strip_heredoc
21
- Create webpack assets before calling assets:environment
22
- The webpack task must run before assets:environment task.
23
- Otherwise Sprockets cannot find the files that webpack produces.
24
- This is the secret sauce for how a Heroku deployment knows to create the webpack generated JavaScript files.
25
- DESC
26
- task compile_environment: :webpack do
27
- Rake::Task["assets:environment"].invoke
28
- end
11
+ unless ReactOnRails::WebpackerUtils.webpacker_webpack_production_config_exists?
12
+ # Ensure that rails/webpacker does not call bin/webpack if we're providing
13
+ # the build command.
14
+ ENV["WEBPACKER_PRECOMPILE"] = "false"
29
15
 
30
- desc "Delete assets created with webpack, in the generated assetst directory (/app/assets/webpack)"
31
- task clobber: :environment do
32
- ReactOnRails::AssetsPrecompile.new.clobber
33
- end
16
+ if Rake::Task.task_defined?("assets:precompile")
17
+ Rake::Task["assets:precompile"].enhance do
18
+ Rake::Task["react_on_rails:assets:webpack"].invoke
19
+ puts "Invoking task webpacker:clean from React on Rails"
20
+ Rake::Task["webpacker:clean"].invoke
34
21
  end
22
+ else
23
+ Rake::Task.define_task("assets:precompile" => ["react_on_rails:assets:webpack",
24
+ "webpacker:clean"])
35
25
  end
36
-
37
- # These tasks run as pre-requisites of assets:precompile.
38
- # Note, it's not possible to refer to ReactOnRails configuration values at this point.
39
- Rake::Task["assets:precompile"]
40
- .clear_prerequisites
41
- .enhance([:environment, "react_on_rails:assets:compile_environment"])
42
- .enhance do
43
- Rake::Task["react_on_rails:assets:symlink_non_digested_assets"].invoke
44
- Rake::Task["react_on_rails:assets:delete_broken_symlinks"].invoke
45
- end
46
26
  end
47
27
 
48
28
  # Sprockets independent tasks
49
29
  namespace :react_on_rails do
50
30
  namespace :assets do
51
31
  desc <<-DESC.strip_heredoc
52
- Compile assets with webpack
53
- Uses command defined with ReactOnRails.configuration.build_production_command
54
-
55
- sh "#{ReactOnRails::Utils.prepend_cd_node_modules_directory('<ReactOnRails.configuration.build_production_command>')}"
32
+ Compile assets with webpack
33
+ Uses command defined with ReactOnRails.configuration.build_production_command
34
+ sh "#{ReactOnRails::Utils.prepend_cd_node_modules_directory('<ReactOnRails.configuration.build_production_command>')}"
35
+ Note: This command is not automatically added to assets:precompile if the rails/webpacker
36
+ configuration file config/webpack/production.js exists.
56
37
  DESC
57
38
  task webpack: :locale do
58
- if Rake::Task.task_defined?("webpacker:compile")
59
- # TODO: Eventually, this will need reconsideration if we use any of the Webpacker compilation
60
- Rake::Task["webpacker:compile"].clear
61
- end
62
-
63
39
  if ReactOnRails.configuration.build_production_command.present?
64
40
  sh ReactOnRails::Utils.prepend_cd_node_modules_directory(
65
41
  ReactOnRails.configuration.build_production_command
66
42
  ).to_s
43
+ else
44
+ msg = <<~MSG
45
+ React on Rails is aborting webpack compilation from task react_on_rails:assets:webpack
46
+ because you do not have the `config.build_production_command` defined.
47
+
48
+ Note, this task may have run as part of `assets:precompile`. If file
49
+ config/webpack/production.js does not exist, React on Rails will modify
50
+ the default `asset:precompile` to run task `react_on_rails:assets:webpack`.
51
+ MSG
52
+ puts Rainbow(msg).red
53
+ exit!(1)
67
54
  end
68
55
  end
69
56
  end
@@ -1,6 +1,8 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require "react_on_rails/locales_to_js"
3
+ require "react_on_rails/locales/base"
4
+ require "react_on_rails/locales/to_js"
5
+ require "react_on_rails/locales/to_json"
4
6
  require "active_support"
5
7
 
6
8
  namespace :react_on_rails do
@@ -10,6 +12,6 @@ namespace :react_on_rails do
10
12
  the "ReactOnRails.configuration.i18n_dir".
11
13
  DESC
12
14
  task locale: :environment do
13
- ReactOnRails::LocalesToJs.new
15
+ ReactOnRails::Locales.compile
14
16
  end
15
17
  end
@@ -0,0 +1,49 @@
1
+ scripts:
2
+ lint:
3
+ description: Run all linters (eslint, tsc)
4
+ script: concurrently --prefix "[{name}]" --names "ESLINT" -c "blue,yellow,magenta,orange" "nps eslint"
5
+
6
+ eslint:
7
+ default:
8
+ description: Run eslint.
9
+ script: eslint . --ext ".js,.jsx,.ts"
10
+ fix:
11
+ description: Run eslint and auto-fix.
12
+ script: nps "eslint --fix"
13
+ debug:
14
+ description: Run eslint in debug mode.
15
+ script: DEBUG=eslint:cli-engine nps eslint
16
+
17
+ format:
18
+ default:
19
+ description: Format files using prettier.
20
+ script: concurrently --prefix "[{name}]" --names "ts,js,json" -c "yellow,magenta,green" "nps format.js" "nps format.json"
21
+ listDifferent:
22
+ description: Check that all files were formatted using prettier.
23
+ script: |
24
+ concurrently \
25
+ --prefix "[{name}]" \
26
+ --names "ts,js,json" \
27
+ -c "yellow,magenta" \
28
+ "nps format.js.listDifferent" \
29
+ "nps format.json.listDifferent"
30
+ js:
31
+ default:
32
+ description: Run prettier-eslint on JS.
33
+ #script: prettier "packages/**/*.@(js|jsx)" "spec/dummy/client/app/**/*.@(js|jsx)" "webpack.config.babel.js" "webpack/**/*.js" --write
34
+ script: prettier "**/*.@(js|jsx)" --write
35
+ listDifferent:
36
+ description: Check if any JS files would change by running prettier-eslint.
37
+ # script: prettier "**/*.@(js|jsx)" "webpack.config.babel.js" "webpack/**/*.js" --list-different
38
+ script: prettier "**/*.@(js|jsx)" --list-different
39
+ json:
40
+ default:
41
+ description: Run prettier on JSON files.
42
+ script: rm -rf packages/vm-renderer/tests/tmp && prettier "**/*.json" --write
43
+ listDifferent:
44
+ description: Check if any JSON files would change by running prettier-eslint.
45
+ script: prettier "**/*.json" --list-different
46
+
47
+ renderer:
48
+ description: Starts the node renderer.
49
+ script: node renderer.js
data/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "react-on-rails",
3
- "version": "11.1.4",
3
+ "version": "12.0.0",
4
4
  "description": "react-on-rails JavaScript for react_on_rails Ruby gem",
5
5
  "main": "node_package/lib/ReactOnRails.js",
6
6
  "directories": {
@@ -9,62 +9,75 @@
9
9
  "devDependencies": {
10
10
  "@babel/cli": "^7.0.0",
11
11
  "@babel/core": "^7.0.0",
12
- "@babel/plugin-transform-flow-strip-types": "^7.0.0",
13
12
  "@babel/plugin-transform-runtime": "^7.0.0",
13
+ "@babel/plugin-transform-typescript": "^7.8.7",
14
14
  "@babel/preset-env": "^7.0.0",
15
15
  "@babel/preset-react": "^7.0.0",
16
16
  "@babel/types": "^7.0.0",
17
+ "@types/jest": "^25.1.4",
18
+ "@types/node": "^13.9.0",
19
+ "@types/react": "^16.9.23",
20
+ "@types/react-dom": "^16.9.5",
21
+ "@types/turbolinks": "^5.2.0",
22
+ "@typescript-eslint/eslint-plugin": "^2.23.0",
23
+ "@typescript-eslint/parser": "^2.23.0",
17
24
  "babel-loader": "^8.0.2",
18
- "babel-tape-runner": "^3.0.0",
19
- "babelify": "^7.3.0",
25
+ "babelify": "^10.0.0",
20
26
  "blue-tape": "^1.0.0",
21
27
  "create-react-class": "^15.6.0",
22
- "eslint": "^3.19.0",
23
- "eslint-config-shakacode": "^15.0.0",
28
+ "eslint": "^6.8.0",
29
+ "eslint-config-prettier": "^6.10.1",
30
+ "eslint-config-shakacode": "^16.0.1",
24
31
  "eslint-plugin-import": "^2.6.1",
25
- "eslint-plugin-jsx-a11y": "^5.1.1",
32
+ "eslint-plugin-jsx-a11y": "^6.1.2",
33
+ "eslint-plugin-prettier": "^3.0.0",
26
34
  "eslint-plugin-react": "^7.1.0",
27
- "flow-bin": "^0.51.1",
35
+ "jest": "^25.1.0",
28
36
  "jsdom": "^11.1.0",
37
+ "nps": "^5.9.3",
38
+ "prettier": "^2.0.1",
39
+ "prettier-eslint-cli": "^5.0.0",
29
40
  "prop-types": "^15.5.10",
30
- "react": "^15.6.1",
31
- "react-dom": "^15.6.1",
41
+ "react": "^16.5.2",
42
+ "react-dom": "^16.5.2",
32
43
  "react-transform-hmr": "^1.0.4",
33
- "redux": "^3.7.2",
34
- "release-it": "^2.8.2",
35
- "tap-spec": "^4.1.1",
36
- "tape": "^4.7.0",
44
+ "redux": "^4.0.1",
45
+ "release-it": "^8.2.0",
46
+ "ts-jest": "^25.2.1",
47
+ "tslint-config-prettier": "^1.18.0",
48
+ "typescript": "^3.8.3",
37
49
  "webpack": "^3.4.1",
38
50
  "webpack-manifest-plugin": "^1.2.1"
39
51
  },
52
+ "dependencies": {
53
+ "@babel/runtime-corejs3": "^7.9.6",
54
+ "concurrently": "^5.1.0"
55
+ },
40
56
  "peerDependencies": {
41
57
  "js-yaml": ">= 3.0.0",
42
- "react": ">= 0.14",
43
- "react-dom": ">= 0.14"
58
+ "react": ">= 16",
59
+ "react-dom": ">= 16"
44
60
  },
45
61
  "files": [
46
62
  "node_package/lib",
47
63
  "webpackConfigLoader.js"
48
64
  ],
49
65
  "scripts": {
50
- "test": "babel-tape-runner -r node_package/tests/helpers/test_helper.js node_package/tests/*.js | tap-spec",
66
+ "test": "jest node_package/tests",
51
67
  "clean": "rm -rf node_package/lib",
68
+ "start": "nps",
52
69
  "prepare": "yarn run build",
53
- "prepublish": "npm run prepare",
54
- "babel": "babel --out-dir node_package/lib node_package/src",
55
- "build": "yarn run clean && yarn run babel",
56
- "build-watch": "babel --watch --out-dir node_package/lib node_package/src",
57
- "eslint": "eslint .",
58
- "flow": "flow check node_package",
59
- "lint": "yarn run eslint && yarn run flow",
60
- "check": "yarn run lint && yarn run flow && yarn run test",
70
+ "build": "yarn run clean && yarn run tsc --declaration",
71
+ "build-watch": "yarn run clean && yarn run tsc --watch",
72
+ "lint": "nps eslint",
73
+ "check": "yarn run lint && yarn run test && yarn run type-check",
74
+ "type-check": "yarn run tsc --noEmit --noErrorTruncation",
61
75
  "prerelease": "yarn run check && yarn run clean && yarn run build",
62
76
  "release:patch": "node_package/scripts/release patch",
63
77
  "release:minor": "node_package/scripts/release minor",
64
78
  "release:major": "node_package/scripts/release major",
65
79
  "dummy:install": "rake dummy_apps",
66
- "dummy:spec": "rake run_rspec:dummy",
67
- "install-react-on-rails": "yarn link"
80
+ "dummy:spec": "rake run_rspec:dummy"
68
81
  },
69
82
  "repository": {
70
83
  "type": "git",
@@ -83,8 +96,5 @@
83
96
  "bugs": {
84
97
  "url": "https://github.com/shakacode/react_on_rails/issues"
85
98
  },
86
- "homepage": "https://github.com/shakacode/react_on_rails#readme",
87
- "dependencies": {
88
- "@babel/runtime-corejs2": "^7.0.0"
89
- }
99
+ "homepage": "https://github.com/shakacode/react_on_rails#readme"
90
100
  }
@@ -8,6 +8,7 @@ namespace :dummy_apps do
8
8
  task :yarn_install do
9
9
  yarn_install_cmd = "yarn install --mutex network"
10
10
  sh_in_dir(dummy_app_dir, yarn_install_cmd)
11
+ sh_in_dir(dummy_app_dir, "yalc link react-on-rails")
11
12
  end
12
13
 
13
14
  task dummy_app: [:yarn_install] do
@@ -15,15 +16,6 @@ namespace :dummy_apps do
15
16
  bundle_install_in(dummy_app_dir)
16
17
  end
17
18
 
18
- task :dummy_no_webpacker do
19
- npm_install_cmd = "npm install"
20
- install_react_on_rails_cmd = "yarn run install-react-on-rails"
21
- dummy_app_dir = File.join(gem_root, "spec/dummy_no_webpacker")
22
- sh_in_dir(File.join(gem_root, "spec/dummy_no_webpacker/client"), npm_install_cmd)
23
- sh_in_dir(dummy_app_dir, install_react_on_rails_cmd)
24
- sh_in_dir(dummy_app_dir, "BUNDLE_GEMFILE=Gemfile.rails32 bundle install")
25
- end
26
-
27
19
  task dummy_apps: %i[dummy_app node_package] do
28
20
  puts "Prepared all Dummy Apps"
29
21
  end
@@ -49,8 +49,10 @@ module ReactOnRails
49
49
  end
50
50
 
51
51
  # Options we pass when running `rails new` from the command-line.
52
+ attr_writer :rails_options
53
+
52
54
  def rails_options
53
- "--skip-bundle --skip-spring --skip-git --skip-test-unit --skip-active-record"
55
+ @rails_options ||= "--skip-bundle --skip-spring --skip-git --skip-test-unit --skip-active-record"
54
56
  end
55
57
 
56
58
  %w[gen clobber npm_install build_webpack_bundles].each do |task_type|
@@ -6,6 +6,8 @@
6
6
  # Also see example_type.rb
7
7
 
8
8
  require "yaml"
9
+ require 'rails/version'
10
+
9
11
  require_relative "example_type"
10
12
  require_relative "task_helpers"
11
13
 
@@ -28,6 +30,7 @@ namespace :examples do # rubocop:disable Metrics/BlockLength
28
30
  desc "Generates #{example_type.name_pretty}"
29
31
  task example_type.gen_task_name_short => example_type.clobber_task_name do
30
32
  mkdir_p(example_type.dir)
33
+ example_type.rails_options += " --webpack" if Rails.version >= "5.1" && Rails.version < "6"
31
34
  sh_in_dir(examples_dir, "rails new #{example_type.name} #{example_type.rails_options}")
32
35
  sh_in_dir(example_type.dir, "touch .gitignore")
33
36
  sh_in_dir(example_type.dir, "rake webpacker:install")
data/rakelib/lint.rake CHANGED
@@ -26,13 +26,8 @@ namespace :lint do # rubocop:disable Metrics/BlockLength
26
26
  sh_in_dir(gem_root, "yarn run eslint")
27
27
  end
28
28
 
29
- desc "Run flow from shell"
30
- task :flow do
31
- sh_in_dir(gem_root, "yarn run flow")
32
- end
33
-
34
- desc "Run all eslint, flow, rubocop linters. Skip ruby-lint and scss"
35
- task lint: %i[eslint flow rubocop] do
29
+ desc "Run all eslint & rubocop linters. Skip ruby-lint and scss"
30
+ task lint: %i[eslint rubocop] do
36
31
  puts "Completed all linting"
37
32
  end
38
33
  end
@@ -6,8 +6,8 @@ namespace :node_package do
6
6
  include ReactOnRails::TaskHelpers
7
7
 
8
8
  task :build do
9
- puts "Building Node Package and running 'yarn link'"
10
- sh "yarn run build && yarn link"
9
+ puts "Building Node Package and running 'yalc publish'"
10
+ sh "yarn run build && yalc publish"
11
11
  end
12
12
  end
13
13
 
data/rakelib/release.rake CHANGED
@@ -60,20 +60,15 @@ task :release, %i[gem_version dry_run tools_install] do |_t, args|
60
60
  sh_in_dir(gem_root, "git add .")
61
61
 
62
62
  # Will bump the yarn version, commit, tag the commit, push to repo, and release on yarn
63
- release_it_command = "$(yarn bin)/release-it --non-interactive --npm.publish".dup
64
- release_it_command << " --dry-run --verbose" if is_dry_run
63
+ release_it_command = "$(yarn bin)/release-it".dup
65
64
  release_it_command << " #{npm_version}" unless npm_version.strip.empty?
65
+ release_it_command << " --non-interactive --npm.publish"
66
+ release_it_command << " --dry-run --verbose" if is_dry_run
66
67
  sh_in_dir(gem_root, release_it_command)
67
68
 
68
69
  # Release the new gem version
69
70
  unless is_dry_run
70
71
  sh_in_dir(gem_root, "gem release")
71
-
72
- # Update master with new npm version
73
- sleep 5 # short pause to make sure npmjs has time to update
74
- sh_in_dir(File.join(gem_root, "spec", "dummy", "client"), "yarn add react-on-rails@#{npm_version} --exact")
75
- sh_in_dir(gem_root, "git commit -am 'Updated spec/dummy/client/package.json latest version'")
76
- sh_in_dir(gem_root, "git push")
77
72
  end
78
73
  end
79
74
  # rubocop:enable Metrics/BlockLength
@@ -18,16 +18,6 @@ namespace :run_rspec do
18
18
  run_tests_in("", rspec_args: File.join("spec", "react_on_rails"))
19
19
  end
20
20
 
21
- desc "Run RSpec with rails32 gemfile"
22
- task :gem_rails32 do
23
- rspec_args = "spec/react_on_rails --tag ~webpacker --exclude-pattern "\
24
- "\"**/generators/*_spec.rb,"\
25
- "**/test_helper/webpack_*_spec.rb\""
26
- run_tests_in("",
27
- rspec_args: rspec_args,
28
- env_vars: "BUNDLE_GEMFILE=spec/dummy_no_webpacker/Gemfile.rails32")
29
- end
30
-
31
21
  desc "Runs dummy rspec with turbolinks"
32
22
  task dummy: ["dummy_apps:dummy_app"] do
33
23
  clean_gen_assets(spec_dummy_dir)
@@ -44,14 +34,6 @@ namespace :run_rspec do
44
34
  command_name: "dummy_no_turbolinks")
45
35
  end
46
36
 
47
- desc "Runs dummy_no_webpacker rspec"
48
- task :dummy_no_webpacker do
49
- dummy_app_dir = File.join(gem_root, "spec/dummy_no_webpacker")
50
- clean_gen_assets(dummy_app_dir)
51
- run_tests_in(dummy_app_dir,
52
- env_vars: "BUNDLE_GEMFILE=Gemfile.rails32")
53
- end
54
-
55
37
  # Dynamically define Rake tasks for each example app found in the examples directory
56
38
  ExampleType.all.each do |example_type|
57
39
  desc "Runs RSpec for #{example_type.name_pretty} only"
@@ -77,6 +59,11 @@ namespace :run_rspec do
77
59
  puts "Completed all RSpec tests"
78
60
  end
79
61
 
62
+ desc "run all dummy tests"
63
+ task all_dummy: %i[dummy_no_turbolinks dummy] do
64
+ puts "Completed all RSpec tests"
65
+ end
66
+
80
67
  desc "run all tests"
81
68
  task run_rspec: %i[all_but_examples examples] do
82
69
  puts "Completed all RSpec tests"
@@ -23,16 +23,17 @@ Gem::Specification.new do |s|
23
23
  s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
24
24
  s.require_paths = ["lib"]
25
25
 
26
- s.required_ruby_version = ">= 2.1.0"
26
+ s.required_ruby_version = ">= 2.5.0"
27
27
 
28
28
  s.add_dependency "addressable"
29
29
  s.add_dependency "connection_pool"
30
30
  s.add_dependency "execjs", "~> 2.5"
31
31
  s.add_dependency "rails", ">= 3.2"
32
32
  s.add_dependency "rainbow", "~> 3.0"
33
+ s.add_dependency "webpacker", ">= 4.0"
33
34
 
34
35
  s.add_development_dependency "awesome_print"
35
- s.add_development_dependency "bundler", "~> 1"
36
+ s.add_development_dependency "bundler", "~> 2"
36
37
  s.add_development_dependency "coveralls"
37
38
  s.add_development_dependency "gem-release"
38
39
  s.add_development_dependency "generator_spec"
@@ -41,14 +42,12 @@ Gem::Specification.new do |s|
41
42
  s.add_development_dependency "pry-byebug"
42
43
  s.add_development_dependency "pry-doc"
43
44
  s.add_development_dependency "pry-rescue"
44
- s.add_development_dependency "pry-stack_explorer"
45
45
  s.add_development_dependency "pry-state"
46
- s.add_development_dependency "pry-toys"
47
46
  s.add_development_dependency "rails", "~> 5.2"
48
47
 
49
48
  s.add_development_dependency "rake", "~> 10.0"
50
49
  s.add_development_dependency "rspec"
51
- s.add_development_dependency "rubocop", "~> 0.58.1"
50
+ s.add_development_dependency "rubocop", "0.85.0"
52
51
 
53
52
  s.post_install_message = '
54
53
  --------------------------------------------------------------------------------
data/tsconfig.json ADDED
@@ -0,0 +1,14 @@
1
+ {
2
+ "compilerOptions": {
3
+ "allowJs": true,
4
+ "esModuleInterop": true,
5
+ "jsx": "react",
6
+ "lib": ["dom", "es2015"],
7
+ "module": "CommonJS",
8
+ "noImplicitAny": true,
9
+ "outDir": "node_package/lib",
10
+ "strict": true,
11
+ "target": "es5"
12
+ },
13
+ "include": ["node_package/src/**/*"]
14
+ }
@@ -1,4 +1,6 @@
1
1
  /**
2
+ * TODO: THIS SHOULD BE REMOVED
3
+ *
2
4
  * Allow defaults for the config/webpacker.yml. Thee values in this file MUST match values
3
5
  * in https://github.com/rails/webpacker/blob/master/lib/install/config/webpacker.yml
4
6
  *
@@ -11,15 +13,14 @@ const { env } = require('process');
11
13
  const { safeLoad } = require('js-yaml');
12
14
  const { readFileSync } = require('fs');
13
15
 
14
-
15
16
  function removeOuterSlashes(string) {
16
17
  return string.replace(/^\/*/, '').replace(/\/*$/, '');
17
18
  }
18
19
 
19
20
  function formatPublicPath(settings) {
20
21
  if (settings.dev_server) {
21
- const host = settings.dev_server.host;
22
- const port = settings.dev_server.port;
22
+ const { host } = settings.dev_server;
23
+ const { port } = settings.dev_server;
23
24
  const path = settings.public_output_path;
24
25
  const hostWithHttp = `http://${host}:${port}`;
25
26
 
@@ -48,7 +49,7 @@ function formatPublicPath(settings) {
48
49
  */
49
50
  const configLoader = (configPath) => {
50
51
  // Some test environments might not have the NODE_ENV set, so we'll have fallbacks.
51
- const configEnv = (env.NODE_ENV || env.RAILS_ENV || 'development');
52
+ const configEnv = env.NODE_ENV || env.RAILS_ENV || 'development';
52
53
  const ymlConfigPath = join(configPath, 'webpacker.yml');
53
54
  const settings = safeLoad(readFileSync(ymlConfigPath, 'utf8'))[configEnv];
54
55