Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 1ccd2ff

Browse files
committed
fix: pull in fork of shakapacker
1 parent 5374d6a commit 1ccd2ff

File tree

10 files changed

+47
-8
lines changed

10 files changed

+47
-8
lines changed

‎.github/workflows/ruby.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ jobs:
8181
# having to do with automatic kwarg splatting
8282
MT_KWARGS_HACK: 1
8383
PACKAGE_JSON_FALLBACK_MANAGER: ${{ matrix.js_package_manager.name }}
84+
SHAKAPACKER_USE_PACKAGE_JSON_GEM: true
8485
steps:
8586
- uses: actions/checkout@v4
8687
with:

‎Appraisals

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ end
1616

1717
appraise 'shakapacker' do
1818
gem 'rails', '~> 7.0.x'
19-
gem 'shakapacker', '7.0.2'
19+
gem 'shakapacker', github: 'G-Rath/shakapacker',branch: 'use-package_json'
2020
end
2121

2222
appraise 'base' do

‎gemfiles/base.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
source "http://rubygems.org"
44

5+
gem "package_json", github: "G-Rath/package_json"
56
gem "rails", "~> 7.0.x"
67

78
gemspec path: "../"

‎gemfiles/base.gemfile.lock

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
GIT
2+
remote: https://github.com/G-Rath/package_json.git
3+
revision: d48f2c0db14bb1305f249fffb52fd2e0065678ee
4+
specs:
5+
package_json (0.1.0)
6+
17
PATH
28
remote: ..
39
specs:
@@ -258,6 +264,7 @@ DEPENDENCIES
258264
guard-minitest
259265
jbuilder
260266
listen (~> 3.0.0)
267+
package_json!
261268
pry-byebug
262269
rails (~> 7.0.x)
263270
react-rails!

‎gemfiles/shakapacker.gemfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
source "http://rubygems.org"
44

5+
gem "package_json", github: "G-Rath/package_json"
56
gem "rails", "~> 7.0.x"
6-
gem "shakapacker", "7.0.2"
7+
gem "shakapacker", github: "G-Rath/shakapacker", branch: "use-package_json"
78

89
gemspec path: "../"

‎gemfiles/shakapacker.gemfile.lock

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
GIT
2+
remote: https://github.com/G-Rath/package_json.git
3+
revision: d48f2c0db14bb1305f249fffb52fd2e0065678ee
4+
specs:
5+
package_json (0.1.0)
6+
7+
GIT
8+
remote: https://github.com/G-Rath/shakapacker.git
9+
revision: 8e9db60edd13429bdae9783d7f37bac70470870c
10+
branch: use-package_json
11+
specs:
12+
shakapacker (7.0.3)
13+
activesupport (>= 5.2)
14+
rack-proxy (>= 0.6.1)
15+
railties (>= 5.2)
16+
semantic_range (>= 2.3.0)
17+
118
PATH
219
remote: ..
320
specs:
@@ -227,11 +244,6 @@ GEM
227244
rubyzip (>= 1.2.2, < 3.0)
228245
websocket (~> 1.0)
229246
semantic_range (3.0.0)
230-
shakapacker (7.0.2)
231-
activesupport (>= 5.2)
232-
rack-proxy (>= 0.6.1)
233-
railties (>= 5.2)
234-
semantic_range (>= 2.3.0)
235247
shellany (0.0.1)
236248
simplecov (0.13.0)
237249
docile (~> 1.1.0)
@@ -268,11 +280,12 @@ DEPENDENCIES
268280
guard-minitest
269281
jbuilder
270282
listen (~> 3.0.0)
283+
package_json!
271284
pry-byebug
272285
rails (~> 7.0.x)
273286
react-rails!
274287
selenium-webdriver
275-
shakapacker (= 7.0.2)
288+
shakapacker!
276289
test-unit (~> 2.5)
277290

278291
BUNDLED WITH

‎gemfiles/sprockets_3.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
source "http://rubygems.org"
44

5+
gem "package_json", github: "G-Rath/package_json"
56
gem "rails", "~> 7.0.x"
67
gem "sprockets", "~> 3.5"
78
gem "sprockets-rails"

‎gemfiles/sprockets_3.gemfile.lock

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
GIT
2+
remote: https://github.com/G-Rath/package_json.git
3+
revision: d48f2c0db14bb1305f249fffb52fd2e0065678ee
4+
specs:
5+
package_json (0.1.0)
6+
17
PATH
28
remote: ..
39
specs:
@@ -270,6 +276,7 @@ DEPENDENCIES
270276
jbuilder
271277
listen (~> 3.0.0)
272278
mini_racer
279+
package_json!
273280
pry-byebug
274281
rails (~> 7.0.x)
275282
react-rails!

‎gemfiles/sprockets_4.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
source "http://rubygems.org"
44

5+
gem "package_json", github: "G-Rath/package_json"
56
gem "rails", "~> 7.0.x"
67
gem "sprockets", "~> 4.0.x"
78
gem "sprockets-rails"

‎gemfiles/sprockets_4.gemfile.lock

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
GIT
2+
remote: https://github.com/G-Rath/package_json.git
3+
revision: d48f2c0db14bb1305f249fffb52fd2e0065678ee
4+
specs:
5+
package_json (0.1.0)
6+
17
PATH
28
remote: ..
39
specs:
@@ -270,6 +276,7 @@ DEPENDENCIES
270276
jbuilder
271277
listen (~> 3.0.0)
272278
mini_racer
279+
package_json!
273280
pry-byebug
274281
rails (~> 7.0.x)
275282
react-rails!

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /