webpacker 5.1.0 → 6.0.0.beta.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (167) hide show
  1. checksums.yaml +4 -4
  2. data/.eslintrc.js +8 -8
  3. data/.github/workflows/jest.yml +38 -0
  4. data/.github/workflows/js-lint.yml +39 -0
  5. data/.github/workflows/rubocop.yml +39 -0
  6. data/.github/workflows/ruby.yml +70 -0
  7. data/.gitignore +2 -0
  8. data/.node-version +1 -1
  9. data/.rubocop.yml +11 -16
  10. data/6_0_upgrade.md +43 -0
  11. data/CHANGELOG.md +42 -2
  12. data/CONTRIBUTING.md +1 -1
  13. data/Gemfile.lock +91 -85
  14. data/README.md +226 -113
  15. data/lib/install/config/webpack/base.js +3 -0
  16. data/lib/install/config/webpack/development.js +2 -2
  17. data/lib/install/config/webpack/production.js +2 -2
  18. data/lib/install/config/webpack/test.js +2 -2
  19. data/lib/install/config/webpacker.yml +9 -38
  20. data/lib/install/javascript/packs/application.css +9 -0
  21. data/lib/install/javascript/packs/application.js +3 -1
  22. data/lib/install/template.rb +33 -19
  23. data/lib/tasks/webpacker.rake +2 -11
  24. data/lib/tasks/webpacker/binstubs.rake +6 -4
  25. data/lib/tasks/webpacker/check_binstubs.rake +4 -4
  26. data/lib/tasks/webpacker/check_node.rake +1 -1
  27. data/lib/tasks/webpacker/check_yarn.rake +2 -3
  28. data/lib/tasks/webpacker/compile.rake +4 -2
  29. data/lib/tasks/webpacker/info.rake +12 -10
  30. data/lib/tasks/webpacker/install.rake +6 -4
  31. data/lib/tasks/webpacker/verify_install.rake +2 -1
  32. data/lib/tasks/webpacker/yarn_install.rake +9 -1
  33. data/lib/webpacker/commands.rb +1 -1
  34. data/lib/webpacker/compiler.rb +20 -8
  35. data/lib/webpacker/configuration.rb +7 -23
  36. data/lib/webpacker/dev_server_runner.rb +23 -4
  37. data/lib/webpacker/helper.rb +51 -42
  38. data/lib/webpacker/manifest.rb +1 -1
  39. data/lib/webpacker/runner.rb +1 -0
  40. data/lib/webpacker/version.rb +1 -1
  41. data/lib/webpacker/webpack_runner.rb +7 -2
  42. data/package.json +27 -43
  43. data/package/__tests__/config.js +6 -27
  44. data/package/__tests__/development.js +18 -7
  45. data/package/__tests__/env.js +12 -4
  46. data/package/__tests__/production.js +6 -6
  47. data/package/__tests__/staging.js +7 -6
  48. data/package/__tests__/test.js +4 -5
  49. data/package/babel/preset.js +55 -0
  50. data/package/config.js +4 -9
  51. data/package/configPath.js +3 -0
  52. data/package/env.js +9 -4
  53. data/package/environments/__tests__/base.js +21 -36
  54. data/package/environments/base.js +63 -127
  55. data/package/environments/development.js +46 -39
  56. data/package/environments/production.js +63 -70
  57. data/package/environments/test.js +2 -2
  58. data/package/index.js +13 -8
  59. data/package/rules/babel.js +19 -10
  60. data/package/rules/coffee.js +6 -0
  61. data/package/rules/erb.js +15 -0
  62. data/package/rules/file.js +17 -18
  63. data/package/rules/index.js +16 -18
  64. data/package/rules/less.js +22 -0
  65. data/package/rules/raw.js +5 -0
  66. data/package/rules/sass.js +13 -10
  67. data/package/rules/svg.js +20 -0
  68. data/package/utils/get_style_rule.js +26 -36
  69. data/package/utils/helpers.js +26 -35
  70. data/test/compiler_test.rb +4 -11
  71. data/test/configuration_test.rb +2 -32
  72. data/test/dev_server_runner_test.rb +25 -6
  73. data/test/engine_rake_tasks_test.rb +39 -0
  74. data/test/helper_test.rb +18 -9
  75. data/test/mounted_app/Rakefile +4 -0
  76. data/test/mounted_app/test/dummy/Rakefile +3 -0
  77. data/test/mounted_app/test/dummy/bin/rails +3 -0
  78. data/test/mounted_app/test/dummy/bin/rake +3 -0
  79. data/test/mounted_app/test/dummy/config.ru +5 -0
  80. data/test/mounted_app/test/dummy/config/application.rb +10 -0
  81. data/test/mounted_app/test/dummy/config/environment.rb +3 -0
  82. data/test/mounted_app/test/dummy/config/webpacker.yml +75 -0
  83. data/test/mounted_app/test/dummy/package.json +7 -0
  84. data/test/rake_tasks_test.rb +1 -10
  85. data/test/test_app/config/webpacker.yml +3 -21
  86. data/test/test_app/config/webpacker_public_root.yml +0 -1
  87. data/test/test_app/public/packs/manifest.json +18 -13
  88. data/test/test_app/some.config.js +0 -0
  89. data/test/webpack_runner_test.rb +10 -4
  90. data/webpacker.gemspec +1 -1
  91. data/yarn.lock +2657 -6224
  92. metadata +50 -89
  93. data/.travis.yml +0 -43
  94. data/docs/assets.md +0 -119
  95. data/docs/cloud9.md +0 -310
  96. data/docs/css.md +0 -253
  97. data/docs/deployment.md +0 -130
  98. data/docs/docker.md +0 -68
  99. data/docs/engines.md +0 -213
  100. data/docs/env.md +0 -63
  101. data/docs/es6.md +0 -72
  102. data/docs/folder-structure.md +0 -66
  103. data/docs/integrations.md +0 -220
  104. data/docs/misc.md +0 -23
  105. data/docs/props.md +0 -223
  106. data/docs/testing.md +0 -136
  107. data/docs/troubleshooting.md +0 -156
  108. data/docs/typescript.md +0 -109
  109. data/docs/v4-upgrade.md +0 -142
  110. data/docs/webpack-dev-server.md +0 -92
  111. data/docs/webpack.md +0 -364
  112. data/docs/yarn.md +0 -23
  113. data/lib/install/angular.rb +0 -23
  114. data/lib/install/coffee.rb +0 -25
  115. data/lib/install/config/.browserslistrc +0 -1
  116. data/lib/install/config/babel.config.js +0 -72
  117. data/lib/install/config/postcss.config.js +0 -12
  118. data/lib/install/config/webpack/environment.js +0 -3
  119. data/lib/install/elm.rb +0 -39
  120. data/lib/install/erb.rb +0 -25
  121. data/lib/install/examples/angular/hello_angular.js +0 -7
  122. data/lib/install/examples/angular/hello_angular/app/app.component.ts +0 -9
  123. data/lib/install/examples/angular/hello_angular/app/app.module.ts +0 -16
  124. data/lib/install/examples/angular/hello_angular/index.ts +0 -8
  125. data/lib/install/examples/angular/hello_angular/polyfills.ts +0 -73
  126. data/lib/install/examples/coffee/hello_coffee.coffee +0 -4
  127. data/lib/install/examples/elm/Main.elm +0 -55
  128. data/lib/install/examples/elm/hello_elm.js +0 -16
  129. data/lib/install/examples/erb/hello_erb.js.erb +0 -6
  130. data/lib/install/examples/react/babel.config.js +0 -87
  131. data/lib/install/examples/react/hello_react.jsx +0 -26
  132. data/lib/install/examples/react/tsconfig.json +0 -21
  133. data/lib/install/examples/stimulus/application.js +0 -1
  134. data/lib/install/examples/stimulus/controllers/hello_controller.js +0 -18
  135. data/lib/install/examples/stimulus/controllers/index.js +0 -9
  136. data/lib/install/examples/svelte/app.svelte +0 -11
  137. data/lib/install/examples/svelte/hello_svelte.js +0 -20
  138. data/lib/install/examples/typescript/hello_typescript.ts +0 -4
  139. data/lib/install/examples/typescript/tsconfig.json +0 -24
  140. data/lib/install/examples/vue/app.vue +0 -22
  141. data/lib/install/examples/vue/hello_vue.js +0 -72
  142. data/lib/install/loaders/coffee.js +0 -6
  143. data/lib/install/loaders/elm.js +0 -25
  144. data/lib/install/loaders/erb.js +0 -11
  145. data/lib/install/loaders/svelte.js +0 -9
  146. data/lib/install/loaders/vue.js +0 -6
  147. data/lib/install/react.rb +0 -18
  148. data/lib/install/stimulus.rb +0 -12
  149. data/lib/install/svelte.rb +0 -29
  150. data/lib/install/typescript.rb +0 -42
  151. data/lib/install/vue.rb +0 -49
  152. data/lib/tasks/installers.rake +0 -42
  153. data/package/config_types/__tests__/config_list.js +0 -118
  154. data/package/config_types/__tests__/config_object.js +0 -43
  155. data/package/config_types/config_list.js +0 -75
  156. data/package/config_types/config_object.js +0 -55
  157. data/package/config_types/index.js +0 -7
  158. data/package/rules/module.css.js +0 -3
  159. data/package/rules/module.sass.js +0 -8
  160. data/package/rules/node_modules.js +0 -24
  161. data/package/utils/__tests__/deep_assign.js +0 -32
  162. data/package/utils/__tests__/deep_merge.js +0 -10
  163. data/package/utils/__tests__/get_style_rule.js +0 -65
  164. data/package/utils/__tests__/objectify.js +0 -9
  165. data/package/utils/deep_assign.js +0 -22
  166. data/package/utils/deep_merge.js +0 -22
  167. data/package/utils/objectify.js +0 -3
