webpacker 4.0.0.pre.pre.2 → 4.0.0.pre.3

data/package/__tests__/config.js

@@ -1,14 +1,30 @@
 /* global test expect, describe */
 
-const { chdirTestApp, chdirCwd } = require('../utils/helpers')
+const { chdirCwd, chdirTestApp } = require('../utils/helpers')
 
 chdirTestApp()
 
 const config = require('../config')
 
 describe('Config', () => {
+  beforeEach(() => jest.resetModules())
   afterAll(chdirCwd)
 
+  test('public path', () => {
+    process.env.RAILS_ENV = 'development'
+    delete process.env.RAILS_RELATIVE_URL_ROOT
+    const config = require('../config')
+    expect(config.publicPath).toEqual('/packs/')
+  })
+
+  // also tests removal of extra slashes
+  test('public path with relative root', () => {
+    process.env.RAILS_ENV = 'development'
+    process.env.RAILS_RELATIVE_URL_ROOT = '/foo'
+    const config = require('../config')
+    expect(config.publicPath).toEqual('/foo/packs/')
+  })
+
   test('should return extensions as listed in app config', () => {
     expect(config.extensions).toEqual([
       '.js',

data/package/__tests__/production.js

@@ -13,9 +13,11 @@ describe('Production environment', () => {
 
     test('should use production config and environment', () => {
       process.env.RAILS_ENV = 'production'
-      const { environment } = require('../index')
+      process.env.NODE_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({

data/package/__tests__/staging.js

@@ -11,11 +11,13 @@ describe('Custom environment', () => {
   describe('toWebpackConfig', () => {
     beforeEach(() => jest.resetModules())
 
-    test('should use staging config and production environment', () => {
+    test('should use staging config and default production environment', () => {
       process.env.RAILS_ENV = 'staging'
-      const { environment } = require('../index')
+      delete process.env.NODE_ENV
 
+      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({

data/package/__tests__/test.js

@@ -13,11 +13,14 @@ describe('Test environment', () => {
 
     test('should use test config and production environment', () => {
       process.env.RAILS_ENV = 'test'
-      const { environment } = require('../index')
+      process.env.NODE_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/')
+      expect(config.devServer).toEqual(undefined)
     })
   })
 })

data/package/config.js

@@ -20,6 +20,14 @@ if (isArray(app.extensions) && app.extensions.length) delete defaults.extensions
 
 const config = deepMerge(defaults, app)
 config.outputPath = resolve('public', config.public_output_path)
-config.publicPath = `/${config.public_output_path}/`.replace(/([^:]\/)\/+/g, '$1')
+
+let publicPath = `/${config.public_output_path}/`
+// Add prefix to publicPath.
+if (process.env.RAILS_RELATIVE_URL_ROOT) {
+  publicPath = `/${process.env.RAILS_RELATIVE_URL_ROOT}${publicPath}`
+}
+
+// Remove extra slashes.
+config.publicPath = publicPath.replace(/(^\/|[^:]\/)\/+/g, '$1')
 
 module.exports = config

data/package/config_types/config_list.js

@@ -38,12 +38,11 @@ class ConfigList extends Array {
   }
 
   getIndex(key, shouldThrow = false) {
-    const index = this.findIndex(entry =>
-      (
-        entry === key ||
-        entry.key === key ||
-        (entry.constructor && entry.constructor.name === key)
-      ))
+    const index = this.findIndex(entry => (
+      entry === key
+        || entry.key === key
+        || (entry.constructor && entry.constructor.name === key)
+    ))
 
     if (shouldThrow && index < 0) throw new Error(`Item ${key} not found`)
     return index

data/package/dev_server.js

@@ -11,7 +11,7 @@ const devServerConfig = config.dev_server
 if (devServerConfig) {
   Object.keys(devServerConfig).forEach((key) => {
     const envValue = fetch(`WEBPACKER_DEV_SERVER_${key.toUpperCase().replace(/_/g, '')}`)
-    if (envValue) devServerConfig[key] = envValue
+    if (envValue !== undefined) devServerConfig[key] = envValue
   })
 }
 

data/package/env.js

@@ -2,7 +2,7 @@ const { resolve } = require('path')
 const { safeLoad } = require('js-yaml')
 const { readFileSync } = require('fs')
 
-const NODE_ENVIRONMENTS = ['development', 'production']
+const NODE_ENVIRONMENTS = ['development', 'production', 'test']
 const DEFAULT = 'production'
 const configPath = resolve('config', 'webpacker.yml')
 
@@ -11,7 +11,7 @@ const nodeEnv = process.env.NODE_ENV
 
 const config = safeLoad(readFileSync(configPath), 'utf8')
 const availableEnvironments = Object.keys(config).join('|')
-const regex = new RegExp(availableEnvironments, 'g')
+const regex = new RegExp(`^(${availableEnvironments})$`, 'g')
 
 module.exports = {
   railsEnv: railsEnv && railsEnv.match(regex) ? railsEnv : DEFAULT,

data/package/environments/base.js

@@ -74,33 +74,32 @@ const getModulePaths = () => {
   return result
 }
 
-const getBaseConfig = () =>
-  new ConfigObject({
-    mode: 'production',
-    output: {
-      filename: '[name]-[chunkhash].js',
-      chunkFilename: '[name]-[chunkhash].chunk.js',
-      hotUpdateChunkFilename: '[id]-[hash].hot-update.js',
-      path: config.outputPath,
-      publicPath: config.publicPath
-    },
-
-    resolve: {
-      extensions: config.extensions
-    },
-
-    resolveLoader: {
-      modules: ['node_modules']
-    },
-
-    node: {
-      dgram: 'empty',
-      fs: 'empty',
-      net: 'empty',
-      tls: 'empty',
-      child_process: 'empty'
-    }
-  })
+const getBaseConfig = () => new ConfigObject({
+  mode: 'production',
+  output: {
+    filename: '[name]-[chunkhash].js',
+    chunkFilename: '[name]-[chunkhash].chunk.js',
+    hotUpdateChunkFilename: '[id]-[hash].hot-update.js',
+    path: config.outputPath,
+    publicPath: config.publicPath
+  },
+
+  resolve: {
+    extensions: config.extensions
+  },
+
+  resolveLoader: {
+    modules: ['node_modules']
+  },
+
+  node: {
+    dgram: 'empty',
+    fs: 'empty',
+    net: 'empty',
+    tls: 'empty',
+    child_process: 'empty'
+  }
+})
 
 module.exports = class Base {
   constructor() {

data/package/environments/production.js

@@ -1,5 +1,6 @@
 const UglifyJsPlugin = require('uglifyjs-webpack-plugin')
 const CompressionPlugin = require('compression-webpack-plugin')
+const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin')
 const Base = require('./base')
 
 module.exports = class extends Base {
@@ -15,6 +16,8 @@ module.exports = class extends Base {
       })
     )
 
+    this.plugins.append('OptimizeCSSAssets', new OptimizeCSSAssetsPlugin())
+
     this.config.merge({
       devtool: 'nosources-source-map',
       stats: 'normal',
@@ -26,8 +29,13 @@ module.exports = class extends Base {
             cache: true,
             sourceMap: true,
             uglifyOptions: {
-              ecma: 8,
+              parse: {
+                // Let uglify-js parse ecma 8 code but always output
+                // ES5 compliant code for older browsers
+                ecma: 8
+              },
               compress: {
+                ecma: 5,
                 warnings: false,
                 comparisons: false
               },
@@ -35,6 +43,7 @@ module.exports = class extends Base {
                 safari10: true
               },
               output: {
+                ecma: 5,
                 comments: false,
                 ascii_only: true
               }

data/package/utils/__tests__/deep_assign.js

@@ -2,10 +2,31 @@
 
 const deepAssign = require('../deep_assign')
 
-test('deep assign property', () => {
-  const object = { foo: { bar: { } } }
-  const path = 'foo.bar'
-  const value = { x: 1, y: 2 }
-  const expectation = { foo: { bar: { x: 1, y: 2 } } }
-  expect(deepAssign(object, path, value)).toEqual(expectation)
+describe('deepAssign()', () => {
+  test('deeply assigns nested properties', () => {
+    const object = { foo: { bar: { } } }
+    const path = 'foo.bar'
+    const value = { x: 1, y: 2 }
+    const expectation = { foo: { bar: { x: 1, y: 2 } } }
+    expect(deepAssign(object, path, value)).toEqual(expectation)
+  })
+
+  test('allows assignment of a literal false', () => {
+    const object = { foo: { bar: { } } }
+    const path = 'foo.bar'
+    const value = false
+    const expectation = { foo: { bar: false } }
+    expect(deepAssign(object, path, value)).toEqual(expectation)
+  })
+
+  test('does not allow assignment of other falsy values', () => {
+    const object = { foo: { bar: { } } }
+    const path = 'foo.bar'
+    const values = [undefined, null, 0, '']
+
+    values.forEach(value => {
+      const expectation = new Error(`Value can't be ${value}`)
+      expect(() => deepAssign(object, path, value)).toThrow(expectation)
+    })
+  })
 })

data/package/utils/deep_assign.js

@@ -2,7 +2,7 @@ const { canMerge, prettyPrint } = require('./helpers')
 const deepMerge = require('./deep_merge')
 
 const deepAssign = (obj, path, value) => {
-  if (!value) throw new Error(`Value can't be ${value}`)
+  if (!value && value !== false) throw new Error(`Value can't be ${value}`)
 
   const keys = path.split('.')
   const key = keys.pop()

data/package/utils/deep_merge.js

@@ -10,12 +10,11 @@ const deepMerge = (target, source) => {
   if (!(isObject(target) && isObject(source))) return source
 
   return [...Object.keys(target), ...Object.keys(source)].reduce(
-    (result, key) =>
-      (Object.assign(
-        {},
-        result,
-        { [key]: deepMerge(target[key], source[key]) }
-      )),
+    (result, key) => (Object.assign(
+      {},
+      result,
+      { [key]: deepMerge(target[key], source[key]) }
+    )),
     {}
   )
 }

data/package/utils/get_style_rule.js

@@ -1,9 +1,7 @@
 const MiniCssExtractPlugin = require('mini-css-extract-plugin')
-const path = require('path')
 const devServer = require('../dev_server')
 const { nodeEnv } = require('../env')
 
-const postcssConfigPath = path.resolve(process.cwd(), '.postcssrc.yml')
 const isProduction = nodeEnv === 'production'
 const inDevServer = process.argv.find(v => v.includes('webpack-dev-server'))
 const isHMR = inDevServer && (devServer && devServer.hmr)
@@ -22,17 +20,16 @@ const getStyleRule = (test, modules = false, preprocessors = []) => {
     {
       loader: 'css-loader',
       options: {
-        minimize: isProduction,
         sourceMap: true,
         importLoaders: 2,
+        localIdentName: '[name]__[local]___[hash:base64:5]',
         modules
       }
     },
     {
       loader: 'postcss-loader',
       options: {
-        sourceMap: true,
-        config: { path: postcssConfigPath }
+        sourceMap: true
       }
     },
     ...preprocessors

data/package/utils/helpers.js

@@ -1,7 +1,6 @@
-const isObject = value =>
-  typeof value === 'object' &&
-  value !== null &&
-  (value.length === undefined || value.length === null)
+const isObject = value => typeof value === 'object'
+  && value !== null
+  && (value.length === undefined || value.length === null)
 
 const isBoolean = str => /^true/.test(str) || /^false/.test(str)
 

data/package/utils/objectify.js

@@ -1,4 +1,3 @@
-const objectify = (path, obj) =>
-  path.split('.').reduce((prev, curr) => (prev ? prev[curr] : undefined), obj)
+const objectify = (path, obj) => path.split('.').reduce((prev, curr) => (prev ? prev[curr] : undefined), obj)
 
 module.exports = objectify

data/test/compiler_test.rb

@@ -25,7 +25,7 @@ class CompilerTest < Minitest::Test
     assert_equal Webpacker.compiler.send(:default_watched_paths), [
       "app/assets/**/*",
       "/etc/yarn/**/*",
-      "test/test_app/app/javascript/**/*",
+      "app/javascript/**/*",
       "yarn.lock",
       "package.json",
       "config/webpack/**/*"
@@ -59,6 +59,6 @@ class CompilerTest < Minitest::Test
   end
 
   def test_compilation_digest_path
-    assert Webpacker.compiler.send(:compilation_digest_path).to_s.ends_with?(Webpacker.env)
+    assert_equal Webpacker.compiler.send(:compilation_digest_path).basename.to_s, "last-compilation-digest-#{Webpacker.env}"
   end
 end

data/test/configuration_test.rb

@@ -1,66 +1,90 @@
 require "test_helper"
 
 class ConfigurationTest < Webpacker::Test
+  def setup
+    @config = Webpacker::Configuration.new(
+      root_path: Pathname.new(File.expand_path("test_app", __dir__)),
+      config_path: Pathname.new(File.expand_path("./test_app/config/webpacker.yml", __dir__)),
+      env: "production"
+    )
+  end
+
   def test_source_path
     source_path = File.expand_path File.join(File.dirname(__FILE__), "test_app/app/javascript").to_s
-    assert_equal source_path, Webpacker.config.source_path.to_s
+    assert_equal source_path, @config.source_path.to_s
   end
 
   def test_source_entry_path
     source_entry_path = File.expand_path File.join(File.dirname(__FILE__), "test_app/app/javascript", "packs").to_s
-    assert_equal Webpacker.config.source_entry_path.to_s, source_entry_path
+    assert_equal @config.source_entry_path.to_s, source_entry_path
   end
 
   def test_public_output_path
     public_output_path = File.expand_path File.join(File.dirname(__FILE__), "test_app/public/packs").to_s
-    assert_equal Webpacker.config.public_output_path.to_s, public_output_path
+    assert_equal @config.public_output_path.to_s, public_output_path
   end
 
   def test_public_manifest_path
     public_manifest_path = File.expand_path File.join(File.dirname(__FILE__), "test_app/public/packs", "manifest.json").to_s
-    assert_equal Webpacker.config.public_manifest_path.to_s, public_manifest_path
+    assert_equal @config.public_manifest_path.to_s, public_manifest_path
   end
 
   def test_cache_path
     cache_path = File.expand_path File.join(File.dirname(__FILE__), "test_app/tmp/cache/webpacker").to_s
-    assert_equal Webpacker.config.cache_path.to_s, cache_path
+    assert_equal @config.cache_path.to_s, cache_path
   end
 
   def test_resolved_paths
-    assert_equal Webpacker.config.resolved_paths, ["app/assets", "/etc/yarn"]
+    assert_equal @config.resolved_paths, ["app/assets", "/etc/yarn"]
   end
 
   def test_resolved_paths_globbed
-    assert_equal Webpacker.config.resolved_paths_globbed, ["app/assets/**/*", "/etc/yarn/**/*"]
+    assert_equal @config.resolved_paths_globbed, ["app/assets/**/*", "/etc/yarn/**/*"]
   end
 
   def test_extensions
     config_path = File.expand_path File.join(File.dirname(__FILE__), "test_app/config/webpacker.yml").to_s
     webpacker_yml = YAML.load_file(config_path)
-    assert_equal Webpacker.config.extensions, webpacker_yml["default"]["extensions"]
+    assert_equal @config.extensions, webpacker_yml["default"]["extensions"]
   end
 
   def test_cache_manifest?
-    assert Webpacker.config.cache_manifest?
+    assert @config.cache_manifest?
+
+    @config = Webpacker::Configuration.new(
+      root_path: @config.root_path,
+      config_path: @config.config_path,
+      env: "development"
+    )
 
-    with_rails_env("development") do
-      refute Webpacker.config.cache_manifest?
-    end
+    refute @config.cache_manifest?
 
-    with_rails_env("test") do
-      refute Webpacker.config.cache_manifest?
-    end
+    @config = Webpacker::Configuration.new(
+      root_path: @config.root_path,
+      config_path: @config.config_path,
+      env: "test"
+    )
+
+    refute @config.cache_manifest?
   end
 
   def test_compile?
-    refute Webpacker.config.compile?
+    refute @config.compile?
+
+    @config = Webpacker::Configuration.new(
+      root_path: @config.root_path,
+      config_path: @config.config_path,
+      env: "development"
+    )
+
+    assert @config.compile?
 
-    with_rails_env("development") do
-      assert Webpacker.config.compile?
-    end
+    @config = Webpacker::Configuration.new(
+      root_path: @config.root_path,
+      config_path: @config.config_path,
+      env: "test"
+    )
 
-    with_rails_env("test") do
-      assert Webpacker.config.compile?
-    end
+    assert @config.compile?
   end
 end