shakapacker 7.0.0.rc.1 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aba276f401a1f78173be61e48f752843e048ccab75e2cea85789e0db511f120b
-  data.tar.gz: d29b9940a940f999d5ec9be41a75fabf9d7601c44767b28bfca7c0068c537ded
+  metadata.gz: 0eef3643fb556af4dc928c1d651fa46cfe5543fc6d5a227d29fcbfd7b3876c3c
+  data.tar.gz: 4530e671bb02c0af5bbfc37ba1696fff4e81548c40af6df65a06e2bc2d0a9815
 SHA512:
-  metadata.gz: dddcafead06f6db4f256759f7d8f243f5511f7b131d4bbdaae3da6cc3ea160854f82c70fd87ae313f33a14ec3309a6a762b35d24fcbffbd53c22a0eac0920abb
-  data.tar.gz: 06c7e5ed689286cb05091c00390f3b4ef56bbbec19bb5a30354c8819c503373dd503f8ed9f240c3ca970d07506045a6be0dfc96b4a0f1a9faa5dfc2c3cbcbdc3
+  metadata.gz: a7803b77d1d0e9dff88d6cdb25f88c1a89fb4c036153e03d153fe994b216a82a69aaa85d446331945a528443fbd097ac4f49cb64661e66f29b5941a5971315a8
+  data.tar.gz: 98aba0b391b59a50932d43cab666604998d66c5bcf548f8ceea06c77919a9196ba5ca2861a204ce3f66cd490d69b64e0e8c0dfb10610b6ba64842049f49d2df4

data/CHANGELOG.md

