shakapacker 7.2.2 → 7.3.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6613d4b52d4526e1ead4d4711e9daab007e98076f3af92e2cd9a61a65386cf74
-  data.tar.gz: 7d31d8f1cfbfe305a6a6e2cc0159150ab6d7c7a3c36ef0608c13389b85a7424b
+  metadata.gz: 32122fb686bab6ec0cfeba217c5d53ad88cf40897fe08564475a4e8fa8b79962
+  data.tar.gz: 1304bdd1f5d735bcc3642ae27a1d9151a75ca1a7c3cf33b1217163577f43a193
 SHA512:
-  metadata.gz: 5d60bca460bbbba6f9944368cab33d63e1958b607d12aac91aba71eb9a00066cbce92893fcc01034c33e347e4f938321bbba2c27650436577ed3078cad13c753
-  data.tar.gz: 80d705dd8d7b5fae172909a5f334cd774dcd57c5864d3c051cc7a33d6b2ef82412f5d104e4a0284d65c3c8a630992798812925e9f5f4e4389b0ec05f8b357889
+  metadata.gz: c77d2e756603a02a42e5b3a5917cb77cce6b112edee947572348057adde9b4bb696c7cdffa592dcee63d851c2cbd04c4143504ed5edaa3ced7206b5c6a88f767
+  data.tar.gz: cdfa1f6f2771eef452dc9a0f3d447ff437bb99ac0b5427381d20042b83734d85f7e21eaf7559bd712788db2f788178c663a4b9117babc44441fb29fc079d5053

data/CHANGELOG.md

@@ -7,10 +7,14 @@
 ## [Unreleased]
 Changes since the last non-beta release.
 
-### Added
+## [v7.2.2] - January 19, 2024
 