@@ -0,0 +1,3 @@
1
+ const { webpackConfig } = require('@rails/webpacker')
2
+
3
+ module.exports = webpackConfig
@@ -1,5 +1,5 @@
1
1
  process.env.NODE_ENV = process.env.NODE_ENV || 'development'
2
2
 
3
- const environment = require('./environment')
3
+ const webpackConfig = require('./base')
4
4
 
5
- module.exports = environment.toWebpackConfig()
5
+ module.exports = webpackConfig
@@ -1,5 +1,5 @@
1
1
  process.env.NODE_ENV = process.env.NODE_ENV || 'production'
2
2
 
3
- const environment = require('./environment')
3
+ const webpackConfig = require('./base')
4
4
 
5
- module.exports = environment.toWebpackConfig()
5
+ module.exports = webpackConfig
@@ -1,5 +1,5 @@
1
1
  process.env.NODE_ENV = process.env.NODE_ENV || 'development'
2
2
 
3
- const environment = require('./environment')
3
+ const webpackConfig = require('./base')
4
4
 
5
- module.exports = environment.toWebpackConfig()
5
+ module.exports = webpackConfig
@@ -10,43 +10,11 @@ default: &default
10
10
 
11
11
  # Additional paths webpack should lookup modules
12
12
  # ['app/assets', 'engine/foo/app/assets']
