Skip to content

Commit 69cb72e

Browse files
authored
Merge pull request rails#54031 from bai/bun-lockfile-txt
Support plaintext bun lockfile
2 parents aca093f + b1d0c5d commit 69cb72e

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

actioncable/lib/rails/generators/channel/channel_generator.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ def using_js_runtime?
105105
end
106106

107107
def using_bun?
108-
# Cannot assume bun.lockb has been generated yet so we look for a file known to
108+
# Cannot assume Bun lockfile has been generated yet so we look for a file known to
109109
# be generated by the jsbundling-rails gem
110110
@using_bun ||= using_js_runtime? && root.join("bun.config.js").exist?
111111
end

railties/lib/rails/generators/rails/app/templates/Dockerfile.tt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ RUN yarn install --immutable
7373
<% end -%>
7474
<% if using_bun? -%>
7575
# Install node modules
76-
COPY package.json bun.lockb ./
76+
COPY package.json bun.lock* ./
7777
RUN bun install --frozen-lockfile
7878

7979
<% end -%>

0 commit comments

Comments
 (0)