+### Added
 - Allow `compression-webpack-plugin` v11. [PR 406](https://github.com/shakacode/shakapacker/pull/406) by [tagliala](https://github.com/tagliala).
 
+### Changed
+- Just like with the `source_path` the paths in `additional_paths` will now also be stripped from asset paths. [PR 403](https://github.com/shakacode/shakapacker/pull/403) by [paypro-leon](https://github.com/paypro-leon).
+
 ## [v7.2.1] - December 30, 2023
 
 ### Fixed
@@ -299,7 +303,8 @@ Note: [Rubygem is 6.3.0.pre.rc.1](https://rubygems.org/gems/shakapacker/versions
 ## v5.4.3 and prior changes from rails/webpacker
 See [CHANGELOG.md in rails/webpacker (up to v5.4.3)](https://github.com/rails/webpacker/blob/master/CHANGELOG.md)
 
-[Unreleased]: https://github.com/shakacode/shakapacker/compare/v7.2.1...master
+[Unreleased]: https://github.com/shakacode/shakapacker/compare/v7.2.2...master
+[v7.2.2]: https://github.com/shakacode/shakapacker/compare/v7.2.1...v7.2.2
 [v7.2.1]: https://github.com/shakacode/shakapacker/compare/v7.2.0...v7.2.1
 [v7.2.0]: https://github.com/shakacode/shakapacker/compare/v7.1.0...v7.2.0
 [v7.1.0]: https://github.com/shakacode/shakapacker/compare/v7.0.3...v7.1.0

data/README.md

@@ -880,6 +880,10 @@ import 'stylesheets/main'
 import 'images/rails.png'
 ```
 
+Assets put in these folders will have their directory stripped just like with the `source_path`. For example:
+
+A file in `app/assets/images/image.svg` with `additional_paths: ['app/assets']` will result in `static/images/image.svg`
+
 **Note:** Please be careful when adding paths here otherwise it will make the compilation slow, consider adding specific paths instead of the whole parent directory if you just need to reference one or two modules
 
 **Also note:** While importing assets living outside your `source_path` defined in shakapacker.yml (like, for instance, assets under `app/assets`) from within your packs using _relative_ paths like `import '../../assets/javascripts/file.js'` will work in development, Shakapacker won't recompile the bundle in production unless a file that lives in one of it's watched paths has changed (check out `Shakapacker::MtimeStrategy#latest_modified_timestamp` or `Shakapacker::DigestStrategy#watched_files_digest` depending on strategy configured by `compiler_strategy` option in `shakapacker.yml`). That's why you'd need to add `app/assets` to the additional_paths as stated above and use `import 'javascripts/file.js'` instead.

data/lib/shakapacker/version.rb

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

data/package/config.js

@@ -53,4 +53,6 @@ if (config.manifest_path) {
   config.manifestPath = resolve(config.outputPath, 'manifest.json')
 }
 
+config.includePaths = [config.source_path, ...config.additional_paths]
+
 module.exports = config

data/package/index.d.ts

@@ -22,6 +22,7 @@ declare module 'shakapacker' {
     publicPath: string
     publicPathWithoutCDN: string
     manifestPath: string
+    includePaths: string[]
   }
 
   export interface Env {

data/package/rules/__tests__/babel.js

@@ -12,7 +12,7 @@ jest.mock("../../config", () => {
   const original = jest.requireActual("../../config");
   return {
     ...original,
-    additional_paths: [...original.additional_paths, "node_modules/included"],
+    includePaths: [...original.includePaths, "node_modules/included"]
   };
 });
 

data/package/rules/__tests__/esbuild.js

@@ -13,7 +13,7 @@ jest.mock("../../config", () => {
   return {
     ...original,
     webpack_loader: "esbuild",
-    additional_paths: [...original.additional_paths, "node_modules/included"],
+    includePaths: [...original.includePaths, "node_modules/included"]
   };
 });
 

data/package/rules/__tests__/file.js

@@ -1,5 +1,13 @@
 const file = require('../file')
 
+jest.mock("../../config", () => {
+  const original = jest.requireActual("../../config");
+  return {
+    ...original,
+    includePaths: [...original.includePaths, 'app/assets']
+  };
+});
+
 describe('file', () => {
   test('test expected file types', () => {
     const types = [
@@ -59,4 +67,13 @@ describe('file', () => {
       'static/images/nested/deeply/[name]-[hash][ext][query]'
     );
   });
+
+  test('correct generated output path is returned for all include paths', () => {
+    const pathData = {
+      filename: 'app/assets/images/image.svg',
+    };
+    expect(file.generator.filename(pathData)).toEqual(
+      'static/images/[name]-[hash][ext][query]'
+    );
+  });
 })

data/package/rules/__tests__/swc.js

@@ -12,7 +12,7 @@ jest.mock("../../config", () => {
   return {
     ...original,
     webpack_loader: "swc",
-    additional_paths: [...original.additional_paths, "node_modules/included"],
+    includePaths: [...original.includePaths, "node_modules/included"],
   };
 });
 

data/package/rules/file.js

@@ -1,5 +1,5 @@
 const { dirname } = require('path')
-const { source_path: sourcePath } = require('../config')
+const { includePaths } = require('../config')
 
 module.exports = {
   test: /\.(bmp|gif|jpe?g|png|tiff|ico|avif|webp|eot|otf|ttf|woff|woff2|svg)$/,
@@ -7,8 +7,11 @@ module.exports = {
   type: 'asset/resource',
   generator: {
     filename: (pathData) => {
-      const folders = dirname(pathData.filename)
-        .replace(`${sourcePath}`, '')
+      const path = dirname(pathData.filename)
+      const selectedIncludePath = includePaths.find((includePath) => path.includes(includePath))
+
+      const folders = path
+        .replace(`${selectedIncludePath}`, '')
         .split('/')
         .filter(Boolean)
 

data/package/rules/jscommon.js

@@ -1,11 +1,8 @@
 const { resolve } = require('path')
 const { realpathSync } = require('fs')
-const {
-  source_path: sourcePath,
-  additional_paths: additionalPaths
-} = require('../config')
+const { includePaths } = require('../config')
 
-const inclusions = [sourcePath, ...additionalPaths].map(p => {
+const inclusions = includePaths.map(p => {
   try {
     return realpathSync(p)
   } catch (e) {

data/package/rules/less.js

@@ -1,11 +1,7 @@
 const path = require('path')
 const { canProcess } = require('../utils/helpers')
 const getStyleRule = require('../utils/get_style_rule')
-
-const {
-  additional_paths: paths,
-  source_path: sourcePath
-} = require('../config')
+const { includePaths } = require('../config')
 
 module.exports = canProcess('less-loader', (resolvedPath) =>
   getStyleRule(/\.(less)(\.erb)?$/i, [
@@ -13,7 +9,10 @@ module.exports = canProcess('less-loader', (resolvedPath) =>
       loader: resolvedPath,
       options: {
         lessOptions: {
-          paths: [path.resolve(__dirname, 'node_modules'), sourcePath, ...paths]
+          paths: [
+            path.resolve(__dirname, 'node_modules'),
+            ...includePaths
+          ]
         },
         sourceMap: true
       }

data/package/rules/stylus.js

@@ -1,11 +1,7 @@
 const path = require('path')
 const { canProcess } = require('../utils/helpers')
 const getStyleRule = require('../utils/get_style_rule')
-
-const {
-  additional_paths: paths,
-  source_path: sourcePath
-} = require('../config')
+const { includePaths } = require('../config')
 
 module.exports = canProcess('stylus-loader', (resolvedPath) =>
   getStyleRule(/\.(styl(us)?)(\.erb)?$/i, [
@@ -15,8 +11,7 @@ module.exports = canProcess('stylus-loader', (resolvedPath) =>
         stylusOptions: {
           include: [
             path.resolve(__dirname, 'node_modules'),
-            sourcePath,
-            ...paths
+            ...includePaths
           ]
         },
         sourceMap: true

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shakapacker",
-  "version": "7.2.2",
+  "version": "7.3.0-beta.1",
   "description": "Use webpack to manage app-like JavaScript modules in Rails",
   "homepage": "https://github.com/shakacode/shakapacker",
   "bugs": {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shakapacker
 version: !ruby/object:Gem::Version
-  version: 7.2.2
+  version: 7.3.0.beta.1
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -566,7 +566,7 @@ homepage: https://github.com/shakacode/shakapacker
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/shakacode/shakapacker/tree/v7.2.2
+  source_code_uri: https://github.com/shakacode/shakapacker/tree/v7.3.0.beta.1
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -578,9 +578,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: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.4.12
 signing_key: