Skip to content

Commit 299b382

Browse files
justin808justin808
authored
Changes auto-committed by Conductor (#63)
1 parent 8850f2f commit 299b382

File tree

13 files changed

+183
-30
lines changed

13 files changed

+183
-30
lines changed

‎demos/basic-v16-webpack/Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ group :development do
4141
gem "web-console"
4242
end
4343

44-
gem "shakapacker", "~> 9.3.beta.5", github: "shakacode/shakapacker"
44+
gem "shakapacker", "~> 9.3.0.beta.5"
4545

4646
gem "react_on_rails", "~> 16.1"
4747

‎demos/basic-v16-webpack/Gemfile.lock‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,3 @@
1-
GIT
2-
remote: https://github.com/shakacode/shakapacker.git
3-
revision: 926be1d6a0dae1d64817f641268085032dbce3af
4-
specs:
5-
shakapacker (9.3.0.beta.5)
6-
activesupport (>= 5.2)
7-
package_json
8-
rack-proxy (>= 0.6.1)
9-
railties (>= 5.2)
10-
semantic_range (>= 2.3.0)
11-
121
PATH
132
remote: ../../packages/shakacode_demo_common
143
specs:
@@ -286,6 +275,12 @@ GEM
286275
ruby-progressbar (1.13.0)
287276
securerandom (0.4.1)
288277
semantic_range (3.1.0)
278+
shakapacker (9.3.0.beta.5)
279+
activesupport (>= 5.2)
280+
package_json
281+
rack-proxy (>= 0.6.1)
282+
railties (>= 5.2)
283+
semantic_range (>= 2.3.0)
289284
stringio (3.1.7)
290285
thor (1.4.0)
291286
thruster (0.1.15)
@@ -337,7 +332,7 @@ DEPENDENCIES
337332
react_on_rails (~> 16.1)
338333
rubocop-rails-omakase
339334
shakacode_demo_common!
340-
shakapacker (~> 9.3.beta.5)!
335+
shakapacker (~> 9.3.0.beta.5)
341336
thruster
342337
tzinfo-data
343338
web-console

‎demos/basic-v16-webpack/bin/shakapacker‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#!/usr/bin/env ruby
2-
# frozen_string_literal: true
32

43
ENV["RAILS_ENV"] ||= "development"
54
ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)

‎demos/basic-v16-webpack/bin/shakapacker-dev-server‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#!/usr/bin/env ruby
2-
# frozen_string_literal: true
32

43
ENV["RAILS_ENV"] ||= "development"
54
ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)

‎demos/basic-v16-webpack/config/shakapacker-builds.yml‎

Lines changed: 159 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,159 @@
1+
# Bundler Build Configurations
2+
# Generated by: bin/shakapacker-config --init
3+
#
4+
# Run builds with: bin/shakapacker --build <name>
5+
# List builds: bin/shakapacker --list-builds
6+
7+
builds:
8+
# ===========================================================================
9+
# DEVELOPMENT WITH HMR (Hot Module Replacement)
10+
# ===========================================================================
11+
# dev-hmr:
12+
# description: Client bundle with HMR (React Fast Refresh)
13+
# dev_server: true # Auto-delegates to bin/shakapacker-dev-server
14+
# environment:
15+
# NODE_ENV: development
16+
# RAILS_ENV: development
17+
# WEBPACK_SERVE: true
18+
# outputs:
19+
# - client
20+
21+
# # ===========================================================================
22+
# # DEVELOPMENT (Standard - no HMR)
23+
# # ===========================================================================
24+
# dev:
25+
# description: Development client bundle
26+
# environment:
27+
# NODE_ENV: development
28+
# RAILS_ENV: development
29+
# outputs:
30+
# - client
31+
32+
# # ===========================================================================
33+
# # PRODUCTION
34+
# # ===========================================================================
35+
# prod:
36+
# description: Production client bundle
37+
# environment:
38+
# NODE_ENV: production
39+
# RAILS_ENV: production
40+
# outputs:
41+
# - client
42+
43+
# ===========================================================================
44+
# REACT ON RAILS WITH SSR (Uncomment to enable)
45+
# ===========================================================================
46+
# Run separate client and server bundles for server-side rendering
47+
# For more info: https://github.com/shakacode/react_on_rails
48+
49+
dev:
50+
description: Development client bundle with HMR for SSR
51+
environment:
52+
NODE_ENV: development
53+
RAILS_ENV: development
54+
outputs:
55+
- client
56+
- server
57+
58+
dev-hmr:
59+
description: Development client bundle with HMR for SSR
60+
dev_server: true
61+
environment:
62+
NODE_ENV: development
63+
RAILS_ENV: development
64+
WEBPACK_SERVE: "true"
65+
CLIENT_BUNDLE_ONLY: "yes"
66+
outputs:
67+
- client
68+
69+
prod:
70+
description: Production client bundle for SSR
71+
environment:
72+
NODE_ENV: production
73+
RAILS_ENV: production
74+
outputs:
75+
- client
76+
- server
77+
78+
# ============================================================================
79+
# ADDITIONAL EXAMPLES
80+
# ============================================================================
81+
82+
# Example: Single bundle only (client or server)
83+
# dev-client-only:
84+
# description: Development client bundle only
85+
# environment:
86+
# NODE_ENV: development
87+
# RAILS_ENV: development
88+
# CLIENT_BUNDLE_ONLY: "yes"
89+
# outputs:
90+
# - client
91+
92+
# Example: Using bundler --env flags
93+
# prod-modern:
94+
# description: Production with custom webpack/rspack --env flags
95+
# environment:
96+
# NODE_ENV: production
97+
# RAILS_ENV: production
98+
# bundler_env:
99+
# target: modern # Becomes: --env target=modern
100+
# instrumented: true # Becomes: --env instrumented
101+
# outputs:
102+
# - client
103+
# - server
104+
105+
# Example: Variable substitution with defaults
106+
# staging:
107+
# description: Staging environment with variable substitution
108+
# environment:
109+
# NODE_ENV: production
110+
# RAILS_ENV: ${RAILS_ENV:-staging} # Use env var or default to 'staging'
111+
# outputs:
112+
# - client
113+
# - server
114+
115+
# Example: Custom config file path (uses ${BUNDLER} substitution)
116+
# custom-config:
117+
# description: Using custom config file location
118+
# environment:
119+
# NODE_ENV: development
120+
# config: config/${BUNDLER}/${BUNDLER}.config.js
121+
# outputs:
122+
# - client
123+
# - server
124+
125+
# ============================================================================
126+
# USAGE EXAMPLES
127+
# ============================================================================
128+
#
129+
# Initialize this config file:
130+
# bin/shakapacker-config --init
131+
#
132+
# List all available builds:
133+
# bin/shakapacker-config --list-builds
134+
#
135+
# Export development build configs:
136+
# bin/shakapacker-config --build=dev-hmr
137+
# Creates: rspack-dev-hmr-client.yml
138+
#
139+
# bin/shakapacker-config --build=dev
140+
# Creates: rspack-dev-client.yml, rspack-dev-server.yml
141+
#
142+
# Export production build:
143+
# bin/shakapacker-config --build=prod
144+
# Creates: rspack-prod-client.yml, rspack-prod-server.yml
145+
#
146+
# Use webpack instead of default rspack:
147+
# bin/shakapacker-config --build=prod --webpack
148+
# Creates: webpack-prod-client.yml, webpack-prod-server.yml
149+
#
150+
# Export to stdout for inspection (no files created):
151+
# bin/shakapacker-config --build=dev --stdout
152+
#
153+
# Export to custom directory:
154+
# bin/shakapacker-config --build=prod --save-dir=./debug
155+
#
156+
# Doctor mode (comprehensive troubleshooting):
157+
# bin/shakapacker-config --doctor
158+
# Creates files in: shakapacker-config-exports/
159+
#