@@ -22,6 +22,7 @@ _Please add entries here for your pull requests that are not yet released._
 - Set CSS modules mode depending on file type. [PR 261](https://github.com/shakacode/shakapacker/pull/261) by [talyuk](https://github.com/talyuk).
 - All standard webpack entries with the camelCase format are now supported in `shakapacker.yml` in snake_case format. [PR276](https://github.com/shakacode/shakapacker/pull/276) by [ahangarha](https://github.com/ahangarha).
 - The `shakapacker:install` rake task now has an option to force overriding files using `FORCE=true` environment variable [PR311](https://github.com/shakacode/shakapacker/pull/311) by [ahangarha](https://github.com/ahangarha).
+- Allow configuration of use of contentHash for specific environment [PR 234](https://github.com/shakacode/shakapacker/pull/234) by [justin808](https://github/justin808).
 
 ### Changed
 - Rename Webpacker to Shakapacker in the entire project including config files, binstubs, environment variables, etc. with a high degree of backward compatibility.

data/README.md

@@ -216,6 +216,8 @@ Webpack intelligently includes only necessary files. In this example, the file `
 
 `nested_entries` allows you to have webpack entry points nested in subdirectories. This defaults to false so you don't accidentally create entry points for an entire tree of files. In other words, with `nested_entries: false`, you can have your entire `source_path` used for your source (using the `source_entry_path: /`) and you place files at the top level that you want as entry points. `nested_entries: true` allows you to have entries that are in subdirectories. This is useful if you have entries that are generated, so you can have a `generated` subdirectory and easily separate generated files from the rest of your codebase.
 
+To enable/disable the usage of contentHash in any node environment (specified using the `NODE_ENV` environment variable), add/modify `useContentHash` with a boolean value in `config/shakapacker.yml`. This feature is disabled for all environments except production by default. You may not disable the content hash for a `NODE_ENV` of production as that would break the browser caching of assets. Notice that despite the possibility of enabling this option for the development environment, [it is not recommended](https://webpack.js.org/guides/build-performance/#avoid-production-specific-tooling).
+
 #### Setting custom config path
 
 You can use the environment variable `SHAKAPACKER_CONFIG` to enforce a particular path to the config file rather than the default `config/shakapacker.yml`.

data/lib/install/config/shakapacker.yml

@@ -1,4 +1,5 @@
 # Note: You must restart bin/shakapacker-dev-server for changes to take effect
+# This file contains the defaults used by shakapacker.
 
 default: &default
   source_path: app/javascript
@@ -44,6 +45,11 @@ default: &default
   # Select whether the compiler will use SHA digest ('digest' option) or most most recent modified timestamp ('mtime') to determine freshness
   compiler_strategy: digest
 
+  # Select whether the compiler will always use a content hash and not just in production
+  # Don't use contentHash except for production for performance
+  # https://webpack.js.org/guides/build-performance/#avoid-production-specific-tooling
+  useContentHash: false
+
 development:
   <<: *default
   compile: true
@@ -105,5 +111,8 @@ production:
   # Production depends on precompilation of packs prior to booting for performance.
   compile: false
 
+  # Use content hash for naming assets. Cannot be overridden by for production.
+  useContentHash: true
+
   # Cache manifest.json for performance
   cache_manifest: true

data/lib/shakapacker/version.rb

@@ -1,4 +1,4 @@
 module Shakapacker
   # Change the version in package.json too, please!
-  VERSION = "7.0.0.rc.1".freeze
+  VERSION = "7.0.0".freeze
 end

data/package/__tests__/index-bc.js

@@ -0,0 +1,22 @@
+const index = require('../index')
+
+describe('index', () => {
+  describe('webpackConfig', () => {
+    test('is a global object', () => {
+      const { webpackConfig, globalMutableWebpackConfig } = require('../index')
+
+      expect(webpackConfig).toBe(globalMutableWebpackConfig)
+    })
+
+    test('Shows warning with deprecation message', () => {
+      const consoleSpy = jest.spyOn(console, "warn");
+  
+      const { webpackConfig } = require('../index')
+      
+      expect(consoleSpy).toHaveBeenCalledWith(
+        expect.stringMatching(/The 'webpackConfig' is deprecated/)
+      )
+      consoleSpy.mockRestore();
+    })
+  })
+})

data/package/environments/__tests__/base-bc.js

@@ -65,9 +65,9 @@ describe('Base config', () => {
     })
 
     test('should return output', () => {
-      expect(baseConfig.output.filename).toEqual('js/[name].js')
+      expect(baseConfig.output.filename).toEqual('js/[name]-[contenthash].js')
       expect(baseConfig.output.chunkFilename).toEqual(
-        'js/[name].chunk.js'
+        'js/[name]-[contenthash].chunk.js'
       )
     })
 

data/package/environments/__tests__/base.js

@@ -65,9 +65,9 @@ describe('Base config', () => {
     })
 
     test('should return output', () => {
-      expect(baseConfig.output.filename).toEqual('js/[name].js')
+      expect(baseConfig.output.filename).toEqual('js/[name]-[contenthash].js')
       expect(baseConfig.output.chunkFilename).toEqual(
-        'js/[name].chunk.js'
+        'js/[name]-[contenthash].chunk.js'
       )
     })
 

data/package/environments/__tests__/development.js

@@ -0,0 +1,53 @@
+/* global test expect, describe, afterAll, beforeEach */
+
+const { chdirTestApp, resetEnv } = require('../../utils/helpers')
+const rootPath = process.cwd()
+chdirTestApp()
+
+describe('Development specific config', () => {
+  beforeEach(() => {
+    jest.resetModules()
+    resetEnv()
+    process.env['NODE_ENV'] = 'development'
+  })
+  afterAll(() => process.chdir(rootPath))
+
+  describe('with config.useContentHash = true', () => {
+    test('sets filename to use contentHash', () => {
+      const config = require("../../config");
+      config.useContentHash = true
+      const environmnetConfig = require('../development')
+
+      expect(environmnetConfig.output.filename).toEqual('js/[name]-[contenthash].js')
+      expect(environmnetConfig.output.chunkFilename).toEqual(
+        'js/[name]-[contenthash].chunk.js'
+      )
+    })
+  })
+
+  describe('with config.useContentHash = false', () => {
+    test('sets filename without using contentHash', () => {
+      const config = require("../../config");
+      config.useContentHash = false
+      const environmnetConfig = require('../development')
+
+      expect(environmnetConfig.output.filename).toEqual('js/[name].js')
+      expect(environmnetConfig.output.chunkFilename).toEqual(
+        'js/[name].chunk.js'
+      )
+    })
+  })
+
+  describe('with unset config.useContentHash', () => {
+    test('sets filename without using contentHash', () => {
+      const config = require("../../config");
+      delete config.useContentHash
+      const environmnetConfig = require('../development')
+
+      expect(environmnetConfig.output.filename).toEqual('js/[name].js')
+      expect(environmnetConfig.output.chunkFilename).toEqual(
+        'js/[name].chunk.js'
+      )
+    })
+  })
+})

data/package/environments/__tests__/production.js

@@ -0,0 +1,53 @@
+/* global test expect, describe, afterAll, beforeEach */
+
+const { chdirTestApp, resetEnv } = require('../../utils/helpers')
+const rootPath = process.cwd()
+chdirTestApp()
+
+describe('Production specific config', () => {
+  beforeEach(() => {
+    jest.resetModules()
+    resetEnv()
+    process.env['NODE_ENV'] = 'production'
+  })
+  afterAll(() => process.chdir(rootPath))
+
+  describe('with config.useContentHash = true', () => {
+    test('sets filename to use contentHash', () => {
+      const config = require("../../config");
+      config.useContentHash = true
+      const environmnetConfig = require('../production')
+
+      expect(environmnetConfig.output.filename).toEqual('js/[name]-[contenthash].js')
+      expect(environmnetConfig.output.chunkFilename).toEqual(
+        'js/[name]-[contenthash].chunk.js'
+      )
+    })
+  })
+
+  describe('with config.useContentHash = false', () => {
+    test('sets filename to use contentHash', () => {
+      const config = require("../../config");
+      config.useContentHash = false
+      const environmnetConfig = require('../production')
+
+      expect(environmnetConfig.output.filename).toEqual('js/[name]-[contenthash].js')
+      expect(environmnetConfig.output.chunkFilename).toEqual(
+        'js/[name]-[contenthash].chunk.js'
+      )
+    })
+  })
+
+  describe('with unset config.useContentHash', () => {
+    test('sets filename to use contentHash', () => {
+      const config = require("../../config");
+      delete config.useContentHash
+      const environmnetConfig = require('../production')
+
+      expect(environmnetConfig.output.filename).toEqual('js/[name]-[contenthash].js')
+      expect(environmnetConfig.output.chunkFilename).toEqual(
+        'js/[name]-[contenthash].chunk.js'
+      )
+    })
+  })
+})

data/package/environments/base.js

@@ -7,8 +7,8 @@ const { sync: globSync } = require('glob')
 const WebpackAssetsManifest = require('webpack-assets-manifest')
 const webpack = require('webpack')
 const rules = require('../rules')
-const { isProduction } = require('../env')
 const config = require('../config')
+const { isProduction } = require('../env')
 const { moduleExists } = require('../utils/helpers')
 
 const getEntryObject = () => {
@@ -68,7 +68,7 @@ const getPlugins = () => {
   ]
 
   if (moduleExists('css-loader') && moduleExists('mini-css-extract-plugin')) {
-    const hash = isProduction ? '-[contenthash:8]' : ''
+    const hash = isProduction || config.useContentHash ? '-[contenthash:8]' : ''
     const MiniCssExtractPlugin = require('mini-css-extract-plugin')
     plugins.push(
       new MiniCssExtractPlugin({
@@ -87,7 +87,8 @@ const getPlugins = () => {
 
 // Don't use contentHash except for production for performance
 // https://webpack.js.org/guides/build-performance/#avoid-production-specific-tooling
-const hash = isProduction ? '-[contenthash]' : ''
+const hash = isProduction || config.useContentHash ? '-[contenthash]' : ''
+
 module.exports = {
   mode: 'production',
   output: {

data/package/environments/production.js

@@ -6,6 +6,7 @@ const CompressionPlugin = require('compression-webpack-plugin')
 const TerserPlugin = require('terser-webpack-plugin')
 const baseConfig = require('./base')
 const { moduleExists } = require('../utils/helpers')
+const config = require('../config')
 
 const getPlugins = () => {
   const plugins = []
@@ -76,4 +77,12 @@ const productionConfig = {
   }
 }
 
+if (config.useContentHash === true) {
+  // eslint-disable-next-line no-console
+  console.warn(`⚠️ WARNING
+Setting 'useContentHash' to 'false' in the production environment (specified by NODE_ENV environment variable) is not allowed!
+Content hashes get added to the filenames regardless of setting useContentHash in 'shakapacker.yml' to false.
+`)
+}
+
 module.exports = merge(baseConfig, productionConfig)

data/package/index.js

@@ -25,27 +25,11 @@ const generateWebpackConfig = () => {
   return immutable
 }
 
-const webpackConfigForBackwardCompatibility = () => {
-  // eslint-disable-next-line no-console
-  console.log(`⚠️
-DEPRECATION NOTICE:
-The 'webpackConfig' is deprecated and will be removed in a future version.
-Please use 'globalMutableWebpackConfig' instead, or use
-'generateWebpackConfig()' to avoid unwanted config manipulation across the app.
-
-For more information, see version 7 upgrade documentation at:
-https://github.com/shakacode/shakapacker/blob/master/docs/v7_upgrade.md
-`)
-
-  return globalMutableWebpackConfig()
-}
-
-module.exports = {
+const shakapackerObject = {
   config, // shakapacker.yml
   devServer,
   generateWebpackConfig,
   globalMutableWebpackConfig: globalMutableWebpackConfig(),
-  webpackConfig: webpackConfigForBackwardCompatibility(),
   baseConfig,
   env,
   rules,
@@ -54,3 +38,26 @@ module.exports = {
   inliningCss,
   ...webpackMerge
 }
+
+// For backward compatibility
+const shakapackerProxyHandler = {
+  get(target, prop) {
+    if (prop === 'webpackConfig') {
+      // eslint-disable-next-line no-console
+      console.warn(`⚠️
+DEPRECATION NOTICE:
+The 'webpackConfig' is deprecated and will be removed in a future version.
+Please use 'globalMutableWebpackConfig' instead, or use
+'generateWebpackConfig()' to avoid unwanted config mutation across the app.
+
+For more information, see version 7 upgrade documentation at:
+https://github.com/shakacode/shakapacker/blob/master/docs/v7_upgrade.md
+`)
+      return globalMutableWebpackConfig()
+    }
+
+    return target[prop]
+  }
+}
+
+module.exports = new Proxy(shakapackerObject, shakapackerProxyHandler)

data/package.json

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shakapacker
 version: !ruby/object:Gem::Version
-  version: 7.0.0.rc.1
+  version: 7.0.0
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-12 00:00:00.000000000 Z
+date: 2023-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -230,6 +230,7 @@ files:
 - package/__tests__/development.js
 - package/__tests__/env-bc.js
 - package/__tests__/env.js
+- package/__tests__/index-bc.js
 - package/__tests__/index.js
 - package/__tests__/production-bc.js
 - package/__tests__/production.js
@@ -243,6 +244,8 @@ files:
 - package/env.js
 - package/environments/__tests__/base-bc.js
 - package/environments/__tests__/base.js
+- package/environments/__tests__/development.js
+- package/environments/__tests__/production.js
 - package/environments/base.js
 - package/environments/development.js
 - package/environments/production.js
@@ -525,7 +528,7 @@ homepage: https://github.com/shakacode/shakapacker
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/shakacode/shakapacker/tree/v7.0.0-rc.1
+  source_code_uri: https://github.com/shakacode/shakapacker/tree/v7.0.0
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -537,9 +540,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.4.12
 signing_key: