lib/tasks/assets.rake in react_on_rails-9.0.0.beta.11 vs lib/tasks/assets.rake in react_on_rails-9.0.0.beta.12

@@ -49,14 +49,22 @@
 namespace :react_on_rails do
   namespace :assets do
     desc <<-DESC.strip_heredoc
       Compile assets with webpack
       Uses command defined with ReactOnRails.configuration.npm_build_production_command
-      sh "cd client && `ReactOnRails.configuration.npm_build_production_command`"
+
+      sh "#{ReactOnRails::Utils.prepend_cd_node_modules_directory('<ReactOnRails.configuration.npm_build_production_command>')}"
     DESC
     task webpack: :locale do
+      if Rake::Task.task_defined?("webpacker:compile")
+        # TODO: Eventually, this will need reconsideration if we use any of the Webpacker compilation
+        Rake::Task["webpacker:compile"].clear
+      end
+
       if ReactOnRails.configuration.npm_build_production_command.present?
-        sh "cd client && #{ReactOnRails.configuration.npm_build_production_command}"
+        sh ReactOnRails::Utils.prepend_cd_node_modules_directory(
+          ReactOnRails.configuration.npm_build_production_command
+        ).to_s
       end
     end
   end
 end