13
- resolved_paths: []
13
+ additional_paths: []
14
14
 
15
15
  # Reload manifest.json on all requests so we reload latest compiled packs
16
16
  cache_manifest: false
17
17
 
18
- # Extract and emit a css file
19
- extract_css: false
20
-
21
- static_assets_extensions:
22
- - .jpg
23
- - .jpeg
24
- - .png
25
- - .gif
26
- - .tiff
27
- - .ico
28
- - .svg
29
- - .eot
30
- - .otf
31
- - .ttf
32
- - .woff
33
- - .woff2
34
-
35
- extensions:
36
- - .mjs
37
- - .js
38
- - .sass
39
- - .scss
40
- - .css
41
- - .module.sass
42
- - .module.scss
43
- - .module.css
44
- - .png
45
- - .svg
46
- - .gif
47
- - .jpeg
48
- - .jpg
49
-
50
18
  development:
51
19
  <<: *default
52
20
  compile: true
@@ -57,13 +25,20 @@ development:
57
25
  host: localhost
58
26
  port: 3035
59
27
  public: localhost:3035
28
+ # Hot Module Replacement updates modules while the application is running without a full reload
60
29
  hmr: false
61
- # Inline should be set to true if using HMR
30
+ # Inline should be set to true if using HMR; it inserts a script to take care of live reloading
62
31
  inline: true
32
+ # Should we show a full-screen overlay in the browser when there are compiler errors or warnings?
63
33
  overlay: true
34
+ # Should we use gzip compression?
64
35
  compress: true
