webpacker 3.3.1 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8948ef5358c7aac19d89b4260b7dfee306f8a32e7c42b56d3006ad235449d0cf
-  data.tar.gz: 94bc168c4e24f6f80edfad97c37e50cbd591c4375b155572e1942448a65bf0af
+  metadata.gz: 5470791c43b6592ccb7695fea1838c1f09cf8df2072da5be33c26c1f5e3d2212
+  data.tar.gz: 4c422b0d744013934cb67bd79995bf408a10143dcdedf93d934dbf99854a8706
 SHA512:
-  metadata.gz: a0caa8e595e462e7039f3e8a41315408abc0bc8569e0604333bcbf61ad44c75fb3a1273b2e87d4fc0bba15fc423709aba705d5837c0dab06ff4a79a0931c8aee
-  data.tar.gz: 31f7ddf9709b74c32bec863a98bc855c245e8aeee204813d7acee196be3883117244dcd02b99125e969b23f687b7c3d28523d86de3997f5a8a2e6d647deb9bcf
+  metadata.gz: 785e7b6fa02e9e0459956c634a8cb59f59baae743a6fb3a43c8831406265f8dc6f2f56dedd51076afa1448ab239c8e22dfc81cf8d4cb06bf80f1092d7a480867
+  data.tar.gz: 8117b275c4135c4dbe64ab40123bb9b5855b8303ab1c64036ca3f71b26eac729437c43574b52682300710bf47cd512ea792de005cabcfbcbbfc511ef20e66626

data/.gitignore

@@ -7,3 +7,4 @@ node_modules
 yarn-debug.log*
 yarn-error.log*
 .yarn-integrity
+/log

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 **Please note that Webpacker 3.1.0 and 3.1.1 has some serious bugs so please consider using either 3.0.2 or 3.2.0**
 
