webpacker 4.0.2 → 4.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1667789e4776c2fbb15b9093b65bc99d5b0734677382ca46a8a24135654d1f1
-  data.tar.gz: 1985a2543ac40f68feecfb972b908913f6337c9ce73414227eaf8c5bec9529cf
+  metadata.gz: ca4c04cd7d94f5b71c351ccc33131c7b3674e5fca8dbfd96e58917cc28638490
+  data.tar.gz: 8a2924f440cee006085a8b6131de74bc422b99be5c2bda35b98d976b3f4daba6
 SHA512:
-  metadata.gz: d21492d39f14322937c10248472fca38f4fa9b04229475c05610f18fa3895c6f633c22045c320a7c35479d445e08759c8bce42b8f43984a9de586d15bb845971
-  data.tar.gz: 9d2fd59577c3a292b9ccc5720253acc75db824f6e700b0048bbeebece83aa91001680e7d7e111647f9339188cb40f42117867817cecc0928edd9443a3f3ba513
+  metadata.gz: 26777525488474c374c6d002d81f24b57e24045f1386f75f5dd937e6da71baa65d5008357cd7e3f1b1ede5dbaf552f03c2e2718c2428a57daac3c744a8326ab1
+  data.tar.gz: 8baffc48b354871019ec994ceab2c5595d83aadebcfa66e130c3d8e8c97edb6de8c9f3268aadbb528582cef6a0867b72a97d6144ae5e047e65777057c770eb50

data/.gitignore

@@ -8,3 +8,4 @@ yarn-debug.log*
 yarn-error.log*
 .yarn-integrity
 /log