36
+ # Note that apps that do not check the host are vulnerable to DNS rebinding attacks
65
37
  disable_host_check: true
38
+ # This option lets the browser open with your local IP
66
39
  use_local_ip: false
40
+ # When enabled, nothing except the initial startup information will be written to the console.
41
+ # This also means that errors or warnings from webpack are not visible.
67
42
  quiet: false
68
43
  pretty: false
69
44
  headers:
@@ -71,7 +46,6 @@ development:
71
46
  watch_options:
72
47
  ignored: '**/node_modules/**'
73
48
 
74
-
75
49
  test:
76
50
  <<: *default
77
51
  compile: true
@@ -85,8 +59,5 @@ production:
85
59
  # Production depends on precompilation of packs prior to booting for performance.
86
60
  compile: false
87
61
 
88
- # Extract and emit a css file
89
- extract_css: true
90
-
91
62
  # Cache manifest.json for performance
92
63
  cache_manifest: true
@@ -0,0 +1,9 @@
1
+ /*
2
+ Any CSS added to this file or imported from this file, e.g. `@import '../stylesheets/my-css.css'`,
3
+ will be included in the "application" pack. Any CSS imported from application.js or as part of the
4
+ application.js dependency graph, e.g. `import '../stylesheets/my-css.css'` will also be included
5
+ in the "application" pack.
6
+
7
+ To reference this file, add <%= stylesheet_pack_tag 'application' %> to the appropriate
8
+ layout file, like app/views/layouts/application.html.erb
9
+ */
@@ -7,7 +7,6 @@
7
7
  // To reference this file, add <%= javascript_pack_tag 'application' %> to the appropriate
8
8
  // layout file, like app/views/layouts/application.html.erb
9
9
 
10
-
11
10
  // Uncomment to copy all static images under ../images to the output folder and reference
12
11
  // them with the image_pack_tag helper in views (e.g <%= image_pack_tag 'rails.png' %>)
13
12
  // or the `imagePath` JavaScript helper below.
@@ -15,4 +14,7 @@
15
14
  // const images = require.context('../images', true)
16
15
  // const imagePath = (name) => images(name, true)
17
16
 
17
+ import 'core-js/stable'
18
+ import 'regenerator-runtime/runtime'
19
+
18
20
  console.log('Hello World from Webpacker')
@@ -4,15 +4,6 @@ copy_file "#{__dir__}/config/webpacker.yml", "config/webpacker.yml"
4
4
  say "Copying webpack core config"
5
5
  directory "#{__dir__}/config/webpack", "config/webpack"
6
6
 
7
- say "Copying postcss.config.js to app root directory"
8
- copy_file "#{__dir__}/config/postcss.config.js", "postcss.config.js"
9
-
10
- say "Copying babel.config.js to app root directory"
11
- copy_file "#{__dir__}/config/babel.config.js", "babel.config.js"
12
-
13
- say "Copying .browserslistrc to app root directory"
14
- copy_file "#{__dir__}/config/.browserslistrc", ".browserslistrc"
15
-
16
7
  if Dir.exists?(Webpacker.config.source_path)
17
8
  say "The JavaScript app source directory already exists"
18
9
  else
@@ -22,8 +13,9 @@ end
22
13
 
23
14
  apply "#{__dir__}/binstubs.rb"
24
15
 
25
- if File.exists?(".gitignore")
26
- append_to_file ".gitignore" do
16
+ git_ignore_path = Rails.root.join(".gitignore")
17
+ if File.exists?(git_ignore_path)
18
+ append_to_file git_ignore_path do
27
19
  "\n" +
28
20
  "/public/packs\n" +
29
21
  "/public/packs-test\n" +
@@ -34,16 +26,38 @@ if File.exists?(".gitignore")
34
26
  end
35
27
  end
36
28
 