‎demos/basic-v16-webpack/lib/tasks/e2e.rake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# frozen_string_literal: true
22

3-
require_relative "../../../shakacode_demo_common/e2e_test_runner"
3+
require_relative "../../../../packages/shakacode_demo_common/lib/shakacode_demo_common/e2e_test_runner"
44

55
namespace :e2e do
66
desc "Run Playwright tests against all dev modes (bin/dev, bin/dev static, bin/dev prod)"

‎demos/basic-v16-webpack/package-lock.json‎

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎demos/basic-v16-webpack/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"react-dom": "^19.2.0",
2121
"react-on-rails": "^16.1.1",
2222
"sass-loader": "^16.0.5",
23-
"shakapacker": "github:shakacode/shakapacker",
23+
"shakapacker": "9.3.0-beta.5",
2424
"style-loader": "^4.0.0",
2525
"swc-loader": "^0.2.6",
2626
"terser-webpack-plugin": "^5.3.14",

‎demos/basic-v16-webpack/shakapacker-config-exports/webpack-development-client.yaml‎ renamed to ‎demos/basic-v16-webpack/shakapacker-config-exports/webpack-dev-client.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# =============================================================================
22
# Webpack/Rspack Configuration Export
3-
# Generated: 2025-10-19T01:48:58.272Z
3+
# Generated: 2025-10-19T02:52:54.814Z
44
# Environment: development
55
# Bundler: webpack
66
# Config Type: client
@@ -268,4 +268,4 @@ module:
268268
- ./app/javascript
269269
use: ({ resource }) => getSwcLoaderConfig(resource)
270270
# Source map style: 'source-map' (full, slow), 'eval-source-map' (full, fast rebuild), 'cheap-source-map' (fast, less detail), false (none)
271-
devtool: cheap-module-source-map
271+
devtool: cheap-module-source-map

‎demos/basic-v16-webpack/shakapacker-config-exports/webpack-development-hmr-client.yaml‎ renamed to ‎demos/basic-v16-webpack/shakapacker-config-exports/webpack-dev-hmr-client.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# =============================================================================
22
# Webpack/Rspack Configuration Export
3-
# Generated: 2025-10-19T01:48:58.265Z
3+
# Generated: 2025-10-19T02:52:54.831Z
44
# Environment: development
55
# Bundler: webpack
6-
# Config Type: all
6+
# Config Type: client
77
# =============================================================================
88

99
# Controls webpack optimization: 'development' (fast builds, detailed errors), 'production' (optimized, minified), or 'none'
@@ -306,4 +306,4 @@ devServer:
306306
compress: true
307307
allowedHosts: auto
308308
headers:
309-
Access-Control-Allow-Origin: *
309+
Access-Control-Allow-Origin: *

0 commit comments

Comments
 (0)