Skip to content
This repository was archived by the owner on Mar 23, 2024. It is now read-only.

Commit bd84c42

Browse files
committed
Change the Rake task dependencies to be less brittle
1 parent 8e1a9d1 commit bd84c42

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

lib/tasks/requirejs-rails_tasks.rake

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,17 +72,14 @@ OS X Homebrew users can use 'brew install node'.
7272
end
7373

7474
namespace :precompile do
75-
task all: ["requirejs:precompile:prepare_source",
76-
"requirejs:precompile:generate_rjs_driver",
77-
"requirejs:precompile:run_rjs",
78-
"requirejs:precompile:digestify_and_compress"]
75+
task all: ["requirejs:precompile:digestify_and_compress"]
7976

8077
# Invoke another ruby process if we're called from inside
8178
# assets:precompile so we don't clobber the environment
8279
#
8380
# We depend on test_node here so we'll fail early and hard if node
8481
# isn't available.
85-
task external: ["requirejs:test_node"] do
82+
task :external do
8683
ruby_rake_task "requirejs:precompile:all"
8784
end
8885

@@ -132,7 +129,9 @@ OS X Homebrew users can use 'brew install node'.
132129
end
133130

134131
task run_rjs: ["requirejs:setup",
135-
"requirejs:test_node"] do
132+
"requirejs:test_node",
133+
"requirejs:precompile:prepare_source",
134+
"requirejs:precompile:generate_rjs_driver"] do
136135
requirejs.config.build_dir.mkpath
137136
requirejs.config.target_dir.mkpath
138137
requirejs.config.driver_path.dirname.mkpath
@@ -145,7 +144,7 @@ OS X Homebrew users can use 'brew install node'.
145144

146145
# Copy each built asset, identified by a named module in the
147146
# build config, to its Sprockets digestified name.
148-
task digestify_and_compress: ["requirejs:setup"] do
147+
task digestify_and_compress: ["requirejs:precompile:run_rjs"] do
149148
requirejs.config.build_config["modules"].each do |m|
150149
module_name = requirejs.config.module_name_for(m)
151150
paths = requirejs.config.build_config["paths"] || {}

0 commit comments

Comments
 (0)