37
- if Webpacker::VERSION =~ /^[0-9]+\.[0-9]+\.[0-9]+$/
38
- say "Installing all JavaScript dependencies [#{Webpacker::VERSION}]"
39
- run "yarn add @rails/webpacker@#{Webpacker::VERSION}"
40
- else
41
- say "Installing all JavaScript dependencies [from prerelease rails/webpacker]"
42
- run "yarn add @rails/webpacker@next"
29
+ Dir.chdir(Rails.root) do
30
+ if Webpacker::VERSION =~ /^[0-9]+\.[0-9]+\.[0-9]+$/
31
+ say "Installing all JavaScript dependencies [#{Webpacker::VERSION}]"
32
+ run "yarn add @rails/webpacker@#{Webpacker::VERSION}"
33
+ else
34
+ say "Installing all JavaScript dependencies [from prerelease rails/webpacker]"
35
+ run "yarn add @rails/webpacker@next"
36
+ end
37
+
38
+ package_json = File.read("#{__dir__}/../../package.json")
39
+ webpack_version = package_json.match(/"webpack": "(.*)"/)[1]
40
+ webpack_cli_version = package_json.match(/"webpack-cli": "(.*)"/)[1]
41
+
42
+ # needed for experimental Yarn 2 support and should not harm Yarn 1
43
+ say "Installing webpack and webpack-cli as direct dependencies"
44
+ run "yarn add webpack@#{webpack_version} webpack-cli@#{webpack_cli_version}"
45
+
46
+ say "Installing dev server for live reloading"
47
+ run "yarn add --dev webpack-dev-server @webpack-cli/serve"
43
48
  end
44
49
 
45
- say "Installing dev server for live reloading"
46
- run "yarn add --dev webpack-dev-server"
50
+ insert_into_file Rails.root.join("package.json").to_s, before: /\n}\n*$/ do
51
+ <<~JSON.chomp
52
+ ,
53
+ "babel": {
54
+ "presets": ["./node_modules/@rails/webpacker/package/babel/preset.js"]
55
+ },
56
+ "browserslist": [
57
+ "defaults"
58
+ ]
59
+ JSON
60
+ end
47
61
 
48
62
  if Rails::VERSION::MAJOR == 5 && Rails::VERSION::MINOR > 1
49
63
  say "You need to allow webpack-dev-server host as allowed origin for connect-src.", :yellow
@@ -6,19 +6,10 @@ tasks = {
6
6
  "webpacker:clobber" => "Removes the webpack compiled output directory",
7
7
  "webpacker:check_node" => "Verifies if Node.js is installed",
8
8
  "webpacker:check_yarn" => "Verifies if Yarn is installed",
9
- "webpacker:check_binstubs" => "Verifies that webpack & webpack-dev-server are present",
9
+ "webpacker:check_binstubs" => "Verifies that bin/webpack is present",
10
10
  "webpacker:binstubs" => "Installs Webpacker binstubs in this application",
11
11
  "webpacker:verify_install" => "Verifies if Webpacker is installed",
12
- "webpacker:yarn_install" => "Support for older Rails versions. Install all JavaScript dependencies as specified via Yarn",
13
- "webpacker:install:react" => "Installs and setup example React component",
14
- "webpacker:install:vue" => "Installs and setup example Vue component",
15
- "webpacker:install:angular" => "Installs and setup example Angular component",
16
- "webpacker:install:elm" => "Installs and setup example Elm component",
17
- "webpacker:install:svelte" => "Installs and setup example Svelte component",
18
- "webpacker:install:stimulus" => "Installs and setup example Stimulus component",
19
- "webpacker:install:erb" => "Installs Erb loader with an example",
20
- "webpacker:install:coffee" => "Installs CoffeeScript loader with an example",
21
- "webpacker:install:typescript" => "Installs Typescript loader with an example"
12
+ "webpacker:yarn_install" => "Support for older Rails versions. Install all JavaScript dependencies as specified via Yarn"
22
13
  }.freeze
23
14
 
24
15
  desc "Lists all available tasks in Webpacker"
@@ -1,13 +1,15 @@
1
1
  binstubs_template_path = File.expand_path("../../install/binstubs.rb", __dir__).freeze
2
- bin_path = ENV["BUNDLE_BIN"] || "./bin"
2
+ bin_path = ENV["BUNDLE_BIN"] || Rails.root.join("bin")
3
3
 
4
4
  namespace :webpacker do
5
5
  desc "Installs Webpacker binstubs in this application"
