shakapacker 6.1.0 → 6.2.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/ISSUE_TEMPLATE/bug_report.md +1 -1
- data/.github/ISSUE_TEMPLATE/feature-request.md +1 -1
- data/.node-version +1 -1
- data/CHANGELOG.md +26 -2
- data/Gemfile.lock +1 -1
- data/README.md +42 -16
- data/docs/customizing_babel_config.md +2 -0
- data/docs/deployment.md +2 -2
- data/docs/style_loader_vs_mini_css.md +48 -0
- data/docs/troubleshooting.md +18 -0
- data/docs/using_esbuild_loader.md +128 -0
- data/docs/using_swc_loader.md +2 -2
- data/docs/v6_upgrade.md +72 -74
- data/lib/install/config/webpacker.yml +15 -1
- data/lib/install/template.rb +2 -2
- data/lib/webpacker/commands.rb +2 -2
- data/lib/webpacker/compiler.rb +2 -2
- data/lib/webpacker/configuration.rb +16 -4
- data/lib/webpacker/dev_server.rb +11 -2
- data/lib/webpacker/helper.rb +0 -7
- data/lib/webpacker/instance.rb +1 -1
- data/lib/webpacker/manifest.rb +3 -3
- data/lib/webpacker/railtie.rb +7 -0
- data/lib/webpacker/version.rb +1 -1
- data/lib/webpacker/version_checker.rb +152 -0
- data/package/__tests__/config.js +11 -0
- data/package/config.js +6 -0
- data/package/environments/base.js +1 -1
- data/package/esbuild/index.js +40 -0
- data/package/inliningCss.js +1 -1
- data/package/rules/__tests__/file.js +35 -0
- data/package/rules/__tests__/index.js +11 -0
- data/package/rules/__tests__/raw.js +18 -0
- data/package/rules/esbuild.js +23 -0
- data/package/rules/file.js +2 -17
- data/package/rules/index.js +1 -0
- data/package/rules/raw.js +2 -2
- data/package/swc/index.js +3 -3
- data/package.json +2 -1
- data/test/configuration_test.rb +26 -0
- data/test/fixtures/beta_package.json +13 -0
- data/test/fixtures/git_url_package.json +13 -0
- data/test/fixtures/github_url_package.json +13 -0
- data/test/fixtures/normal_package.json +13 -0
- data/test/fixtures/relative_path_package.json +13 -0
- data/test/fixtures/semver_caret_package.json +13 -0
- data/test/fixtures/semver_tilde_package.json +13 -0
- data/test/fixtures/without_package.json +13 -0
- data/test/helper_test.rb +12 -12
- data/test/test_app/config/webpacker.yml +4 -0
- data/test/test_app/config/webpacker_manifest_path.yml +80 -0
- data/test/version_checker_test.rb +271 -0
- data/test/webpacker_test.rb +15 -0
- data/yarn.lock +145 -1
- metadata +31 -3
data/docs/v6_upgrade.md
CHANGED
@@ -2,6 +2,8 @@
|
|
2
2
|
|
3
3
|
There are several substantial changes in Shakapacker v6 that you need to manually account for when coming from Webpacker 5. This guide will help you through it.
|
4
4
|
|
5
|
+
[ShakaCode](https://www.shakacode.com) offers suppport for upgrading from webpacker or using Shakapacker. If interested, contact [justin@shakacode.com](mailto:justin@shakacode.com).
|
6
|
+
|
5
7
|
## Webpacker/Shakapacker has become a slimmer wrapper around Webpack
|
6
8
|
|
7
9
|
By default, Webpacker 6 is focused on compiling and bundling JavaScript. This pairs with the existing asset pipeline in Rails that's setup to transpile CSS and static images using [Sprockets](https://github.com/rails/sprockets). For most developers, that's the recommended combination. But if you'd like to use Webpacker for CSS and static assets as well, please see [integrations](https://github.com/shakacode/shakapacker#integrations) for more information.
|
@@ -10,16 +12,16 @@ Webpacker used to configure Webpack indirectly, which lead to a [complicated sec
|
|
10
12
|
|
11
13
|
While you have to configure integration with frameworks yourself, [`webpack-merge`](https://github.com/survivejs/webpack-merge) helps with this. See this example for [Vue](https://github.com/shakacode/shakapacker#other-frameworks) and scroll to the bottom for [more examples](#examples-of-v5-to-v6).
|
12
14
|
|
13
|
-
## webpacker v6.0.0.rc.6 to shakapacker v6.0.0
|
15
|
+
## webpacker v6.0.0.rc.6 to shakapacker v6.0.0
|
14
16
|
See an example migration here: [PR 27](https://github.com/shakacode/react_on_rails_tutorial_with_ssr_and_hmr_fast_refresh/pull/27).
|
15
|
-
|
17
|
+
|
16
18
|
### Update Steps to v6.0.0 from v6.0.0.rc.6
|
17
19
|
_If you're on webpacker v5, follow below steps to get to v6.0.0.rc.6 first._
|
18
20
|
|
19
21
|
1. Change the gem name from `webpacker` to `shakapacker` and the NPM package from `@rails/webpacker` to `shakapacker`.
|
20
|
-
1. Install the peer dependencies. Run `yarn add @babel/core @babel/plugin-transform-runtime @babel/preset-env @babel/runtime babel-loader compression-webpack-plugin terser-webpack-plugin webpack webpack-assets-manifest webpack-cli webpack-merge webpack-sources webpack-dev-server`
|
22
|
+
1. Install the peer dependencies. Run `yarn add @babel/core @babel/plugin-transform-runtime @babel/preset-env @babel/runtime babel-loader compression-webpack-plugin terser-webpack-plugin webpack webpack-assets-manifest webpack-cli webpack-merge webpack-sources webpack-dev-server`. You may have old versions of libraries. Run `yarn install` and check for warnings like `warning " > shakapacker@6.1.1" has incorrect peer dependency "compression-webpack-plugin@^9.0.0"` and `file-loader@1.1.11" has incorrect peer dependency "webpack@^2.0.0 || ^3.0.0 || ^4.0.0"`. In other words, warnings like these are **serious** and will cause considerable confusion if not respected.
|
21
23
|
1. Update any scripts that called `bin/webpack` or `bin/webpack-dev-server` to `bin/webpacker` or `bin/webpacker-dev-server`
|
22
|
-
1. Update your webpack config for a single config file, `config/webpack/webpack.config.js`. If you want to use the prior style of having a separate file for each NODE_ENV, you can use this shim for `config/webpack/webpack.config.js
|
24
|
+
1. Update your webpack config for a single config file, `config/webpack/webpack.config.js`. If you want to use the prior style of having a separate file for each NODE_ENV, you can use this shim for `config/webpack/webpack.config.js`. WARNING, previously, if you did not set `NODE_ENV`, `NODE_ENV` defaulted to `development`. Thus, you might expect `config/webpack/development.js` to run, but you'll instead be using the `config/webpack/RAILS_ENV.js`
|
23
25
|
```js
|
24
26
|
const { env, webpackConfig } = require('shakapacker')
|
25
27
|
const { existsSync } = require('fs')
|
@@ -30,11 +32,12 @@ _If you're on webpacker v5, follow below steps to get to v6.0.0.rc.6 first._
|
|
30
32
|
if (existsSync(path)) {
|
31
33
|
console.log(`Loading ENV specific webpack configuration file ${path}`)
|
32
34
|
return require(path)
|
33
|
-
} else {
|
34
|
-
|
35
|
+
} else {
|
36
|
+
// Probably an error if the file for the NODE_ENV does not exist
|
37
|
+
throw new Error(`Got Error with NODE_ENV = ${env.nodeEnv}`);
|
35
38
|
}
|
36
39
|
}
|
37
|
-
|
40
|
+
|
38
41
|
module.exports = envSpecificConfig()
|
39
42
|
```
|
40
43
|
1. Update `babel.config.js` if you need JSX support. See [Customizing Babel Config](./customizing_babel_config.md)
|
@@ -43,26 +46,26 @@ _If you're on webpacker v5, follow below steps to get to v6.0.0.rc.6 first._
|
|
43
46
|
1. Ensure you have a clean working git branch. You will be overwriting all your files and reverting the changes that you don't want.
|
44
47
|
|
45
48
|
1. Consider changing from the v5 default for `source_entry_path` in `webpacker.yml`.
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
49
|
+
```yml
|
50
|
+
source_path: app/javascript
|
51
|
+
source_entry_path: packs
|
52
|
+
```
|
53
|
+
consider changing to the v6 default:
|
54
|
+
```yml
|
55
|
+
source_path: app/javascript
|
56
|
+
source_entry_path: /
|
57
|
+
```
|
58
|
+
Then consider moving your `app/javascript/packs/*` (including `application.js`) to `app/javascript/` and updating the configuration file.
|
59
|
+
|
60
|
+
Note, moving your files is optional, as you can stil keep your entries in a separate directory, called something like `packs`, or `entries`. This directory is defined within the source_path.
|
58
61
|
|
59
62
|
1. **Ensure no nested directories in your `source_entry_path`.** Check if you had any entry point files in child directories of your `source_entry_path`. Files for entry points in child directories are not supported by shakacode/shakapacker v6. Move those files to the top level, adjusting any imports in those files.
|
60
63
|
|
61
|
-
|
64
|
+
The new v6 configuration does not allow nesting, so as to allow placing the entry points at in the root directory of JavaScript. You can find this change [here](https://github.com/rails/webpacker/commit/5de0fbc1e16d3db0c93202fb39f5b4d80582c682#diff-7af8667a3e36201db57c02b68dd8651883d7bfc00dc9653661be11cd31feeccdL19).
|
62
65
|
|
63
66
|
1. Upgrade the Webpacker Ruby gem and the NPM package
|
64
67
|
|
65
|
-
Note: [Check the gem page to verify the latest version](https://rubygems.org/gems/shakapacker), and make sure to install identical version numbers of `shakapacker` gem and package. (Gems use a
|
68
|
+
Note: [Check the gem page to verify the latest version](https://rubygems.org/gems/shakapacker), and make sure to install identical version numbers of `shakapacker` gem and package. (Gems use a hyphen and packages use a dot between the main version number and the beta version.)
|
66
69
|
|
67
70
|
Example going to a specific version:
|
68
71
|
|
@@ -79,35 +82,15 @@ _If you're on webpacker v5, follow below steps to get to v6.0.0.rc.6 first._
|
|
79
82
|
yarn add shakapacker@6.0.0-rc.13 --exact
|
80
83
|
```
|
81
84
|
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
Overwrite all files and check what changed.
|
85
|
+
```bash
|
86
|
+
bundle exec rails webpacker:install
|
87
|
+
```
|
87
88
|
|
88
|
-
|
89
|
-
```bash
|
90
|
-
yarn add @babel/core @babel/plugin-transform-runtime @babel/preset-env @babel/runtime babel-loader compression-webpack-plugin terser-webpack-plugin webpack webpack-assets-manifest webpack-cli webpack-merge webpack-sources webpack-dev-server
|
91
|
-
```
|
89
|
+
Overwrite all files and check what changed.
|
92
90
|
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
const { env, webpackConfig } = require('shakapacker')
|
97
|
-
const { existsSync } = require('fs')
|
98
|
-
const { resolve } = require('path')
|
99
|
-
|
100
|
-
const envSpecificConfig = () => {
|
101
|
-
const path = resolve(__dirname, `${env.nodeEnv}.js`)
|
102
|
-
if (existsSync(path)) {
|
103
|
-
console.log(`Loading ENV specific webpack configuration file ${path}`)
|
104
|
-
return require(path)
|
105
|
-
} else {
|
106
|
-
return webpackConfig
|
107
|
-
}
|
108
|
-
}
|
109
|
-
|
110
|
-
module.exports = envSpecificConfig()
|
91
|
+
Note, the webpacker:install will install the peer dependencies:
|
92
|
+
```bash
|
93
|
+
yarn add @babel/core @babel/plugin-transform-runtime @babel/preset-env @babel/runtime babel-loader compression-webpack-plugin terser-webpack-plugin webpack webpack-assets-manifest webpack-cli webpack-merge webpack-sources webpack-dev-server
|
111
94
|
```
|
112
95
|
|
113
96
|
1. Review the new default's changes to `webpacker.yml`. Consider each suggested change carefully, especially the change to have your `source_entry_path` be at the top level of your `source_path`.
|
@@ -135,51 +118,66 @@ _If you're on webpacker v5, follow below steps to get to v6.0.0.rc.6 first._
|
|
135
118
|
|
136
119
|
1. If you are using any integrations like `css`, `postcss`, `React` or `TypeScript`. Please see https://github.com/shakacode/shakapacker#integrations section on how they work in v6.
|
137
120
|
|
138
|
-
1.
|
121
|
+
1. `config/webpack/environment.js` was changed to `config/webpack/base.js` and exports a native webpack config so no need to call `toWebpackConfig`.
|
122
|
+
Use `merge` to make changes:
|
123
|
+
|
139
124
|
```js
|
140
|
-
// config/webpack/
|
141
|
-
const { webpackConfig, merge } = require('
|
142
|
-
const customConfig =
|
143
|
-
|
144
|
-
|
125
|
+
// config/webpack/base.js
|
126
|
+
const { webpackConfig, merge } = require('@rails/webpacker');
|
127
|
+
const customConfig = {
|
128
|
+
module: {
|
129
|
+
rules: [
|
130
|
+
{
|
131
|
+
test: require.resolve('jquery'),
|
132
|
+
loader: 'expose-loader',
|
133
|
+
options: {
|
134
|
+
exposes: ['$', 'jQuery']
|
135
|
+
}
|
136
|
+
}
|
137
|
+
]
|
138
|
+
}
|
139
|
+
};
|
140
|
+
|
141
|
+
module.exports = merge(webpackConfig, customConfig);
|
145
142
|
```
|
146
|
-
|
143
|
+
|
147
144
|
1. Copy over custom browserlist config from `.browserslistrc` if it exists into the `"browserslist"` key in `package.json` and remove `.browserslistrc`.
|
148
145
|
|
149
146
|
1. Remove `babel.config.js` if you never changed it. Configure your `package.json` to use the default:
|
150
|
-
|
151
|
-
|
152
|
-
|
153
|
-
|
154
|
-
|
155
|
-
|
156
|
-
|
157
|
-
|
147
|
+
```json
|
148
|
+
"babel": {
|
149
|
+
"presets": [
|
150
|
+
"./node_modules/@rails/webpacker/package/babel/preset.js"
|
151
|
+
]
|
152
|
+
}
|
153
|
+
```
|
154
|
+
See customization example the [Customizing Babel Config](./docs/customizing_babel_config.md) for React configuration.
|
158
155
|
|
159
156
|
1. `extensions` was removed from the `webpacker.yml` file. Move custom extensions to your configuration by merging an object like this. For more details, see docs for [Webpack Configuration](https://github.com/shakacode/shakapacker/blob/master/README.md#webpack-configuration)
|
160
157
|
|
161
|
-
|
162
|
-
|
163
|
-
|
164
|
-
|
165
|
-
|
166
|
-
|
167
|
-
|
168
|
-
1. In `webpacker.yml`, check if you had `watched_paths`. That is
|
158
|
+
```js
|
159
|
+
{
|
160
|
+
resolve: {
|
161
|
+
extensions: ['.ts', '.tsx', '.vue', '.css']
|
162
|
+
}
|
163
|
+
}
|
164
|
+
```
|
165
|
+
1. In `webpacker.yml`, check if you had `watched_paths`. That is now `additional_paths`.
|
169
166
|
|
170
167
|
1. Some dependencies were removed in [PR 3056](https://github.com/rails/webpacker/pull/3056). If you see the error: `Error: Cannot find module 'babel-plugin-macros'`, or similar, then you need to `yarn add <dependency>` where <dependency> might include: `babel-plugin-macros`, `case-sensitive-paths-webpack-plugin`, `core-js`, `regenerator-runtime`. Or you might want to remove your dependency on those.
|
171
168
|
|
172
169
|
1. Review the new default's changes to `webpacker.yml` and `config/webpack`. Consider each suggested change carefully, especially the change to have your `source_entry_path` be at the top level of your `source_path`.
|
173
170
|
|
174
|
-
1. Make sure that you can run `bin/
|
171
|
+
1. Make sure that you can run `bin/webpack` without errors.
|
175
172
|
|
176
173
|
1. Try running `RAILS_ENV=production bin/rails assets:precompile`. If all goes well, don't forget to clean the generated assets with `bin/rails assets:clobber`.
|
177
174
|
|
178
175
|
1. Run `yarn add webpack-dev-server` if those are not already in your dev dependencies. Make sure you're using v4+.
|
179
176
|
|
180
|
-
1.
|
177
|
+
1. In `bin/webpack` and `bin/webpack-dev-server`, The default NODE_ENV, if not set, will be the RAILS_ENV. Previously, NODE_ENV would default to development if not set. Thus, the old bin stubs would use the webpack config corresponding to `config/webpack/development.js`. After the change, if `RAILS_ENV` is `test`, then `NODE_ENV` is `test`. The final 6.0 release changes to using a single `webpack.config.js`.
|
178
|
+
|
179
|
+
1. Now, follow the steps above to get to shakapacker v6 from webpacker v6.0.0.rc.6
|
181
180
|
|
182
|
-
1. Now, follow the steps above to get to shakapacker v6 from webpacker v6.0.0.rc.6[
|
183
181
|
|
184
182
|
## Examples of v5 to v6
|
185
183
|
|
@@ -8,6 +8,9 @@ default: &default
|
|
8
8
|
cache_path: tmp/webpacker
|
9
9
|
webpack_compile_output: true
|
10
10
|
|
11
|
+
# Location for manifest.json, defaults to {public_output_path}/manifest.json if unset
|
12
|
+
# manifest_path: public/packs/manifest.json
|
13
|
+
|
11
14
|
# Additional paths webpack should look up modules
|
12
15
|
# ['app/assets', 'engine/foo/app/assets']
|
13
16
|
additional_paths: []
|
@@ -15,9 +18,12 @@ default: &default
|
|
15
18
|
# Reload manifest.json on all requests so we reload latest compiled packs
|
16
19
|
cache_manifest: false
|
17
20
|
|
18
|
-
# Select loader to use, available options are 'babel' (default) or '
|
21
|
+
# Select loader to use, available options are 'babel' (default), 'swc' or 'esbuild'
|
19
22
|
webpack_loader: 'babel'
|
20
23
|
|
24
|
+
# Set to true to enable check for matching versions of shakapacker gem and NPM package - will raise an error if there is a mismatch or wildcard versioning is used
|
25
|
+
ensure_consistent_versioning: false
|
26
|
+
|
21
27
|
development:
|
22
28
|
<<: *default
|
23
29
|
compile: true
|
@@ -29,6 +35,14 @@ development:
|
|
29
35
|
port: 3035
|
30
36
|
# Hot Module Replacement updates modules while the application is running without a full reload
|
31
37
|
hmr: false
|
38
|
+
# If HMR is on, CSS will by inlined by delivering it as part of the script payload via style-loader. Be sure
|
39
|
+
# that you add style-loader to your project dependencies.
|
40
|
+
#
|
41
|
+
# If you want to instead deliver CSS via <link> with the mini-extract-css-plugin, set inline_css to false.
|
42
|
+
# In that case, style-loader is not needed as a dependency.
|
43
|
+
#
|
44
|
+
# mini-extract-css-plugin is a required dependency in both cases.
|
45
|
+
inline_css: true
|
32
46
|
# Defaults to the inverse of hmr. Uncomment to manually set this.
|
33
47
|
# live_reload: true
|
34
48
|
client:
|
data/lib/install/template.rb
CHANGED
@@ -58,10 +58,10 @@ results = []
|
|
58
58
|
Dir.chdir(Rails.root) do
|
59
59
|
if Webpacker::VERSION.match?(/^[0-9]+\.[0-9]+\.[0-9]+$/)
|
60
60
|
say "Installing shakapacker@#{Webpacker::VERSION}"
|
61
|
-
results << run("yarn add shakapacker@#{Webpacker::VERSION}")
|
61
|
+
results << run("yarn add shakapacker@#{Webpacker::VERSION} --exact")
|
62
62
|
else
|
63
63
|
say "Installing shakapacker@next"
|
64
|
-
results << run("yarn add shakapacker@next")
|
64
|
+
results << run("yarn add shakapacker@next --exact")
|
65
65
|
end
|
66
66
|
|
67
67
|
package_json = File.read("#{__dir__}/../../package.json")
|
data/lib/webpacker/commands.rb
CHANGED
@@ -16,7 +16,7 @@ class Webpacker::Commands
|
|
16
16
|
# age=600.
|
17
17
|
#
|
18
18
|
def clean(count = 2, age = 3600)
|
19
|
-
if config.public_output_path.exist? && config.
|
19
|
+
if config.public_output_path.exist? && config.manifest_path.exist?
|
20
20
|
packs
|
21
21
|
.map do |paths|
|
22
22
|
paths.map { |path| [Time.now - File.mtime(path), path] }
|
@@ -57,7 +57,7 @@ class Webpacker::Commands
|
|
57
57
|
private
|
58
58
|
def packs
|
59
59
|
all_files = Dir.glob("#{config.public_output_path}/**/*")
|
60
|
-
manifest_config = Dir.glob("#{config.
|
60
|
+
manifest_config = Dir.glob("#{config.manifest_path}*")
|
61
61
|
|
62
62
|
packs = all_files - manifest_config - current_version
|
63
63
|
packs.reject { |file| File.directory?(file) }.group_by do |path|
|
data/lib/webpacker/compiler.rb
CHANGED
@@ -47,7 +47,7 @@ class Webpacker::Compiler
|
|
47
47
|
attr_reader :webpacker
|
48
48
|
|
49
49
|
def last_compilation_digest
|
50
|
-
compilation_digest_path.read if compilation_digest_path.exist? && config.
|
50
|
+
compilation_digest_path.read if compilation_digest_path.exist? && config.manifest_path.exist?
|
51
51
|
rescue Errno::ENOENT, Errno::ENOTDIR
|
52
52
|
end
|
53
53
|
|
@@ -109,7 +109,7 @@ class Webpacker::Compiler
|
|
109
109
|
|
110
110
|
def default_watched_paths
|
111
111
|
[
|
112
|
-
*config.additional_paths,
|
112
|
+
*config.additional_paths.map { |path| "#{path}/**/*" },
|
113
113
|
"#{config.source_path}/**/*",
|
114
114
|
"yarn.lock", "package.json",
|
115
115
|
"config/webpack/**/*"
|
@@ -23,6 +23,10 @@ class Webpacker::Configuration
|
|
23
23
|
fetch(:compile)
|
24
24
|
end
|
25
25
|
|
26
|
+
def ensure_consistent_versioning?
|
27
|
+
fetch(:ensure_consistent_versioning)
|
28
|
+
end
|
29
|
+
|
26
30
|
def source_path
|
27
31
|
root_path.join(fetch(:source_path))
|
28
32
|
end
|
@@ -35,6 +39,18 @@ class Webpacker::Configuration
|
|
35
39
|
source_path.join(fetch(:source_entry_path))
|
36
40
|
end
|
37
41
|
|
42
|
+
def manifest_path
|
43
|
+
if data.has_key?(:manifest_path)
|
44
|
+
root_path.join(fetch(:manifest_path))
|
45
|
+
else
|
46
|
+
public_output_path.join("manifest.json")
|
47
|
+
end
|
48
|
+
end
|
49
|
+
|
50
|
+
def public_manifest_path
|
51
|
+
manifest_path
|
52
|
+
end
|
53
|
+
|
38
54
|
def public_path
|
39
55
|
root_path.join(fetch(:public_root_path))
|
40
56
|
end
|
@@ -43,10 +59,6 @@ class Webpacker::Configuration
|
|
43
59
|
public_path.join(fetch(:public_output_path))
|
44
60
|
end
|
45
61
|
|
46
|
-
def public_manifest_path
|
47
|
-
public_output_path.join("manifest.json")
|
48
|
-
end
|
49
|
-
|
50
62
|
def cache_manifest?
|
51
63
|
fetch(:cache_manifest)
|
52
64
|
end
|
data/lib/webpacker/dev_server.rb
CHANGED
@@ -1,9 +1,9 @@
|
|
1
1
|
class Webpacker::DevServer
|
2
2
|
DEFAULT_ENV_PREFIX = "WEBPACKER_DEV_SERVER".freeze
|
3
3
|
|
4
|
-
# Configure dev server connection timeout (in seconds), default: 0.
|
4
|
+
# Configure dev server connection timeout (in seconds), default: 0.1
|
5
5
|
# Webpacker.dev_server.connect_timeout = 1
|
6
|
-
cattr_accessor(:connect_timeout) { 0.
|
6
|
+
cattr_accessor(:connect_timeout) { 0.1 }
|
7
7
|
|
8
8
|
attr_reader :config
|
9
9
|
|
@@ -55,6 +55,15 @@ class Webpacker::DevServer
|
|
55
55
|
fetch(:hmr)
|
56
56
|
end
|
57
57
|
|
58
|
+
def inline_css?
|
59
|
+
case fetch(:inline_css)
|
60
|
+
when false, "false"
|
61
|
+
false
|
62
|
+
else
|
63
|
+
true
|
64
|
+
end
|
65
|
+
end
|
66
|
+
|
58
67
|
def env_prefix
|
59
68
|
config.dev_server.fetch(:env_prefix, DEFAULT_ENV_PREFIX)
|
60
69
|
end
|
data/lib/webpacker/helper.rb
CHANGED
@@ -148,13 +148,6 @@ module Webpacker::Helper
|
|
148
148
|
# <%= stylesheet_pack_tag 'calendar' %>
|
149
149
|
# <%= stylesheet_pack_tag 'map' %>
|
150
150
|
def stylesheet_pack_tag(*names, **options)
|
151
|
-
if @stylesheet_pack_tag_loaded
|
152
|
-
raise "To prevent duplicated chunks on the page, you should call stylesheet_pack_tag only once on the page. " \
|
153
|
-
"Please refer to https://github.com/shakacode/shakapacker/blob/master/README.md#usage for the usage guide"
|
154
|
-
end
|
155
|
-
|
156
|
-
@stylesheet_pack_tag_loaded = true
|
157
|
-
|
158
151
|
return "" if Webpacker.inlining_css?
|
159
152
|
|
160
153
|
stylesheet_link_tag(*sources_from_manifest_entrypoints(names, type: :stylesheet), **options)
|
data/lib/webpacker/instance.rb
CHANGED
data/lib/webpacker/manifest.rb
CHANGED
@@ -80,8 +80,8 @@ class Webpacker::Manifest
|
|
80
80
|
end
|
81
81
|
|
82
82
|
def load
|
83
|
-
if config.
|
84
|
-
JSON.parse config.
|
83
|
+
if config.manifest_path.exist?
|
84
|
+
JSON.parse config.manifest_path.read
|
85
85
|
else
|
86
86
|
{}
|
87
87
|
end
|
@@ -104,7 +104,7 @@ class Webpacker::Manifest
|
|
104
104
|
|
105
105
|
def missing_file_from_manifest_error(bundle_name)
|
106
106
|
<<-MSG
|
107
|
-
Webpacker can't find #{bundle_name} in #{config.
|
107
|
+
Webpacker can't find #{bundle_name} in #{config.manifest_path}. Possible causes:
|
108
108
|
1. You forgot to install node packages (try `yarn install`) or are running an incompatible version of Node
|
109
109
|
2. Your app has code with a non-standard extension (like a `.jsx` file) but the extension is not in the `extensions` config in `config/webpacker.yml`
|
110
110
|
3. You have set compile: false (see `config/webpacker.yml`) for this environment
|
data/lib/webpacker/railtie.rb
CHANGED
@@ -2,11 +2,18 @@ require "rails/railtie"
|
|
2
2
|
|
3
3
|
require "webpacker/helper"
|
4
4
|
require "webpacker/dev_server_proxy"
|
5
|
+
require "webpacker/version_checker"
|
5
6
|
|
6
7
|
class Webpacker::Engine < ::Rails::Engine
|
7
8
|
# Allows Webpacker config values to be set via Rails env config files
|
8
9
|
config.webpacker = ActiveSupport::OrderedOptions.new
|
9
10
|
|
11
|
+
initializer "webpacker.version_checker" do
|
12
|
+
if File.exist?(Webpacker::VersionChecker::NodePackageVersion.package_json_path)
|
13
|
+
Webpacker::VersionChecker.build.raise_if_gem_and_node_package_versions_differ
|
14
|
+
end
|
15
|
+
end
|
16
|
+
|
10
17
|
initializer "webpacker.proxy" do |app|
|
11
18
|
if (Webpacker.config.dev_server.present? rescue nil)
|
12
19
|
app.middleware.insert_before 0,
|
data/lib/webpacker/version.rb
CHANGED
@@ -0,0 +1,152 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
require "webpacker/version"
|
3
|
+
|
4
|
+
module Webpacker
|
5
|
+
class VersionChecker
|
6
|
+
attr_reader :node_package_version
|
7
|
+
|
8
|
+
MAJOR_MINOR_PATCH_VERSION_REGEX = /(\d+)\.(\d+)\.(\d+)/.freeze
|
9
|
+
|
10
|
+
def self.build
|
11
|
+
new(NodePackageVersion.build)
|
12
|
+
end
|
13
|
+
|
14
|
+
def initialize(node_package_version)
|
15
|
+
@node_package_version = node_package_version
|
16
|
+
end
|
17
|
+
|
18
|
+
def raise_if_gem_and_node_package_versions_differ
|
19
|
+
# Skip check if package is not in package.json or listed from relative path, git repo or github URL
|
20
|
+
return if node_package_version.skip_processing?
|
21
|
+
|
22
|
+
node_major_minor_patch = node_package_version.major_minor_patch
|
23
|
+
gem_major_minor_patch = gem_major_minor_patch_version
|
24
|
+
versions_match = node_major_minor_patch[0] == gem_major_minor_patch[0] &&
|
25
|
+
node_major_minor_patch[1] == gem_major_minor_patch[1] &&
|
26
|
+
node_major_minor_patch[2] == gem_major_minor_patch[2]
|
27
|
+
|
28
|
+
uses_wildcard = node_package_version.semver_wildcard?
|
29
|
+
|
30
|
+
if !Webpacker.config.ensure_consistent_versioning? && (uses_wildcard || !versions_match)
|
31
|
+
check_failed = if uses_wildcard
|
32
|
+
"Semver wildcard detected"
|
33
|
+
else
|
34
|
+
"Version mismatch detected"
|
35
|
+
end
|
36
|
+
|
37
|
+
warn <<-MSG.strip_heredoc
|
38
|
+
Webpacker::VersionChecker - #{check_failed}
|
39
|
+
|
40
|
+
You are currently not checking for consistent versions of shakapacker gem and npm package. A version mismatch or usage of semantic versioning wildcard (~ or ^) has been detected.
|
41
|
+
|
42
|
+
Version mismatch can lead to incorrect behavior and bugs. You should ensure that both the gem and npm package dependencies are locked to the same version.
|
43
|
+
|
44
|
+
You can enable the version check by setting `ensure_consistent_versioning: true` in your `webpacker.yml` file.
|
45
|
+
|
46
|
+
Checking for gem and npm package versions mismatch or wildcard will be enabled by default in the next major version of shakapacker.
|
47
|
+
MSG
|
48
|
+
|
49
|
+
return
|
50
|
+
end
|
51
|
+
|
52
|
+
raise_differing_versions_warning unless versions_match
|
53
|
+
|
54
|
+
raise_node_semver_version_warning if uses_wildcard
|
55
|
+
end
|
56
|
+
|
57
|
+
private
|
58
|
+
|
59
|
+
def common_error_msg
|
60
|
+
<<-MSG.strip_heredoc
|
61
|
+
Detected: #{node_package_version.raw}
|
62
|
+
gem: #{gem_version}
|
63
|
+
Ensure the installed version of the gem is the same as the version of
|
64
|
+
your installed node package. Do not use >= or ~> in your Gemfile for shakapacker.
|
65
|
+
Do not use ^ or ~ in your package.json for shakapacker.
|
66
|
+
Run `yarn add shakapacker --exact` in the directory containing folder node_modules.
|
67
|
+
MSG
|
68
|
+
end
|
69
|
+
|
70
|
+
def raise_differing_versions_warning
|
71
|
+
msg = "**ERROR** Webpacker: Webpacker gem and node package versions do not match\n#{common_error_msg}"
|
72
|
+
raise msg
|
73
|
+
end
|
74
|
+
|
75
|
+
def raise_node_semver_version_warning
|
76
|
+
msg = "**ERROR** Webpacker: Your node package version for shakapacker contains a "\
|
77
|
+
"^ or ~\n#{common_error_msg}"
|
78
|
+
raise msg
|
79
|
+
end
|
80
|
+
|
81
|
+
def gem_version
|
82
|
+
Webpacker::VERSION
|
83
|
+
end
|
84
|
+
|
85
|
+
def gem_major_minor_patch_version
|
86
|
+
match = gem_version.match(MAJOR_MINOR_PATCH_VERSION_REGEX)
|
87
|
+
[match[1], match[2], match[3]]
|
88
|
+
end
|
89
|
+
|
90
|
+
class NodePackageVersion
|
91
|
+
attr_reader :package_json
|
92
|
+
|
93
|
+
def self.build
|
94
|
+
new(package_json_path)
|
95
|
+
end
|
96
|
+
|
97
|
+
def self.package_json_path
|
98
|
+
Rails.root.join("package.json")
|
99
|
+
end
|
100
|
+
|
101
|
+
def initialize(package_json)
|
102
|
+
@package_json = package_json
|
103
|
+
end
|
104
|
+
|
105
|
+
def raw
|
106
|
+
parsed_package_contents = JSON.parse(package_json_contents)
|
107
|
+
parsed_package_contents.dig("dependencies", "shakapacker").to_s
|
108
|
+
end
|
109
|
+
|
110
|
+
def semver_wildcard?
|
111
|
+
raw.match(/[~^]/).present?
|
112
|
+
end
|
113
|
+
|
114
|
+
def skip_processing?
|
115
|
+
!package_specified? || relative_path? || git_url? || github_url?
|
116
|
+
end
|
117
|
+
|
118
|
+
def major_minor_patch
|
119
|
+
return if skip_processing?
|
120
|
+
|
121
|
+
match = raw.match(MAJOR_MINOR_PATCH_VERSION_REGEX)
|
122
|
+
unless match
|
123
|
+
raise "Cannot parse version number '#{raw}' (wildcard versions are not supported)"
|
124
|
+
end
|
125
|
+
|
126
|
+
[match[1], match[2], match[3]]
|
127
|
+
end
|
128
|
+
|
129
|
+
private
|
130
|
+
|
131
|
+
def package_specified?
|
132
|
+
raw.present?
|
133
|
+
end
|
134
|
+
|
135
|
+
def relative_path?
|
136
|
+
raw.match(%r{(\.\.|\Afile:///)}).present?
|
137
|
+
end
|
138
|
+
|
139
|
+
def git_url?
|
140
|
+
raw.match(%r{^git}).present?
|
141
|
+
end
|
142
|
+
|
143
|
+
def github_url?
|
144
|
+
raw.match(%r{^([\w-]+\/[\w-]+)}).present?
|
145
|
+
end
|
146
|
+
|
147
|
+
def package_json_contents
|
148
|
+
@package_json_contents ||= File.read(package_json)
|
149
|
+
end
|
150
|
+
end
|
151
|
+
end
|
152
|
+
end
|
data/package/__tests__/config.js
CHANGED
@@ -1,6 +1,7 @@
|
|
1
1
|
/* global test expect, describe */
|
2
2
|
|
3
3
|
const { chdirCwd, chdirTestApp, resetEnv } = require('../utils/helpers')
|
4
|
+
const { resolve } = require('path')
|
4
5
|
|
5
6
|
chdirTestApp()
|
6
7
|
|
@@ -31,4 +32,14 @@ describe('Config', () => {
|
|
31
32
|
'app/elm'
|
32
33
|
])
|
33
34
|
})
|
35
|
+
|
36
|
+
test('should default manifestPath to the public dir', () => {
|
37
|
+
expect(config.manifestPath).toEqual(resolve('public/packs/manifest.json'))
|
38
|
+
})
|
39
|
+
|
40
|
+
test('should allow overriding manifestPath', () => {
|
41
|
+
process.env.WEBPACKER_CONFIG = 'config/webpacker_manifest_path.yml'
|
42
|
+
const config = require('../config')
|
43
|
+
expect(config.manifestPath).toEqual(resolve('app/packs/manifest.json'))
|
44
|
+
})
|
34
45
|
})
|
data/package/config.js
CHANGED
@@ -29,4 +29,10 @@ const getPublicPath = () => {
|
|
29
29
|
config.publicPath = getPublicPath()
|
30
30
|
config.publicPathWithoutCDN = `/${config.public_output_path}/`
|
31
31
|
|
32
|
+
if (config.manifest_path) {
|
33
|
+
config.manifestPath = resolve(config.manifest_path)
|
34
|
+
} else {
|
35
|
+
config.manifestPath = resolve(config.outputPath, 'manifest.json')
|
36
|
+
}
|
37
|
+
|
32
38
|
module.exports = config
|