+## [3.4.0] - 2018-03-23
+
+## Added
+  - Support for custom Rails environments [#1359](https://github.com/rails/webpacker/pull/1359)
+
+*This could break the compilation if you set NODE_ENV to custom environment. Now, NODE_ENV only understands production or development mode*
+
+
 ## [3.3.1] - 2018-03-12
 
 ## Fixed

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    webpacker (3.3.1)
+    webpacker (3.4.0)
       activesupport (>= 4.2)
       rack-proxy (>= 0.6.1)
       railties (>= 4.2)

data/README.md

@@ -22,7 +22,8 @@ in which case you may not even need the asset pipeline. This is mostly relevant
 - [Installation](#installation)
   - [Usage](#usage)
   - [Development](#development)
-  - [webpack configuration](#webpack-configuration)
+  - [Webpack Configuration](#webpack-configuration)
+  - [Custom Rails environments](#custom-rails-environments)
   - [Upgrading](#upgrading)
   - [Yarn Integrity](#yarn-integrity)
 - [Integrations](#integrations)
@@ -190,11 +191,61 @@ WEBPACKER_DEV_SERVER_HOST=0.0.0.0 ./bin/webpack-dev-server
 
 **Note:** Don't forget to prefix `ruby` when running these binstubs on Windows
 
-### webpack configuration
+### Webpack Configuration
 
 See [docs/webpack](docs/webpack.md) for modifying webpack configuration and loaders.
 
 
+### Custom Rails environments
+
+Out of the box Webpacker ships with - development, test and production environments in `config/webpacker.yml` however, in most production apps extra environments are needed as part of deployment workflow. Webpacker supports this out of the box from version 3.4.0+ onwards.
+
+You can choose to define additional environment configurations in webpacker.yml,
+
+```yml
+staging:
+  <<: *default
+
+  # Production depends on precompilation of packs prior to booting for performance.
+  compile: false
+
+  # Cache manifest.json for performance
+  cache_manifest: true
+
+  # Compile staging packs to a separate directory
+  public_output_path: packs-staging
+```
+
+or, Webpacker will use production environment as a fallback environment for loading configurations. Please note, `NODE_ENV` can either be set to `production` or `development`.
+This means you don't need to create additional environment files inside `config/webpacker/*` and instead use webpacker.yml to load different configurations using `RAILS_ENV`.
+
+For example, the below command will compile assets in production mode but will use staging configurations from `config/webpacker.yml` if available or use fallback production environment configuration:
+
+```bash
+RAILS_ENV=staging bundle exec rails assets:precompile
+```
+
+And, this will compile in development mode and load configuration for cucumber environment
+if defined in webpacker.yml or fallback to production configuration
+
+```bash
+RAILS_ENV=cucumber NODE_ENV=development bundle exec rails assets:precompile
+```
+
+Please note, binstubs compiles in development mode however rake tasks
+compiles in production mode.
+
+```bash
+# Compiles in development mode unless NODE_ENV is specified
+./bin/webpack
+./bin/webpack-dev-server
+
+# compiles in production mode by default unless NODE_ENV is specified
+bundle exec rails assets:precompile
+bundle exec rails webpacker:compile
+```
+
+
 ### Upgrading
 
 You can run following commands to upgrade Webpacker to the latest stable version. This process involves upgrading the gem and related npm modules:
@@ -202,7 +253,7 @@ You can run following commands to upgrade Webpacker to the latest stable version
 ```bash
 bundle update webpacker
 yarn upgrade @rails/webpacker --latest
-yarn upgrade webpack-dev-server --latest
+yarn add webpack-dev-server@^2.11.1
 ```
 
 ### Yarn Integrity

data/docs/testing.md

@@ -126,3 +126,12 @@ class HomesTest < ApplicationSystemTestCase
   end
 end
 ```
+
+## Capybara setup for Rails
+Make sure you configure Rails to serve static files from the public directory in the test environment.
+
+```rb
+# config/environments/test.rb
+# Configure public file server for tests with Cache-Control for performance.
+config.public_file_server.enabled = true
+```

data/lib/install/bin/webpack

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 ENV["RAILS_ENV"] ||= ENV["RACK_ENV"] || "development"
-ENV["NODE_ENV"] ||= ENV["RAILS_ENV"]
+ENV["NODE_ENV"]  ||= ENV["NODE_ENV"] || "development"
 
 require "pathname"
 ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",

data/lib/install/bin/webpack-dev-server

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 ENV["RAILS_ENV"] ||= ENV["RACK_ENV"] || "development"
-ENV["NODE_ENV"] ||= ENV["RAILS_ENV"]
+ENV["NODE_ENV"]  ||= ENV["NODE_ENV"] || "development"
 
 require "pathname"
 ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",

data/lib/install/config/webpack/development.js

@@ -1,3 +1,5 @@
+process.env.NODE_ENV = process.env.NODE_ENV || 'development'
+
 const environment = require('./environment')
 
 module.exports = environment.toWebpackConfig()

data/lib/install/config/webpack/production.js

@@ -1,3 +1,5 @@
+process.env.NODE_ENV = process.env.NODE_ENV || 'production'
+
 const environment = require('./environment')
 
 module.exports = environment.toWebpackConfig()

data/lib/install/config/webpack/test.js

@@ -1,3 +1,5 @@
+process.env.NODE_ENV = process.env.NODE_ENV || 'development'
+
 const environment = require('./environment')
 
 module.exports = environment.toWebpackConfig()

data/lib/tasks/webpacker/compile.rake

@@ -1,3 +1,5 @@
+ENV["NODE_ENV"] ||= "production"
+
 $stdout.sync = true
 
 def ensure_log_goes_to_stdout

data/lib/webpacker/compiler.rb

@@ -78,8 +78,7 @@ class Webpacker::Compiler
     end
 
     def webpack_env
-      env.merge("NODE_ENV"                    => @webpacker.env,
-                "WEBPACKER_ASSET_HOST"        => ActionController::Base.helpers.compute_asset_host,
+      env.merge("WEBPACKER_ASSET_HOST"        => ActionController::Base.helpers.compute_asset_host,
                 "WEBPACKER_RELATIVE_URL_ROOT" => ActionController::Base.relative_url_root)
     end
 end

data/lib/webpacker/dev_server_runner.rb

@@ -14,14 +14,14 @@ module Webpacker
     private
       def load_config
         @config_file = File.join(@app_path, "config/webpacker.yml")
-        dev_server = YAML.load_file(@config_file)[ENV["NODE_ENV"]]["dev_server"]
+        dev_server = YAML.load_file(@config_file)[ENV["RAILS_ENV"]]["dev_server"]
 
         @hostname          = dev_server["host"]
         @port              = dev_server["port"]
         @pretty            = dev_server.fetch("pretty", true)
 
       rescue Errno::ENOENT, NoMethodError
-        $stdout.puts "webpack dev_server configuration not found in #{@config_file}."
+        $stdout.puts "webpack dev_server configuration not found in #{@config_file}[#{ENV["RAILS_ENV"]}]."
         $stdout.puts "Please run bundle exec rails webpacker:install to install Webpacker"
         exit!
       end

data/lib/webpacker/env.rb

@@ -18,11 +18,11 @@ class Webpacker::Env
 
   private
     def current
-      (ENV["NODE_ENV"] || Rails.env).presence_in(available_environments)
+      Rails.env.presence_in(available_environments)
     end
 
     def fallback_env_warning
-      logger.info "NODE_ENV=#{ENV["NODE_ENV"]} and RAILS_ENV=#{Rails.env} environment is not defined in config/webpacker.yml, falling back to #{DEFAULT} environment"
+      logger.info "RAILS_ENV=#{Rails.env} environment is not defined in config/webpacker.yml, falling back to #{DEFAULT} environment"
     end
 
     def available_environments

data/lib/webpacker/railtie.rb

@@ -22,7 +22,7 @@ class Webpacker::Engine < ::Rails::Engine
   #
   #    to turn on:
   #     - edit config/environments/production.rb
-  #     - add `config.webpacker.check_yarn_integrity = false`
+  #     - add `config.webpacker.check_yarn_integrity = true`
   initializer "webpacker.yarn_check" do |app|
     if File.exist?("yarn.lock") && app.config.webpacker.check_yarn_integrity
       output = `yarn check --integrity 2>&1`

data/lib/webpacker/version.rb

@@ -1,4 +1,4 @@
 module Webpacker
   # Change the version in package.json too, please!
-  VERSION = "3.3.1".freeze
+  VERSION = "3.4.0".freeze
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rails/webpacker",
-  "version": "3.3.1",
+  "version": "3.4.0",
   "description": "Use webpack to manage app-like JavaScript modules in Rails",
   "main": "package/index.js",
   "files": [

data/package/__tests__/dev_server.js

@@ -8,8 +8,9 @@ describe('DevServer', () => {
   beforeEach(() => jest.resetModules())
   afterAll(chdirCwd)
 
-  test('with NODE_ENV set to development', () => {
+  test('with NODE_ENV and RAILS_ENV set to development', () => {
     process.env.NODE_ENV = 'development'
+    process.env.RAILS_ENV = 'development'
     process.env.WEBPACKER_DEV_SERVER_HOST = '0.0.0.0'
     process.env.WEBPACKER_DEV_SERVER_PORT = 5000
 
@@ -19,7 +20,8 @@ describe('DevServer', () => {
     expect(devServer.port).toEqual('5000')
   })
 
-  test('with NODE_ENV set to production', () => {
+  test('with NODE_ENV and RAILS_ENV set to production', () => {
+    process.env.RAILS_ENV = 'production'
     process.env.NODE_ENV = 'production'
     expect(require('../dev_server')).toEqual({})
   })

data/package/__tests__/development.js

@@ -0,0 +1,30 @@
+/* test expect, describe, afterAll, beforeEach */
+
+const { resolve } = require('path')
+const { chdirTestApp, chdirCwd } = require('../utils/helpers')
+
+chdirTestApp()
+
+describe('Development environment', () => {
+  afterAll(chdirCwd)
+
+  describe('toWebpackConfig', () => {
+    beforeEach(() => jest.resetModules())
+
+    test('should use development config and environment', () => {
+      process.env.RAILS_ENV = 'development'
+      process.env.NODE_ENV = 'development'
+      const { environment } = require('../index')
+
+      const config = environment.toWebpackConfig()
+      expect(config.output.path).toEqual(resolve('public', 'packs'))
+      expect(config.output.publicPath).toEqual('/packs/')
+      expect(config).toMatchObject({
+        devServer: {
+          host: 'localhost',
+          port: 3035
+        }
+      })
+    })
+  })
+})

data/package/__tests__/env.js

@@ -8,21 +8,39 @@ describe('Env', () => {
   beforeEach(() => jest.resetModules())
   afterAll(chdirCwd)
 
-  test('with NODE_ENV set to development', () => {
+  test('with NODE_ENV and RAILS_ENV set to development', () => {
+    process.env.RAILS_ENV = 'development'
     process.env.NODE_ENV = 'development'
-    expect(require('../env')).toEqual('development')
+    expect(require('../env')).toEqual({
+      railsEnv: 'development',
+      nodeEnv: 'development'
+    })
   })
 
   test('with undefined NODE_ENV and RAILS_ENV set to development', () => {
-    delete process.env.NODE_ENV
     process.env.RAILS_ENV = 'development'
-    expect(require('../env')).toEqual('development')
+    delete process.env.NODE_ENV
+    expect(require('../env')).toEqual({
+      railsEnv: 'development',
+      nodeEnv: 'production'
+    })
   })
 
-  test('with a non-standard environment', () => {
-    process.env.NODE_ENV = 'foo'
-    process.env.RAILS_ENV = 'foo'
-    expect(require('../env')).toEqual('production')
+  test('with undefined NODE_ENV and RAILS_ENV', () => {
+    delete process.env.NODE_ENV
     delete process.env.RAILS_ENV
+    expect(require('../env')).toEqual({
+      railsEnv: 'production',
+      nodeEnv: 'production'
+    })
+  })
+
+  test('with a non-standard environment', () => {
+    process.env.RAILS_ENV = 'staging'
+    process.env.NODE_ENV = 'staging'
+    expect(require('../env')).toEqual({
+      railsEnv: 'staging',
+      nodeEnv: 'production'
+    })
   })
 })

data/package/__tests__/production.js

@@ -0,0 +1,27 @@
+/* test expect, describe, afterAll, beforeEach */
+
+const { resolve } = require('path')
+const { chdirTestApp, chdirCwd } = require('../utils/helpers')
+
+chdirTestApp()
+
+describe('Production environment', () => {
+  afterAll(chdirCwd)
+
+  describe('toWebpackConfig', () => {
+    beforeEach(() => jest.resetModules())
+
+    test('should use production config and environment', () => {
+      process.env.RAILS_ENV = 'production'
+      const { environment } = require('../index')
+
+      const config = environment.toWebpackConfig()
+      expect(config.output.path).toEqual(resolve('public', 'packs'))
+      expect(config.output.publicPath).toEqual('/packs/')
+      expect(config).toMatchObject({
+        devtool: 'nosources-source-map',
+        stats: 'normal'
+      })
+    })
+  })
+})

data/package/__tests__/staging.js

@@ -0,0 +1,27 @@
+/* test expect, describe, afterAll, beforeEach */
+
+const { resolve } = require('path')
+const { chdirTestApp, chdirCwd } = require('../utils/helpers')
+
+chdirTestApp()
+
+describe('Custom environment', () => {
+  afterAll(chdirCwd)
+
+  describe('toWebpackConfig', () => {
+    beforeEach(() => jest.resetModules())
+
+    test('should use staging config and production environment', () => {
+      process.env.RAILS_ENV = 'staging'
+      const { environment } = require('../index')
+
+      const config = environment.toWebpackConfig()
+      expect(config.output.path).toEqual(resolve('public', 'packs-staging'))
+      expect(config.output.publicPath).toEqual('/packs-staging/')
+      expect(config).toMatchObject({
+        devtool: 'nosources-source-map',
+        stats: 'normal'
+      })
+    })
+  })
+})

data/package/__tests__/test.js

@@ -0,0 +1,23 @@
+/* test expect, describe, afterAll, beforeEach */
+
+const { resolve } = require('path')
+const { chdirTestApp, chdirCwd } = require('../utils/helpers')
+
+chdirTestApp()
+
+describe('Test environment', () => {
+  afterAll(chdirCwd)
+
+  describe('toWebpackConfig', () => {
+    beforeEach(() => jest.resetModules())
+
+    test('should use test config and production environment', () => {
+      process.env.RAILS_ENV = 'test'
+      const { environment } = require('../index')
+
+      const config = environment.toWebpackConfig()
+      expect(config.output.path).toEqual(resolve('public', 'packs-test'))
+      expect(config.output.publicPath).toEqual('/packs-test/')
+    })
+  })
+})

data/package/config.js

@@ -3,25 +3,23 @@ const { safeLoad } = require('js-yaml')
 const { readFileSync } = require('fs')
 const deepMerge = require('./utils/deep_merge')
 const { isArray } = require('./utils/helpers')
-const env = require('./env')
+const { railsEnv } = require('./env')
 
 const defaultConfigPath = require.resolve('../lib/install/config/webpacker.yml')
 const configPath = resolve('config', 'webpacker.yml')
 
-const getConfig = () => {
-  const defaults = safeLoad(readFileSync(defaultConfigPath), 'utf8')[env]
-  const app = safeLoad(readFileSync(configPath), 'utf8')[env]
-
-  if (isArray(app.extensions) && app.extensions.length) {
-    delete defaults.extensions
-  }
+const getDefaultConfig = () => {
+  const defaultConfig = safeLoad(readFileSync(defaultConfigPath), 'utf8')
+  return defaultConfig[railsEnv] || defaultConfig.production
+}
 
-  const config = deepMerge(defaults, app)
+const defaults = getDefaultConfig()
+const app = safeLoad(readFileSync(configPath), 'utf8')[railsEnv]
 
-  config.outputPath = resolve('public', config.public_output_path)
-  config.publicPath = `/${config.public_output_path}/`.replace(/([^:]\/)\/+/g, '$1')
+if (isArray(app.extensions) && app.extensions.length) delete defaults.extensions
 
-  return config
-}
+const config = deepMerge(defaults, app)
+config.outputPath = resolve('public', config.public_output_path)
+config.publicPath = `/${config.public_output_path}/`.replace(/([^:]\/)\/+/g, '$1')
 
-module.exports = getConfig()
+module.exports = config

data/package/dev_server.js

@@ -1,4 +1,4 @@
-const { isBoolean, isEmpty } = require('./utils/helpers')
+const { isBoolean } = require('./utils/helpers')
 const config = require('./config')
 
 const fetch = (key) => {
@@ -6,18 +6,13 @@ const fetch = (key) => {
   return isBoolean(value) ? JSON.parse(value) : value
 }
 
-const devServer = () => {
-  const devServerConfig = config.dev_server
+const devServerConfig = config.dev_server
 
-  if (devServerConfig) {
-    Object.keys(devServerConfig).forEach((key) => {
-      const envValue = fetch(`WEBPACKER_DEV_SERVER_${key.toUpperCase().replace(/_/g, '')}`)
-      if (isEmpty(envValue)) return devServerConfig[key]
-      devServerConfig[key] = envValue
-    })
-  }
-
-  return devServerConfig || {}
+if (devServerConfig) {
+  Object.keys(devServerConfig).forEach((key) => {
+    const envValue = fetch(`WEBPACKER_DEV_SERVER_${key.toUpperCase().replace(/_/g, '')}`)
+    if (envValue) devServerConfig[key] = envValue
+  })
 }
 
-module.exports = devServer()
+module.exports = devServerConfig || {}

data/package/env.js

@@ -2,22 +2,18 @@ const { resolve } = require('path')
 const { safeLoad } = require('js-yaml')
 const { readFileSync } = require('fs')
 
+const NODE_ENVIRONMENTS = ['development', 'production']
+const DEFAULT = 'production'
 const configPath = resolve('config', 'webpacker.yml')
-const DEFAULT_ENV = 'production'
 
-const env = () => {
-  const nodeEnv = process.env.NODE_ENV
-  const railsEnv = process.env.RAILS_ENV
-  const config = safeLoad(readFileSync(configPath), 'utf8')
-  const availableEnvironments = Object.keys(config).join('|')
-  const regex = new RegExp(availableEnvironments, 'g')
+const railsEnv = process.env.RAILS_ENV
+const nodeEnv = process.env.NODE_ENV
 
-  if (nodeEnv && nodeEnv.match(regex)) return nodeEnv
-  if (railsEnv && railsEnv.match(regex)) return railsEnv
+const config = safeLoad(readFileSync(configPath), 'utf8')
+const availableEnvironments = Object.keys(config).join('|')
+const regex = new RegExp(availableEnvironments, 'g')
 
-  /* eslint no-console: 0 */
-  console.warn(`NODE_ENV=${nodeEnv} and RAILS_ENV=${railsEnv} environment is not defined in config/webpacker.yml, falling back to ${DEFAULT_ENV}`)
-  return DEFAULT_ENV
+module.exports = {
+  railsEnv: railsEnv && railsEnv.match(regex) ? railsEnv : DEFAULT,
+  nodeEnv: nodeEnv && NODE_ENVIRONMENTS.includes(nodeEnv) ? nodeEnv : DEFAULT
 }
-
-module.exports = env()

data/package/environments/__tests__/base.js

@@ -31,8 +31,6 @@ describe('Environment', () => {
       const config = environment.toWebpackConfig()
       expect(config.output.filename).toEqual('[name]-[chunkhash].js')
       expect(config.output.chunkFilename).toEqual('[name]-[chunkhash].chunk.js')
-      expect(config.output.path).toEqual(resolve('public', 'packs-test'))
-      expect(config.output.publicPath).toEqual('/packs-test/')
     })
 
     test('should return default loader rules for each file in config/loaders', () => {

data/package/index.js

@@ -5,12 +5,12 @@ const { resolve } = require('path')
 const { existsSync } = require('fs')
 const Environment = require('./environments/base')
 const loaders = require('./rules')
-const env = require('./env')
 const config = require('./config')
 const devServer = require('./dev_server')
+const { nodeEnv } = require('./env')
 
 const createEnvironment = () => {
-  const path = resolve(__dirname, 'environments', `${env}.js`)
+  const path = resolve(__dirname, 'environments', `${nodeEnv}.js`)
   const constructor = existsSync(path) ? require(path) : Environment
   return new constructor()
 }

data/package/utils/get_style_rule.js

@@ -1,9 +1,10 @@
 const ExtractTextPlugin = require('extract-text-webpack-plugin')
 const path = require('path')
 const devServer = require('../dev_server')
+const { nodeEnv } = require('../env')
 
 const postcssConfigPath = path.resolve(process.cwd(), '.postcssrc.yml')
-const isProduction = process.env.NODE_ENV === 'production'
+const isProduction = nodeEnv === 'production'
 const inDevServer = process.argv.find(v => v.includes('webpack-dev-server'))
 const isHMR = inDevServer && (devServer && devServer.hmr)
 const extractCSS = !isHMR || isProduction

data/test/configuration_test.rb

@@ -41,30 +41,26 @@ class ConfigurationTest < Webpacker::Test
   end
 
   def test_cache_manifest?
-    with_node_env("development") do
-      refute reloaded_config.cache_manifest?
-    end
+    assert Webpacker.config.cache_manifest?
 
-    with_node_env("test") do
-      refute reloaded_config.cache_manifest?
+    with_rails_env("development") do
+      refute Webpacker.config.cache_manifest?
     end
 
-    with_node_env("production") do
-      assert reloaded_config.cache_manifest?
+    with_rails_env("test") do
+      refute Webpacker.config.cache_manifest?
     end
   end
 
   def test_compile?
-    with_node_env("development") do
-      assert reloaded_config.compile?
-    end
+    refute Webpacker.config.compile?
 
-    with_node_env("test") do
-      assert reloaded_config.compile?
+    with_rails_env("development") do
+      assert Webpacker.config.compile?
     end
 
-    with_node_env("production") do
-      refute reloaded_config.compile?
+    with_rails_env("test") do
+      assert Webpacker.config.compile?
     end
   end
 end

data/test/dev_server_test.rb

@@ -2,29 +2,23 @@ require "test_helper"
 
 class DevServerTest < Webpacker::Test
   def test_running?
-    with_node_env("production") do
-      reloaded_config
-      refute Webpacker.dev_server.running?
-    end
+    refute Webpacker.dev_server.running?
   end
 
   def test_host
-    with_node_env("development") do
-      reloaded_config
+    with_rails_env("development") do
       assert_equal Webpacker.dev_server.host, "localhost"
     end
   end
 
   def test_port
-    with_node_env("development") do
-      reloaded_config
+    with_rails_env("development") do
       assert_equal Webpacker.dev_server.port, 3035
     end
   end
 
   def test_https?
-    with_node_env("development") do
-      reloaded_config
+    with_rails_env("development") do
       assert_equal Webpacker.dev_server.https?, false
     end
   end

data/test/env_test.rb

@@ -2,14 +2,18 @@ require "test_helper"
 
 class EnvTest < Webpacker::Test
   def test_current
-    reloaded_config
-    assert_equal Webpacker.env, "production"
+    assert_equal Webpacker.env, Rails.env
   end
 
-  def test_custom
-    with_node_env("default") do
-      reloaded_config
-      assert_equal Webpacker.env, "default"
+  def test_custom_without_config
+    with_rails_env("foo") do
+      assert_equal Webpacker.env, "production"
+    end
+  end
+
+  def test_custom_with_config
+    with_rails_env("staging") do
+      assert_equal Webpacker.env, "staging"
     end
   end
 

data/test/test_app/config/webpacker.yml

@@ -61,3 +61,15 @@ production:
 
   # Cache manifest.json for performance
   cache_manifest: true
+
+staging:
+  <<: *default
+
+  # Production depends on precompilation of packs prior to booting for performance.
+  compile: false
+
+  # Cache manifest.json for performance
+  cache_manifest: true
+
+  # Compile staging packs to a separate directory
+  public_output_path: packs-staging

data/test/test_helper.rb

@@ -6,7 +6,7 @@ require "byebug"
 
 require_relative "test_app/config/environment"
 
-ENV["NODE_ENV"] = "production"
+Rails.env = "production"
 
 Webpacker.instance = Webpacker::Instance.new \
   root_path: Pathname.new(File.expand_path("test_app", __dir__)),
@@ -21,11 +21,13 @@ class Webpacker::Test < Minitest::Test
       Webpacker.config
     end
 
-    def with_node_env(env)
-      original = ENV["NODE_ENV"]
-      ENV["NODE_ENV"] = env
+    def with_rails_env(env)
+      original = Rails.env
+      Rails.env = ActiveSupport::StringInquirer.new(env)
+      reloaded_config
       yield
     ensure
-      ENV["NODE_ENV"] = original
+      Rails.env = ActiveSupport::StringInquirer.new(original)
+      reloaded_config
     end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webpacker
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.4.0
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-12 00:00:00.000000000 Z
+date: 2018-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -178,8 +178,11 @@ files:
 - package.json
 - package/__tests__/config.js
 - package/__tests__/dev_server.js
+- package/__tests__/development.js
 - package/__tests__/env.js
-- package/__tests__/index.js
+- package/__tests__/production.js
+- package/__tests__/staging.js
+- package/__tests__/test.js
 - package/config.js
 - package/config_types/__tests__/config_list.js
 - package/config_types/__tests__/config_object.js

data/package/__tests__/index.js

@@ -1,31 +0,0 @@
-/* global test expect, describe */
-
-const { chdirTestApp, chdirCwd } = require('../utils/helpers')
-
-chdirTestApp()
-
-describe('Webpacker', () => {
-  beforeEach(() => jest.resetModules())
-  afterAll(chdirCwd)
-
-  test('with NODE_ENV set to development', () => {
-    process.env.NODE_ENV = 'development'
-    const { environment } = require('../index')
-    expect(environment.toWebpackConfig()).toMatchObject({
-      devServer: {
-        host: 'localhost',
-        port: 3035
-      }
-    })
-  })
-
-  test('with a non-standard env', () => {
-    process.env.NODE_ENV = 'staging'
-    process.env.RAILS_ENV = 'staging'
-    const { environment } = require('../index')
-    expect(environment.toWebpackConfig()).toMatchObject({
-      devtool: 'nosources-source-map',
-      stats: 'normal'
-    })
-  })
-})