6
- task binstubs: [:check_node, :check_yarn] do
6
+ task binstubs: [:check_node, :check_yarn] do |task|
7
+ prefix = task.name.split(/#|webpacker:binstubs/).first
8
+
7
9
  if Rails::VERSION::MAJOR >= 5
8
- exec "#{RbConfig.ruby} #{bin_path}/rails app:template LOCATION=#{binstubs_template_path}"
10
+ exec "#{RbConfig.ruby} #{bin_path}/rails #{prefix}app:template LOCATION=#{binstubs_template_path}"
9
11
  else
10
- exec "#{RbConfig.ruby} #{bin_path}/rake rails:template LOCATION=#{binstubs_template_path}"
12
+ exec "#{RbConfig.ruby} #{bin_path}/rake #{prefix}rails:template LOCATION=#{binstubs_template_path}"
11
13
  end
12
14
  end
13
15
  end
@@ -1,10 +1,10 @@
1
1
  namespace :webpacker do
2
- desc "Verifies that webpack & webpack-dev-server are present."
2
+ desc "Verifies that bin/webpack is present"
3
3
  task :check_binstubs do
4
- unless File.exist?("bin/webpack")
5
- $stderr.puts "webpack binstubs not found.\n"\
4
+ unless File.exist?(Rails.root.join("bin/webpack"))
5
+ $stderr.puts "webpack binstub not found.\n"\
6
6
  "Have you run rails webpacker:install ?\n"\
7
- "Make sure the bin directory or binstubs are not included in .gitignore\n"\
7
+ "Make sure the bin directory and bin/webpack are not included in .gitignore\n"\
8
8
  "Exiting!"
9
9
  exit!
10
10
  end
@@ -3,7 +3,7 @@ namespace :webpacker do
3
3
  desc "Verifies if Node.js is installed"
4
4
  task :check_node do
5
5
  begin
6
- node_version = `node -v || nodejs -v`
6
+ node_version = `node -v || nodejs -v`.strip
7
7
  raise Errno::ENOENT if node_version.blank?
8
8
 
9
9
  pkg_path = Pathname.new("#{__dir__}/../../../package.json").realpath
@@ -3,19 +3,18 @@ namespace :webpacker do
3
3
  desc "Verifies if Yarn is installed"
4
4
  task :check_yarn do
5
5
  begin
6
- yarn_version = `yarn --version`
6
+ yarn_version = `yarn --version`.strip
7
7
  raise Errno::ENOENT if yarn_version.blank?
8
8
 
9
9
  pkg_path = Pathname.new("#{__dir__}/../../../package.json").realpath
10
10
  yarn_range = JSON.parse(pkg_path.read)["engines"]["yarn"]
11
11
  is_valid = SemanticRange.satisfies?(yarn_version, yarn_range) rescue false
12
- is_unsupported = SemanticRange.satisfies?(yarn_version, ">=2.0.0") rescue false
12
+ is_unsupported = SemanticRange.satisfies?(yarn_version, ">=3.0.0") rescue false
13
13
 
14
14
  unless is_valid
15
15
  $stderr.puts "Webpacker requires Yarn \"#{yarn_range}\" and you are using #{yarn_version}"
16
16
  if is_unsupported
17
17
  $stderr.puts "This version of Webpacker does not support Yarn #{yarn_version}. Please downgrade to a supported version of Yarn https://yarnpkg.com/lang/en/docs/install/"
18
- $stderr.puts "For information on using Webpacker with Yarn 2.0, see https://github.com/rails/webpacker/issues/2112"
19
18
  else
20
19
  $stderr.puts "Please upgrade Yarn https://yarnpkg.com/lang/en/docs/install/"
21
20
  end
@@ -10,8 +10,10 @@ end
10
10
  def enhance_assets_precompile
11
11
  # yarn:install was added in Rails 5.1
12
12
  deps = yarn_install_available? ? [] : ["webpacker:yarn_install"]
13
- Rake::Task["assets:precompile"].enhance(deps) do
14
- Rake::Task["webpacker:compile"].invoke
13
+ Rake::Task["assets:precompile"].enhance(deps) do |task|
14
+ prefix = task.name.split(/#|assets:precompile/).first
15
+
16
+ Rake::Task["#{prefix}webpacker:compile"].invoke
15
17
  end
16
18
  end
17
19
 
@@ -3,17 +3,19 @@ require "webpacker/version"
3
3
  namespace :webpacker do
4
4
  desc "Provide information on Webpacker's environment"
5
5
  task :info do
6
- $stdout.puts "Ruby: #{`ruby --version`}"
7
- $stdout.puts "Rails: #{Rails.version}"
8
- $stdout.puts "Webpacker: #{Webpacker::VERSION}"
9
- $stdout.puts "Node: #{`node --version`}"
10
- $stdout.puts "Yarn: #{`yarn --version`}"
6
+ Dir.chdir(Rails.root) do
7
+ $stdout.puts "Ruby: #{`ruby --version`}"
8
+ $stdout.puts "Rails: #{Rails.version}"
9
+ $stdout.puts "Webpacker: #{Webpacker::VERSION}"
10
+ $stdout.puts "Node: #{`node --version`}"
11
+ $stdout.puts "Yarn: #{`yarn --version`}"
11
12
 
12
- $stdout.puts "\n"
13
- $stdout.puts "@rails/webpacker: \n#{`npm list @rails/webpacker version`}"
13
+ $stdout.puts "\n"
14
+ $stdout.puts "@rails/webpacker: \n#{`npm list @rails/webpacker version`}"
14
15
 
15
- $stdout.puts "Is bin/webpack present?: #{File.exist? 'bin/webpack'}"
16
- $stdout.puts "Is bin/webpack-dev-server present?: #{File.exist? 'bin/webpack-dev-server'}"
17
- $stdout.puts "Is bin/yarn present?: #{File.exist? 'bin/yarn'}"
16
+ $stdout.puts "Is bin/webpack present?: #{File.exist? 'bin/webpack'}"
17
+ $stdout.puts "Is bin/webpack-dev-server present?: #{File.exist? 'bin/webpack-dev-server'}"
18
+ $stdout.puts "Is bin/yarn present?: #{File.exist? 'bin/yarn'}"
19
+ end
18
20
  end
19
21
  end
@@ -1,13 +1,15 @@
1
1
  install_template_path = File.expand_path("../../install/template.rb", __dir__).freeze
2
- bin_path = ENV["BUNDLE_BIN"] || "./bin"
2
+ bin_path = ENV["BUNDLE_BIN"] || Rails.root.join("bin")
3
3
 
4
4
  namespace :webpacker do
5
5
  desc "Install Webpacker in this application"
6
- task install: [:check_node, :check_yarn] do
6
+ task install: [:check_node, :check_yarn] do |task|
7
+ prefix = task.name.split(/#|webpacker:install/).first
8
+
7
9
  if Rails::VERSION::MAJOR >= 5
8
- exec "#{RbConfig.ruby} #{bin_path}/rails app:template LOCATION=#{install_template_path}"
10
+ exec "#{RbConfig.ruby} #{bin_path}/rails #{prefix}app:template LOCATION=#{install_template_path}"
9
11
  else
10
- exec "#{RbConfig.ruby} #{bin_path}/rake rails:template LOCATION=#{install_template_path}"
12
+ exec "#{RbConfig.ruby} #{bin_path}/rake #{prefix}rails:template LOCATION=#{install_template_path}"
11
13
  end
12
14
  end
13
15
  end
@@ -4,7 +4,8 @@ namespace :webpacker do
4
4
  desc "Verifies if Webpacker is installed"
5
5
  task verify_install: [:check_node, :check_yarn, :check_binstubs] do
6
6
  unless Webpacker.config.config_path.exist?
7
- $stderr.puts "Configuration config/webpacker.yml file not found. \n"\
7
+ path = Webpacker.config.config_path.relative_path_from(Pathname.new(pwd)).to_s
8
+ $stderr.puts "Configuration #{path} file not found. \n"\
8
9
  "Make sure webpacker:install is run successfully before " \
9
10
  "running dependent tasks"
10
11
  exit!
@@ -5,6 +5,14 @@ namespace :webpacker do
5
5
  node_env = ENV.fetch("NODE_ENV") do
6
6
  valid_node_envs.include?(Rails.env) ? Rails.env : "production"
7
7
  end
8
- system({ "NODE_ENV" => node_env }, "yarn install --no-progress --frozen-lockfile")
8
+ Dir.chdir(Rails.root) do
9
+ yarn_flags =
10
+ if `yarn --version`.start_with?("1")
11
+ "--no-progress --frozen-lockfile"
12
+ else
13
+ "--immutable"
14
+ end
15
+ system({ "NODE_ENV" => node_env }, "yarn install #{yarn_flags}")
16
+ end
9
17
  end
10
18
  end
@@ -23,7 +23,7 @@ class Webpacker::Commands
23
23
  .each_with_index
24
24
  .drop_while do |(mtime, _), index|
25
25
  max_age = [0, Time.now - Time.at(mtime)].max
26
- max_age < age && index < count
26
+ max_age < age || index < count
27
27
  end
28
28
  .each do |(_, files), index|
29
29
  files.each do |file|
@@ -4,6 +4,8 @@ require "digest/sha1"
4
4
  class Webpacker::Compiler
5
5
  # Additional paths that test compiler needs to watch
6
6
  # Webpacker::Compiler.watched_paths << 'bower_components'
7
+ #
8
+ # Deprecated. Use additional_paths in the YAML configuration instead.
7
9
  cattr_accessor(:watched_paths) { [] }
8
10
 
9
11
  # Additional environment variables that the compiler is being run with
@@ -26,7 +28,7 @@ class Webpacker::Compiler
26
28
  record_compilation_digest
27
29
  end
28
30
  else
29
- logger.info "Everything's up-to-date. Nothing to do"
31
+ logger.debug "Everything's up-to-date. Nothing to do"
30
32
  true
31
33
  end
32
34
  end
@@ -50,9 +52,12 @@ class Webpacker::Compiler
50
52
  end
51
53
 
52
54
  def watched_files_digest
53
- files = Dir[*default_watched_paths, *watched_paths].reject { |f| File.directory?(f) }
54
- file_ids = files.sort.map { |f| "#{File.basename(f)}/#{Digest::SHA1.file(f).hexdigest}" }
55
- Digest::SHA1.hexdigest(file_ids.join("/"))
55
+ warn "Webpacker::Compiler.watched_paths has been deprecated. Set additional_paths in webpacker.yml instead." unless watched_paths.empty?
56
+ Dir.chdir File.expand_path(config.root_path) do
57
+ files = Dir[*default_watched_paths, *watched_paths].reject { |f| File.directory?(f) }
58
+ file_ids = files.sort.map { |f| "#{File.basename(f)}/#{Digest::SHA1.file(f).hexdigest}" }
59
+ Digest::SHA1.hexdigest(file_ids.join("/"))
60
+ end
56
61
  end
57
62
 
58
63
  def record_compilation_digest
@@ -60,12 +65,18 @@ class Webpacker::Compiler
60
65
  compilation_digest_path.write(watched_files_digest)
61
66
  end
62
67
 
68
+ def optionalRubyRunner
69
+ bin_webpack_path = config.root_path.join("bin/webpack")
70
+ first_line = File.readlines(bin_webpack_path).first.chomp
71
+ /ruby/.match?(first_line) ? RbConfig.ruby : ""
72
+ end
73
+
63
74
  def run_webpack
64
75
  logger.info "Compiling..."
65
76
 
66
77
  stdout, stderr, status = Open3.capture3(
67
78
  webpack_env,
68
- "#{RbConfig.ruby} ./bin/webpack",
79
+ "#{optionalRubyRunner} ./bin/webpack",
69
80
  chdir: File.expand_path(config.root_path)
70
81
  )
71
82
 
@@ -86,8 +97,8 @@ class Webpacker::Compiler
86
97
 
87
98
  def default_watched_paths
88
99
  [
89
- *config.resolved_paths_globbed,
90
- config.source_path_globbed,
100
+ *config.additional_paths,
101
+ "#{config.source_path}/**/*",
91
102
  "yarn.lock", "package.json",
92
103
  "config/webpack/**/*"
93
104
  ].freeze
@@ -101,6 +112,7 @@ class Webpacker::Compiler
101
112
  return env unless defined?(ActionController::Base)
102
113
 
103
114
  env.merge("WEBPACKER_ASSET_HOST" => ENV.fetch("WEBPACKER_ASSET_HOST", ActionController::Base.helpers.compute_asset_host),
104
- "WEBPACKER_RELATIVE_URL_ROOT" => ENV.fetch("WEBPACKER_RELATIVE_URL_ROOT", ActionController::Base.relative_url_root))
115
+ "WEBPACKER_RELATIVE_URL_ROOT" => ENV.fetch("WEBPACKER_RELATIVE_URL_ROOT", ActionController::Base.relative_url_root),
116
+ "WEBPACKER_CONFIG" => webpacker.config_path.to_s)
105
117
  end
106
118
  end