+gemfiles/*.lock

data/.travis.yml

@@ -1,12 +1,19 @@
-sudo: false
 language: ruby
+bundler_args: --jobs 3 --retry 3
+dist: xenial
 before_install:
-  - gem update --system
+  - gem install rubygems-update && update_rubygems
+  # Rails 4.2 doesn't support bundler 2.0, so we need to lock bundler to
+  # v1.17.3. This is just for Ruby 2.5 which ships with bundler 2.x on Travis
+  # CI while Ruby 2.6 does not.
+  # https://github.com/travis-ci/travis-rubies/issues/57#issuecomment-458981237
+  - yes | rvm @global do gem uninstall bundler --all
+  - yes | rvm @global do gem install bundler -v 1.17.3 || true
 rvm:
   - 2.3.8
-  - 2.4.5
-  - 2.5.3
-  - 2.6.0
+  - 2.4.6
+  - 2.5.5
+  - 2.6.2
   - ruby-head
 gemfile:
   - gemfiles/Gemfile-rails.4.2.x
@@ -22,7 +29,7 @@ cache:
 
 install:
   - bundle install
-  - nvm install node
+  - nvm install 10
   - node -v
   - npm i -g yarn
   - yarn
@@ -33,13 +40,14 @@ script:
   - bundle exec rake test
 matrix:
   allow_failures:
-  - gemfile: gemfiles/Gemfile-rails-edge
+    - gemfile: gemfiles/Gemfile-rails-edge
+    - rvm: ruby-head
   exclude:
     - rvm: 2.3.8
       gemfile: gemfiles/Gemfile-rails-edge
-    - rvm: 2.4.5
+    - rvm: 2.4.6
       gemfile: gemfiles/Gemfile-rails-edge
-    - rvm: 2.5.3
+    - rvm: 2.5.5
       gemfile: gemfiles/Gemfile-rails-edge
     - rvm: ruby-head
       gemfile: gemfiles/Gemfile-rails.4.2.x

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 **Please note that Webpacker 3.1.0 and 3.1.1 have some serious bugs so please consider using either 3.0.2 or 3.2.0**
 
+## [[4.0.3]](https://github.com/rails/webpacker/compare/v4.0.2...v4.0.3) - 2019-05-28
+
+Please see the diff
+
 ## [4.0.2] - 2019-03-06
 
 - Bump the version on npm

data/Gemfile

@@ -4,7 +4,6 @@ gemspec
 
 gem "rails"
 gem "rake", ">= 11.1"
-gem "rubocop", git: "https://github.com/rubocop-hq/rubocop.git", require: false
 gem "rack-proxy", require: false
 
 group :test do

data/Gemfile.lock

@@ -1,21 +1,7 @@
-GIT
-  remote: https://github.com/rubocop-hq/rubocop.git
-  revision: dc69686abf10d9f38ed3a39037fab76ae8874138
-  specs:
-    rubocop (0.65.0)
-      jaro_winkler (~> 1.5.1)
-      parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
-      powerpack (~> 0.1)
-      psych (>= 3.1.0)
-      rainbow (>= 2.2.2, < 4.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.4.0)
-
 PATH
   remote: .
   specs:
-    webpacker (4.0.2)
+    webpacker (4.0.3)
       activesupport (>= 4.2)
       rack-proxy (>= 0.6.1)
       railties (>= 4.2)
@@ -23,43 +9,43 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.2)
-      actionpack (= 5.2.2)
+    actioncable (5.2.3)
+      actionpack (= 5.2.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.2)
-      actionpack (= 5.2.2)
-      actionview (= 5.2.2)
-      activejob (= 5.2.2)
+    actionmailer (5.2.3)
+      actionpack (= 5.2.3)
+      actionview (= 5.2.3)
+      activejob (= 5.2.3)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.2)
-      actionview (= 5.2.2)
-      activesupport (= 5.2.2)
+    actionpack (5.2.3)
+      actionview (= 5.2.3)
+      activesupport (= 5.2.3)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.2)
-      activesupport (= 5.2.2)
+    actionview (5.2.3)
+      activesupport (= 5.2.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.2)
-      activesupport (= 5.2.2)
+    activejob (5.2.3)
+      activesupport (= 5.2.3)
       globalid (>= 0.3.6)
-    activemodel (5.2.2)
-      activesupport (= 5.2.2)
-    activerecord (5.2.2)
-      activemodel (= 5.2.2)
-      activesupport (= 5.2.2)
+    activemodel (5.2.3)
+      activesupport (= 5.2.3)
+    activerecord (5.2.3)
+      activemodel (= 5.2.3)
+      activesupport (= 5.2.3)
       arel (>= 9.0)
-    activestorage (5.2.2)
-      actionpack (= 5.2.2)
-      activerecord (= 5.2.2)
+    activestorage (5.2.3)
+      actionpack (= 5.2.3)
+      activerecord (= 5.2.3)
       marcel (~> 0.3.1)
-    activesupport (5.2.2)
+    activesupport (5.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -67,13 +53,13 @@ GEM
     arel (9.0.0)
     ast (2.4.0)
     builder (3.2.3)
-    byebug (11.0.0)
-    concurrent-ruby (1.1.4)
+    byebug (11.0.1)
+    concurrent-ruby (1.1.5)
     crass (1.0.4)
     erubi (1.8.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (1.5.3)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.2)
     loofah (2.2.3)
@@ -89,45 +75,50 @@ GEM
     mini_portile2 (2.4.0)
     minitest (5.11.3)
     nio4r (2.3.1)
-    nokogiri (1.10.1)
+    nokogiri (1.10.3)
       mini_portile2 (~> 2.4.0)
-    parallel (1.14.0)
-    parser (2.6.0.0)
+    parallel (1.17.0)
+    parser (2.6.3.0)
       ast (~> 2.4.0)
-    powerpack (0.1.2)
-    psych (3.1.0)
-    rack (2.0.6)
+    rack (2.0.7)
     rack-proxy (0.6.5)
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.2)
-      actioncable (= 5.2.2)
-      actionmailer (= 5.2.2)
-      actionpack (= 5.2.2)
-      actionview (= 5.2.2)
-      activejob (= 5.2.2)
-      activemodel (= 5.2.2)
-      activerecord (= 5.2.2)
-      activestorage (= 5.2.2)
-      activesupport (= 5.2.2)
+    rails (5.2.3)
+      actioncable (= 5.2.3)
+      actionmailer (= 5.2.3)
+      actionpack (= 5.2.3)
+      actionview (= 5.2.3)
+      activejob (= 5.2.3)
+      activemodel (= 5.2.3)
+      activerecord (= 5.2.3)
+      activestorage (= 5.2.3)
+      activesupport (= 5.2.3)
       bundler (>= 1.3.0)
-      railties (= 5.2.2)
+      railties (= 5.2.3)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.4)
       loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.2)
-      actionpack (= 5.2.2)
-      activesupport (= 5.2.2)
+    railties (5.2.3)
+      actionpack (= 5.2.3)
+      activesupport (= 5.2.3)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
     rainbow (3.0.0)
     rake (12.3.2)
-    ruby-progressbar (1.10.0)
+    rubocop (0.68.1)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.5, != 2.5.1.1)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 1.6)
+    ruby-progressbar (1.10.1)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -139,7 +130,7 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    unicode-display_width (1.4.1)
+    unicode-display_width (1.5.0)
     websocket-driver (0.7.0)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.3)
@@ -148,13 +139,13 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.12)
+  bundler (>= 1.3.0, < 2.0)
   byebug
   minitest (~> 5.0)
   rack-proxy
   rails
   rake (>= 11.1)
-  rubocop!
+  rubocop (< 0.69)
   webpacker!
 
 BUNDLED WITH

data/README.md

@@ -1,6 +1,6 @@
 # Webpacker
 
-![travis-ci status](https://api.travis-ci.org/rails/webpacker.svg?branch=master)
+[![Build Status](https://travis-ci.org/rails/webpacker.svg?branch=master)](https://travis-ci.org/rails/webpacker)
 [![node.js](https://img.shields.io/badge/node-%3E%3D%206.14.0-brightgreen.svg)](https://nodejs.org/en/)
 [![Gem](https://img.shields.io/gem/v/webpacker.svg)](https://github.com/rails/webpacker)
 
@@ -34,7 +34,7 @@ in which case you may not even need the asset pipeline. This is mostly relevant
   - [Vue](#vue)
   - [Elm](#elm)
   - [Stimulus](#stimulus)
-  - [Coffeescript](#coffeescript)
+  - [CoffeeScript](#coffeescript)
   - [Erb](#erb)
 - [Paths](#paths)
   - [Resolved](#resolved)
@@ -84,15 +84,11 @@ Or add it to your `Gemfile`:
 
 ```ruby
 # Gemfile
-gem 'webpacker', '~> 3.5'
+gem 'webpacker', '~> 4.x'
 
 # OR if you prefer to use master
 gem 'webpacker', git: 'https://github.com/rails/webpacker.git'
 yarn add https://github.com/rails/webpacker.git
-
-# OR to try out 4.x pre-release
-gem 'webpacker', '>= 4.0.x'
-yarn add @rails/webpacker@next
 ```
 
 Finally, run the following to install Webpacker:
@@ -294,9 +290,9 @@ You can run following commands to upgrade Webpacker to the latest stable version
 bundle update webpacker
 rails webpacker:binstubs
 yarn upgrade @rails/webpacker --latest
-yarn add webpack-dev-server@^3.1.14
+yarn upgrade webpack-dev-server --latest
 
-# Or to install a latest release (including pre-releases)
+# Or to install the latest release (including pre-releases)
 yarn add @rails/webpacker@next
 ```
 
@@ -310,7 +306,7 @@ To turn off this option, you will need to change the default setting in `config/
 # config/webpacker.yml
 development:
   ...
-  # Verifies that versions and hashed value of the package contents in the project's package.json
+  # Verifies that correct packages and versions are installed by inspecting package.json, yarn.lock, and node_modules
   check_yarn_integrity: false
 ```
 
@@ -335,7 +331,7 @@ new Rails 5.1+ app using `--webpack=react` option:
 rails new myapp --webpack=react
 ```
 
-(or run `bundle exec rails webpacker:install:react` in a existing Rails app already
+(or run `bundle exec rails webpacker:install:react` in an existing Rails app already
 setup with Webpacker).
 
 The installer will add all relevant dependencies using Yarn, changes
@@ -442,14 +438,14 @@ rails new myapp --webpack=stimulus
 
 Please read [The Stimulus Handbook](https://stimulusjs.org/handbook/introduction) or learn more about its source code at https://github.com/stimulusjs/stimulus
 
-### Coffeescript
+### CoffeeScript
 
-To add [Coffeescript](http://coffeescript.org/) support,
+To add [CoffeeScript](http://coffeescript.org/) support,
 run `bundle exec rails webpacker:install:coffee` on a Rails app already
 setup with Webpacker.
 
 An example `hello_coffee.coffee` file will also be added to your project
-in `app/javascript/packs` so that you can experiment with Coffeescript right away.
+in `app/javascript/packs` so that you can experiment with CoffeeScript right away.
 
 ### Erb
 

data/docs/assets.md

@@ -84,26 +84,36 @@ import 'assets/stylesheets/bar'
 ## Link in your Rails views
 
 You can also link `js/images/styles/fonts` used within your js app in views using
-`asset_pack_path` helper. This helper is useful in cases where you just want to
+`asset_pack_path` and `image_pack_tag` helpers. These helpers are useful in cases where you just want to
 create a `<link rel="prefetch">` or `<img />` for an asset.
 
 ```yml
 app/javascript:
   - packs
-    - hello_react.js
-  - styles
-    - hello_react.css
+    - app.js
   - images
     - calendar.png
 ```
 
+```js
+// app/javascript/packs/app.js (or any of your packs)
+
+// import all image files in a folder:
+require.context('../images', true)
+```
+
 ```erb
-<%= asset_pack_path 'hello_react.css' %>
-<%# => "/packs/hello_react.css" %>
+<%# Rails view, for example app/views/layouts/application.html.erb %>
+
+<img src="<%= asset_pack_path 'media/images/calendar.png' %>" />
+<% # => <img src="/packs/media/images/calendar-k344a6d59eef8632c9d1.png" /> %>
 
-<img src="<%= asset_pack_path 'images/calendar.png' %>" />
-<% # => <img src="/packs/images/calendar.png" /> %>
+<%= image_pack_tag 'media/images/calendar.png' %>
+<% # => <img src="/packs/media/images/calendar-k344a6d59eef8632c9d1.png" /> %>
 
-<%= image_pack_tag 'images/calendar.png' %>
-<% # => <img src="/packs/images/calendar.png" /> %>
+<%# no path resolves to default 'images' folder: %>
+<%= image_pack_tag 'calendar.png' %>
+<% # => <img src="/packs/media/images/calendar-k344a6d59eef8632c9d1.png" /> %>
 ```
+
+Note you need to add a `media/` prefix (not `/media/`) to any subfolder structure you might have in `app/javascript`. See more examples in the [tests](https://github.com/rails/webpacker/blob/0b86cadb5ed921e2c1538382e72a236ec30a5d97/test/helper_test.rb#L37).

data/docs/css.md

@@ -32,7 +32,7 @@ const Hello = props => (
 
 ## Import scoped styles into your JS app
 
-Stylesheets end with `.module.*` is treated as [CSS Modules](https://github.com/css-modules/css-modules).
+Stylesheets that end with `.module.*` are treated as [CSS Modules](https://github.com/css-modules/css-modules).
 
 ```sass
 // app/javascript/hello_react/styles/hello-react.module.sass
@@ -60,6 +60,59 @@ const Hello = props => (
 
 **Note:** Declared class is referenced as object property in JavaScript.
 
+## Import scoped styles into your TypeScript app
+
+Using CSS modules with a TypeScript application requires a few differences from a JavaScript app. The CSS / Sass files are the same:
+
+```sass
+// app/javascript/hello_react/styles/hello-react.module.sass
+
+.helloReact
+  padding: 20px
+  font-size: 12px
+```
+
+There must also be a type definition file for these styles:
+
+```typescript
+export const helloReact: string;
+```
+
+You can then import the styles like this:
+
+```typescript
+// React component example
+// app/javascripts/packs/hello_react.tsx
+
+import React from 'react'
+import helloIcon from '../hello_react/images/icon.png'
+import * as styles from '../hello_react/styles/hello-react.module.sass'
+
+const Hello = props => (
+  <div className={styles.helloReact}>
+    <img src={helloIcon} alt="hello-icon" />
+    <p>Hello {props.name}!</p>
+  </div>
+)
+```
+
+You can automatically generate type definitions for the styles by installing the `typed-scss-modules` as a development dependency:
+
+```
+yarn add typed-scss-modules --dev
+```
+
+Then by adding these lines to your `package.json`:
+
+```
+"scripts": {
+  "gen-typings": "yarn run tsm app/javascript/**/*.sass",
+  "watch-typings": "yarn run tsm app/javascript/**/*.sass -w"
+},
+```
+
+You can generate the typings for the stylesheet by running the command `yarn gen-typings` when you've finished writing CSS, or run `yarn watch-typings` to have it automatically generate them as you go.
+
 
 ## Link styles from your Rails views