shakapacker 7.2.3 → 7.3.0.beta.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (40) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/dummy.yml +1 -2
  3. data/.github/workflows/generator.yml +1 -2
  4. data/.github/workflows/jest.yml +1 -2
  5. data/.github/workflows/js-lint.yml +1 -2
  6. data/.github/workflows/rubocop.yml +1 -2
  7. data/.github/workflows/ruby-backward-compatibility.yml +1 -2
  8. data/.github/workflows/ruby.yml +1 -2
  9. data/.node-version +1 -1
  10. data/CHANGELOG.md +5 -5
  11. data/README.md +5 -20
  12. data/docs/react.md +1 -1
  13. data/docs/v6_upgrade.md +1 -1
  14. data/lib/shakapacker/compiler.rb +1 -1
  15. data/lib/shakapacker/deprecation_helper.rb +1 -1
  16. data/lib/shakapacker/helper.rb +3 -3
  17. data/lib/shakapacker/version.rb +1 -1
  18. data/package/config.js +2 -0
  19. data/package/index.d.ts +1 -0
  20. data/package/index.js +1 -1
  21. data/package/rules/__tests__/babel.js +1 -1
  22. data/package/rules/__tests__/esbuild.js +1 -1
  23. data/package/rules/__tests__/file.js +17 -0
  24. data/package/rules/__tests__/swc.js +1 -1
  25. data/package/rules/file.js +6 -3
  26. data/package/rules/jscommon.js +2 -5
  27. data/package/rules/less.js +5 -6
  28. data/package/rules/stylus.js +2 -7
  29. data/package.json +2 -2
  30. data/spec/backward_compatibility_specs/helper_spec.rb +3 -3
  31. data/spec/fixtures/github_url_package-lock.v1.json +1 -1
  32. data/spec/fixtures/github_url_package-lock.v2.json +2 -2
  33. data/spec/fixtures/github_url_package.json +1 -1
  34. data/spec/fixtures/github_url_pnpm-lock.v7.yaml +1 -1
  35. data/spec/fixtures/github_url_pnpm-lock.v8.yaml +1 -1
  36. data/spec/fixtures/github_url_yarn.v1.lock +1 -1
  37. data/spec/fixtures/github_url_yarn.v2.lock +2 -2
  38. data/spec/shakapacker/helper_spec.rb +3 -3
  39. data/spec/shakapacker/version_checker_spec.rb +1 -1
  40. metadata +5 -5
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 5968b3bebbc2447a2aa26ecdef02b4bd96e593d9f04b30fdcf33415b2e674e64
4
- data.tar.gz: fe48b75ef65f90b2df1a78c76530ffe265228d048da91f5cbbdd038aac10ca11
3
+ metadata.gz: 32122fb686bab6ec0cfeba217c5d53ad88cf40897fe08564475a4e8fa8b79962
4
+ data.tar.gz: 1304bdd1f5d735bcc3642ae27a1d9151a75ca1a7c3cf33b1217163577f43a193
5
5
  SHA512:
6
- metadata.gz: eb4c1b9f91d5c60d03bb71deeff4d42a6746261f0ea8d5013f60f0b8a343a9d3758db097a863abce1027496634e0677355f56ac1726a270e5b3a9ac88ec5dc9c
7
- data.tar.gz: 96d1279afa3d03a145ab537e1e1f4357e14567fd3c9855dba36d37fff88efc6e20b261063e7c075455cf038ad504981da51b5446e5004485ebf66c134735aeeb
6
+ metadata.gz: c77d2e756603a02a42e5b3a5917cb77cce6b112edee947572348057adde9b4bb696c7cdffa592dcee63d851c2cbd04c4143504ed5edaa3ced7206b5c6a88f767
7
+ data.tar.gz: cdfa1f6f2771eef452dc9a0f3d447ff437bb99ac0b5427381d20042b83734d85f7e21eaf7559bd712788db2f788178c663a4b9117babc44441fb29fc079d5053
@@ -3,8 +3,7 @@ name: Dummy specs
3
3
  on:
4
4
  push:
5
5
  branches:
6
- - 'main'
7
- - 'next'
6
+ - 'master'
8
7
  pull_request:
9
8
 
10
9
  jobs:
@@ -3,8 +3,7 @@ name: Generator specs
3
3
  on:
4
4
  push:
5
5
  branches:
6
- - 'main'
7
- - 'next'
6
+ - 'master'
8
7
  pull_request:
9
8
 
10
9
  jobs:
@@ -3,8 +3,7 @@ name: Jest specs
3
3
  on:
4
4
  push:
5
5
  branches:
6
- - 'main'
7
- - 'next'
6
+ - 'master'
8
7
  pull_request:
9
8
 
10
9
  jobs:
@@ -3,8 +3,7 @@ name: JS lint
3
3
  on:
4
4
  push:
5
5
  branches:
6
- - 'main'
7
- - 'next'
6
+ - 'master'
8
7
  pull_request:
9
8
 
10
9
  jobs:
@@ -3,8 +3,7 @@ name: Rubocop
3
3
  on:
4
4
  push:
5
5
  branches:
6
- - 'main'
7
- - 'next'
6
+ - 'master'
8
7
  pull_request:
9
8
 
10
9
  jobs:
@@ -3,8 +3,7 @@ name: Ruby specs - Backward compatibility
3
3
  on:
4
4
  push:
5
5
  branches:
6
- - 'main'
7
- - 'next'
6
+ - 'master'
8
7
  pull_request:
9
8
 
10
9
  jobs:
@@ -3,8 +3,7 @@ name: Ruby specs
3
3
  on:
4
4
  push:
5
5
  branches:
6
- - 'main'
7
- - 'next'
6
+ - 'master'
8
7
  pull_request:
9
8
 
10
9
  jobs:
data/.node-version CHANGED
@@ -1 +1 @@
1
- 21.0.0
1
+ 16.14.0
data/CHANGELOG.md CHANGED
@@ -7,14 +7,14 @@
7
7
  ## [Unreleased]
8
8
  Changes since the last non-beta release.
9
9
 
10
- - Emit warnings instead of errors when compilation is success but stderr is not empty. [PR 416](https://github.com/shakacode/shakapacker/pull/416) by [n-rodriguez](https://github.com/n-rodriguez).
11
- - Allow `webpack-dev-server` v5. [PR 418](https://github.com/shakacode/shakapacker/pull/418) by [G-Rath](https://github.com/g-rath)
12
-
13
10
  ## [v7.2.2] - January 19, 2024
14
11
 
15
12
  ### Added
16
13
  - Allow `compression-webpack-plugin` v11. [PR 406](https://github.com/shakacode/shakapacker/pull/406) by [tagliala](https://github.com/tagliala).
17
14
 
15
+ ### Changed
16
+ - 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).
17
+
18
18
  ## [v7.2.1] - December 30, 2023
19
19
 
20
20
  ### Fixed
@@ -65,7 +65,7 @@ Changes since the last non-beta release.
65
65
 
66
66
  - Export immutable webpackConfig function. [PR 293](https://github.com/shakacode/shakapacker/pull/293) by [tomdracz](https://github.com/tomdracz).
67
67
 
68
- The `webpackConfig` property in the `shakapacker` module has been updated to be a function instead of a global mutable webpack configuration. This function now returns an immutable webpack configuration object, which ensures that any modifications made to it will not affect any other usage of the webpack configuration. If a project still requires the old mutable object, it can be accessed by replacing `webpackConfig` with `globalMutableWebpackConfig`. Check [v7-upgrade](https://github.com/shakacode/shakapacker/blob/main/docs/v7_upgrade.md) documentation for more detail.
68
+ The `webpackConfig` property in the `shakapacker` module has been updated to be a function instead of a global mutable webpack configuration. This function now returns an immutable webpack configuration object, which ensures that any modifications made to it will not affect any other usage of the webpack configuration. If a project still requires the old mutable object, it can be accessed by replacing `webpackConfig` with `globalMutableWebpackConfig`. Check [v7-upgrade](https://github.com/shakacode/shakapacker/blob/master/docs/v7_upgrade.md) documentation for more detail.
69
69
 
70
70
  ### Added
71
71
  - Set CSS modules mode depending on file type. [PR 261](https://github.com/shakacode/shakapacker/pull/261) by [talyuk](https://github.com/talyuk).
@@ -303,7 +303,7 @@ Note: [Rubygem is 6.3.0.pre.rc.1](https://rubygems.org/gems/shakapacker/versions
303
303
  ## v5.4.3 and prior changes from rails/webpacker
304
304
  See [CHANGELOG.md in rails/webpacker (up to v5.4.3)](https://github.com/rails/webpacker/blob/master/CHANGELOG.md)
305
305
 
306
- [Unreleased]: https://github.com/shakacode/shakapacker/compare/v7.2.2...main
306
+ [Unreleased]: https://github.com/shakacode/shakapacker/compare/v7.2.2...master
307
307
  [v7.2.2]: https://github.com/shakacode/shakapacker/compare/v7.2.1...v7.2.2
308
308
  [v7.2.1]: https://github.com/shakacode/shakapacker/compare/v7.2.0...v7.2.1
309
309
  [v7.2.0]: https://github.com/shakacode/shakapacker/compare/v7.1.0...v7.2.0
data/README.md CHANGED
@@ -703,26 +703,7 @@ yarn add postcss-preset-env postcss-flexbugs-fixes
703
703
  #### Sass
704
704
 
705
705
  ```bash
706
- yarn add sass-loader
707
- ```
708
-
709
- You will also need to install [Dart Sass](https://github.com/sass/dart-sass), [Node Sass](https://github.com/sass/node-sass) or [Sass Embedded](https://github.com/sass/embedded-host-node) to pick the implementation to use. sass-loader will automatically pick an implementation based on installed packages.
710
-
711
- Please refer to [sass-loader documentation](https://www.npmjs.com/package/sass-loader) and individual packages repos for more information on all the options.
712
-
713
- ##### Dart Sass
714
- ```bash
715
- yarn add sass
716
- ```
717
-
718
- ##### Node Sass
719
- ```bash
720
- yarn add node-sass
721
- ```
722
-
723
- ##### Sass Embedded
724
- ```bash
725
- yarn add sass-embedded
706
+ yarn add sass sass-loader
726
707
  ```
727
708
 
728
709
  #### Less
@@ -899,6 +880,10 @@ import 'stylesheets/main'
899
880
  import 'images/rails.png'
900
881
  ```
901
882
 
883
+ Assets put in these folders will have their directory stripped just like with the `source_path`. For example:
884
+
885
+ A file in `app/assets/images/image.svg` with `additional_paths: ['app/assets']` will result in `static/images/image.svg`
886
+
902
887
  **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
903
888
 
904
889
  **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/docs/react.md CHANGED
@@ -226,7 +226,7 @@ module.exports = webpackConfig;
226
226
  - },
227
227
  ```
228
228
 
229
- 11. Create a `babel.config.js` file in the project root and add the following [sample code](https://github.com/shakacode/shakapacker/blob/main/docs/customizing_babel_config.md#react-configuration):
229
+ 11. Create a `babel.config.js` file in the project root and add the following [sample code](https://github.com/shakacode/shakapacker/blob/master/docs/customizing_babel_config.md#react-configuration):
230
230
  ```js
231
231
  module.exports = function (api) {
232
232
  const defaultConfigFunc = require('shakapacker/package/babel/preset.js')
data/docs/v6_upgrade.md CHANGED
@@ -140,7 +140,7 @@ _If you're on webpacker v5, follow [how to upgrade to webpacker v6.0.0.rc.6 from
140
140
  ```
141
141
  See customization example the [Customizing Babel Config](./customizing_babel_config.md) for React configuration.
142
142
 
143
- 1. `extensions` was removed from the `webpacker.yml` file. Move custom extensions to your configuration by merging an object like this. For more details, see docs for [Webpack Configuration](https://github.com/shakacode/shakapacker/blob/main/README.md#webpack-configuration)
143
+ 1. `extensions` was removed from the `webpacker.yml` file. Move custom extensions to your configuration by merging an object like this. For more details, see docs for [Webpack Configuration](https://github.com/shakacode/shakapacker/blob/master/README.md#webpack-configuration)
144
144
 
145
145
  ```js
146
146
  {
@@ -88,7 +88,7 @@ class Shakapacker::Compiler
88
88
 
89
89
  if status.success?
90
90
  logger.info "Compiled all packs in #{config.public_output_path}"
91
- logger.warn "#{stderr}" unless stderr.empty?
91
+ logger.error "#{stderr}" unless stderr.empty?
92
92
 
93
93
  if config.webpack_compile_output?
94
94
  logger.info stdout
@@ -1,7 +1,7 @@
1
1
  require "thor"
2
2
 
3
3
  module Shakapacker
4
- DEPRECATION_GUIDE_URL = "https://github.com/shakacode/shakapacker/blob/main/docs/v7_upgrade.md"
4
+ DEPRECATION_GUIDE_URL = "https://github.com/shakacode/shakapacker/blob/master/docs/v7_upgrade.md"
5
5
  DEPRECATION_MESSAGE = <<~MSG
6
6
  DEPRECATION NOTICE:
7
7
 
@@ -98,7 +98,7 @@ module Shakapacker::Helper
98
98
  def javascript_pack_tag(*names, defer: true, **options)
99
99
  if @javascript_pack_tag_loaded
100
100
  raise "To prevent duplicated chunks on the page, you should call javascript_pack_tag only once on the page. " \
101
- "Please refer to https://github.com/shakacode/shakapacker/blob/main/README.md#view-helpers-javascript_pack_tag-and-stylesheet_pack_tag for the usage guide"
101
+ "Please refer to https://github.com/shakacode/shakapacker/blob/master/README.md#view-helpers-javascript_pack_tag-and-stylesheet_pack_tag for the usage guide"
102
102
  end
103
103
 
104
104
  append_javascript_pack_tag(*names, defer: defer)
@@ -169,7 +169,7 @@ module Shakapacker::Helper
169
169
  def append_stylesheet_pack_tag(*names)
170
170
  if @stylesheet_pack_tag_loaded
171
171
  raise "You can only call append_stylesheet_pack_tag before stylesheet_pack_tag helper. " \
172
- "Please refer to https://github.com/shakacode/shakapacker/blob/main/README.md#view-helper-append_javascript_pack_tag-prepend_javascript_pack_tag-and-append_stylesheet_pack_tag for the usage guide"
172
+ "Please refer to https://github.com/shakacode/shakapacker/blob/master/README.md#view-helper-append_javascript_pack_tag-prepend_javascript_pack_tag-and-append_stylesheet_pack_tag for the usage guide"
173
173
  end
174
174
 
175
175
  @stylesheet_pack_tag_queue ||= []
@@ -196,7 +196,7 @@ module Shakapacker::Helper
196
196
  def update_javascript_pack_tag_queue(defer:)
197
197
  if @javascript_pack_tag_loaded
198
198
  raise "You can only call #{caller_locations(1..1).first.label} before javascript_pack_tag helper. " \
199
- "Please refer to https://github.com/shakacode/shakapacker/blob/main/README.md#view-helper-append_javascript_pack_tag-prepend_javascript_pack_tag-and-append_stylesheet_pack_tag for the usage guide"
199
+ "Please refer to https://github.com/shakacode/shakapacker/blob/master/README.md#view-helper-append_javascript_pack_tag-prepend_javascript_pack_tag-and-append_stylesheet_pack_tag for the usage guide"
200
200
  end
201
201
 
202
202
  yield(defer ? :deferred : :non_deferred)
@@ -1,4 +1,4 @@
1
1
  module Shakapacker
2
2
  # Change the version in package.json too, please!
3
- VERSION = "7.2.3".freeze
3
+ VERSION = "7.3.0.beta.1".freeze
4
4
  end
data/package/config.js CHANGED
@@ -53,4 +53,6 @@ if (config.manifest_path) {
53
53
  config.manifestPath = resolve(config.outputPath, 'manifest.json')
54
54
  }
55
55
 
56
+ config.includePaths = [config.source_path, ...config.additional_paths]
57
+
56
58
  module.exports = config
data/package/index.d.ts CHANGED
@@ -22,6 +22,7 @@ declare module 'shakapacker' {
22
22
  publicPath: string
23
23
  publicPathWithoutCDN: string
24
24
  manifestPath: string
25
+ includePaths: string[]
25
26
  }
26
27
 
27
28
  export interface Env {
data/package/index.js CHANGED
@@ -57,7 +57,7 @@ Please use 'globalMutableWebpackConfig' instead, or use
57
57
  'generateWebpackConfig()' to avoid unwanted config mutation across the app.
58
58
 
59
59
  For more information, see version 7 upgrade documentation at:
60
- https://github.com/shakacode/shakapacker/blob/main/docs/v7_upgrade.md
60
+ https://github.com/shakacode/shakapacker/blob/master/docs/v7_upgrade.md
61
61
  `)
62
62
  return globalMutableWebpackConfig()
63
63
  }
@@ -12,7 +12,7 @@ jest.mock("../../config", () => {
12
12
  const original = jest.requireActual("../../config");
13
13
  return {
14
14
  ...original,
15
- additional_paths: [...original.additional_paths, "node_modules/included"],
15
+ includePaths: [...original.includePaths, "node_modules/included"]
16
16
  };
17
17
  });
18
18
 
@@ -13,7 +13,7 @@ jest.mock("../../config", () => {
13
13
  return {
14
14
  ...original,
15
15
  webpack_loader: "esbuild",
16
- additional_paths: [...original.additional_paths, "node_modules/included"],
16
+ includePaths: [...original.includePaths, "node_modules/included"]
17
17
  };
18
18
  });
19
19
 
@@ -1,5 +1,13 @@
1
1
  const file = require('../file')
2
2
 
3
+ jest.mock("../../config", () => {
4
+ const original = jest.requireActual("../../config");
5
+ return {
6
+ ...original,
7
+ includePaths: [...original.includePaths, 'app/assets']
8
+ };
9
+ });
10
+
3
11
  describe('file', () => {
4
12
  test('test expected file types', () => {
5
13
  const types = [
@@ -59,4 +67,13 @@ describe('file', () => {
59
67
  'static/images/nested/deeply/[name]-[hash][ext][query]'
60
68
  );
61
69
  });
70
+
71
+ test('correct generated output path is returned for all include paths', () => {
72
+ const pathData = {
73
+ filename: 'app/assets/images/image.svg',
74
+ };
75
+ expect(file.generator.filename(pathData)).toEqual(
76
+ 'static/images/[name]-[hash][ext][query]'
77
+ );
78
+ });
62
79
  })
@@ -12,7 +12,7 @@ jest.mock("../../config", () => {
12
12
  return {
13
13
  ...original,
14
14
  webpack_loader: "swc",
15
- additional_paths: [...original.additional_paths, "node_modules/included"],
15
+ includePaths: [...original.includePaths, "node_modules/included"],
16
16
  };
17
17
  });
18
18
 
@@ -1,5 +1,5 @@
1
1
  const { dirname } = require('path')
2
- const { source_path: sourcePath } = require('../config')
2
+ const { includePaths } = require('../config')
3
3
 
4
4
  module.exports = {
5
5
  test: /\.(bmp|gif|jpe?g|png|tiff|ico|avif|webp|eot|otf|ttf|woff|woff2|svg)$/,
@@ -7,8 +7,11 @@ module.exports = {
7
7
  type: 'asset/resource',
8
8
  generator: {
9
9
  filename: (pathData) => {
10
- const folders = dirname(pathData.filename)
11
- .replace(`${sourcePath}`, '')
10
+ const path = dirname(pathData.filename)
11
+ const selectedIncludePath = includePaths.find((includePath) => path.includes(includePath))
12
+
13
+ const folders = path
14
+ .replace(`${selectedIncludePath}`, '')
12
15
  .split('/')
13
16
  .filter(Boolean)
14
17
 
@@ -1,11 +1,8 @@
1
1
  const { resolve } = require('path')
2
2
  const { realpathSync } = require('fs')
3
- const {
4
- source_path: sourcePath,
5
- additional_paths: additionalPaths
6
- } = require('../config')
3
+ const { includePaths } = require('../config')
7
4
 
8
- const inclusions = [sourcePath, ...additionalPaths].map(p => {
5
+ const inclusions = includePaths.map(p => {
9
6
  try {
10
7
  return realpathSync(p)
11
8
  } catch (e) {
@@ -1,11 +1,7 @@
1
1
  const path = require('path')
2
2
  const { canProcess } = require('../utils/helpers')
3
3
  const getStyleRule = require('../utils/get_style_rule')
4
-
5
- const {
6
- additional_paths: paths,
7
- source_path: sourcePath
8
- } = require('../config')
4
+ const { includePaths } = require('../config')
9
5
 
10
6
  module.exports = canProcess('less-loader', (resolvedPath) =>
11
7
  getStyleRule(/\.(less)(\.erb)?$/i, [
@@ -13,7 +9,10 @@ module.exports = canProcess('less-loader', (resolvedPath) =>
13
9
  loader: resolvedPath,
14
10
  options: {
15
11
  lessOptions: {
16
- paths: [path.resolve(__dirname, 'node_modules'), sourcePath, ...paths]
12
+ paths: [
13
+ path.resolve(__dirname, 'node_modules'),
14
+ ...includePaths
15
+ ]
17
16
  },
18
17
  sourceMap: true
19
18
  }
@@ -1,11 +1,7 @@
1
1
  const path = require('path')
2
2
  const { canProcess } = require('../utils/helpers')
3
3
  const getStyleRule = require('../utils/get_style_rule')
4
-
5
- const {
6
- additional_paths: paths,
7
- source_path: sourcePath
8
- } = require('../config')
4
+ const { includePaths } = require('../config')
9
5
 
10
6
  module.exports = canProcess('stylus-loader', (resolvedPath) =>
11
7
  getStyleRule(/\.(styl(us)?)(\.erb)?$/i, [
@@ -15,8 +11,7 @@ module.exports = canProcess('stylus-loader', (resolvedPath) =>
15
11
  stylusOptions: {
16
12
  include: [
17
13
  path.resolve(__dirname, 'node_modules'),
18
- sourcePath,
19
- ...paths
14
+ ...includePaths
20
15
  ]
21
16
  },
22
17
  sourceMap: true
data/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "shakapacker",
3
- "version": "7.2.3",
3
+ "version": "7.3.0-beta.1",
4
4
  "description": "Use webpack to manage app-like JavaScript modules in Rails",
5
5
  "homepage": "https://github.com/shakacode/shakapacker",
6
6
  "bugs": {
@@ -68,7 +68,7 @@
68
68
  "webpack": "^5.72.0",
69
69
  "webpack-assets-manifest": "^5.0.6",
70
70
  "webpack-cli": "^4.9.2 || ^5.0.0",
71
- "webpack-dev-server": "^4.9.0 || ^5.0.0",
71
+ "webpack-dev-server": "^4.9.0",
72
72
  "webpack-merge": "^5.8.0"
73
73
  },
74
74
  "peerDependenciesMeta": {
@@ -126,7 +126,7 @@ module ActionView::TestCase::Behavior
126
126
  it "#append_javascript_pack_tag raises an error if called after calling #javascript_pack_tag" do
127
127
  expected_error_message = \
128
128
  "You can only call append_javascript_pack_tag before javascript_pack_tag helper. " +
129
- "Please refer to https://github.com/shakacode/shakapacker/blob/main/README.md#view-helper-append_javascript_pack_tag-prepend_javascript_pack_tag-and-append_stylesheet_pack_tag for the usage guide"
129
+ "Please refer to https://github.com/shakacode/shakapacker/blob/master/README.md#view-helper-append_javascript_pack_tag-prepend_javascript_pack_tag-and-append_stylesheet_pack_tag for the usage guide"
130
130
 
131
131
  expect {
132
132
  javascript_pack_tag("application")
@@ -137,7 +137,7 @@ module ActionView::TestCase::Behavior
137
137
  it "#prepend_javascript_pack_tag raises an error if called after calling #javascript_pack_tag" do
138
138
  expected_error_message = \
139
139
  "You can only call prepend_javascript_pack_tag before javascript_pack_tag helper. " +
140
- "Please refer to https://github.com/shakacode/shakapacker/blob/main/README.md#view-helper-append_javascript_pack_tag-prepend_javascript_pack_tag-and-append_stylesheet_pack_tag for the usage guide"
140
+ "Please refer to https://github.com/shakacode/shakapacker/blob/master/README.md#view-helper-append_javascript_pack_tag-prepend_javascript_pack_tag-and-append_stylesheet_pack_tag for the usage guide"
141
141
 
142
142
  expect {
143
143
  javascript_pack_tag("application")
@@ -167,7 +167,7 @@ module ActionView::TestCase::Behavior
167
167
 
168
168
  it "#javascript_pack_tag rases error on multiple invocations" do
169
169
  expected_error_message = "To prevent duplicated chunks on the page, you should call javascript_pack_tag only once on the page. " +
170
- "Please refer to https://github.com/shakacode/shakapacker/blob/main/README.md#view-helpers-javascript_pack_tag-and-stylesheet_pack_tag for the usage guide"
170
+ "Please refer to https://github.com/shakacode/shakapacker/blob/master/README.md#view-helpers-javascript_pack_tag-and-stylesheet_pack_tag for the usage guide"
171
171
 
172
172
  expect {
173
173
  javascript_pack_tag(:application)
@@ -102,7 +102,7 @@
102
102
  },
103
103
  "shakapacker": {
104
104
  "version": "github:shakacode/shakapacker#31854a58be49f736f3486a946b72d7e4f334e2b2",
105
- "from": "github:shakacode/shakapacker#main",
105
+ "from": "github:shakacode/shakapacker#master",
106
106
  "requires": {
107
107
  "glob": "^7.2.0",
108
108
  "js-yaml": "^4.1.0",
@@ -9,7 +9,7 @@
9
9
  "version": "1.0.0",
10
10
  "license": "MIT",
11
11
  "dependencies": {
12
- "shakapacker": "shakacode/shakapacker#main"
12
+ "shakapacker": "shakacode/shakapacker#master"
13
13
  },
14
14
  "devDependencies": {
15
15
  "right-pad": "^1.0.1"
@@ -9594,7 +9594,7 @@
9594
9594
  },
9595
9595
  "shakapacker": {
9596
9596
  "version": "git+ssh://git@github.com/shakacode/shakapacker.git#31854a58be49f736f3486a946b72d7e4f334e2b2",
9597
- "from": "shakapacker@shakacode/shakapacker#main",
9597
+ "from": "shakapacker@shakacode/shakapacker#master",
9598
9598
  "requires": {
9599
9599
  "glob": "^7.2.0",
9600
9600
  "js-yaml": "^4.1.0",
@@ -5,7 +5,7 @@
5
5
  "license": "MIT",
6
6
  "private": true,
7
7
  "dependencies": {
8
- "shakapacker": "shakacode/shakapacker#main"
8
+ "shakapacker": "shakacode/shakapacker#master"
9
9
  },
10
10
  "devDependencies": {
11
11
  "right-pad": "^1.0.1"
@@ -2,7 +2,7 @@ lockfileVersion: 5.4
2
2
 
3
3
  specifiers:
4
4
  right-pad: ^1.0.1
5
- shakapacker: shakacode/shakapacker#main
5
+ shakapacker: shakacode/shakapacker#master
6
6
 
7
7
  dependencies:
8
8
  shakapacker: github.com/shakacode/shakapacker/cdf32835d3e0949952b8b4b53063807f714f9b24
@@ -6,7 +6,7 @@ settings:
6
6
 
7
7
  dependencies:
8
8
  shakapacker:
9
- specifier: shakacode/shakapacker#main
9
+ specifier: shakacode/shakapacker#master
10
10
  version: github.com/shakacode/shakapacker/cdf32835d3e0949952b8b4b53063807f714f9b24(@babel/core@7.22.10)(@babel/plugin-transform-runtime@7.22.10)(@babel/preset-env@7.22.10)(@babel/runtime@7.22.10)(babel-loader@9.1.3)(compression-webpack-plugin@10.0.0)(terser-webpack-plugin@5.3.9)(webpack-assets-manifest@5.1.0)(webpack-cli@5.1.4)(webpack-dev-server@4.15.1)(webpack-merge@5.9.0)(webpack@5.88.2)
11
11
 
12
12
  devDependencies:
@@ -91,7 +91,7 @@ right-pad@^1.0.1:
91
91
  resolved "https://registry.yarnpkg.com/right-pad/-/right-pad-1.0.1.tgz#8ca08c2cbb5b55e74dafa96bf7fd1a27d568c8d0"
92
92
  integrity sha512-bYBjgxmkvTAfgIYy328fmkwhp39v8lwVgWhhrzxPV3yHtcSqyYKe9/XOhvW48UFjATg3VuJbpsp5822ACNvkmw==
93
93
 
94
- shakapacker@shakacode/shakapacker#main:
94
+ shakapacker@shakacode/shakapacker#master:
95
95
  version "6.5.0"
96
96
  resolved "https://codeload.github.com/shakacode/shakapacker/tar.gz/31854a58be49f736f3486a946b72d7e4f334e2b2"
97
97
  dependencies:
@@ -124,7 +124,7 @@ __metadata:
124
124
  languageName: node
125
125
  linkType: hard
126
126
 
127
- "shakapacker@shakacode/shakapacker#main":
127
+ "shakapacker@shakacode/shakapacker#master":
128
128
  version: 6.5.0
129
129
  resolution: "shakapacker@https://github.com/shakacode/shakapacker.git#commit=31854a58be49f736f3486a946b72d7e4f334e2b2"
130
130
  dependencies:
@@ -153,7 +153,7 @@ __metadata:
153
153
  resolution: "test_app@workspace:."
154
154
  dependencies:
155
155
  right-pad: ^1.0.1
156
- shakapacker: "shakacode/shakapacker#main"
156
+ shakapacker: "shakacode/shakapacker#master"
157
157
  languageName: unknown
158
158
  linkType: soft
159
159
 
@@ -126,7 +126,7 @@ module ActionView::TestCase::Behavior
126
126
  it "#append_javascript_pack_tag raises an error if called after calling #javascript_pack_tag" do
127
127
  expected_error_message = \
128
128
  "You can only call append_javascript_pack_tag before javascript_pack_tag helper. " +
129
- "Please refer to https://github.com/shakacode/shakapacker/blob/main/README.md#view-helper-append_javascript_pack_tag-prepend_javascript_pack_tag-and-append_stylesheet_pack_tag for the usage guide"
129
+ "Please refer to https://github.com/shakacode/shakapacker/blob/master/README.md#view-helper-append_javascript_pack_tag-prepend_javascript_pack_tag-and-append_stylesheet_pack_tag for the usage guide"
130
130
 
131
131
  expect {
132
132
  javascript_pack_tag("application")
@@ -137,7 +137,7 @@ module ActionView::TestCase::Behavior
137
137
  it "#prepend_javascript_pack_tag raises an error if called after calling #javascript_pack_tag" do
138
138
  expected_error_message = \
139
139
  "You can only call prepend_javascript_pack_tag before javascript_pack_tag helper. " +
140
- "Please refer to https://github.com/shakacode/shakapacker/blob/main/README.md#view-helper-append_javascript_pack_tag-prepend_javascript_pack_tag-and-append_stylesheet_pack_tag for the usage guide"
140
+ "Please refer to https://github.com/shakacode/shakapacker/blob/master/README.md#view-helper-append_javascript_pack_tag-prepend_javascript_pack_tag-and-append_stylesheet_pack_tag for the usage guide"
141
141
 
142
142
  expect {
143
143
  javascript_pack_tag("application")
@@ -167,7 +167,7 @@ module ActionView::TestCase::Behavior
167
167
 
168
168
  it "#javascript_pack_tag rases error on multiple invocations" do
169
169
  expected_error_message = "To prevent duplicated chunks on the page, you should call javascript_pack_tag only once on the page. " +
170
- "Please refer to https://github.com/shakacode/shakapacker/blob/main/README.md#view-helpers-javascript_pack_tag-and-stylesheet_pack_tag for the usage guide"
170
+ "Please refer to https://github.com/shakacode/shakapacker/blob/master/README.md#view-helpers-javascript_pack_tag-and-stylesheet_pack_tag for the usage guide"
171
171
 
172
172
  expect {
173
173
  javascript_pack_tag(:application)
@@ -233,7 +233,7 @@ describe "VersionChecker::NodePackageVersion" do
233
233
  let(:node_package_version_from_github_url) { node_package_version(fixture_version: "github_url") }
234
234
 
235
235
  it "#raw returns the GitHub repo address" do
236
- expect(node_package_version_from_github_url.raw).to eq "shakacode/shakapacker#main"
236
+ expect(node_package_version_from_github_url.raw).to eq "shakacode/shakapacker#master"
237
237
  end
238
238
 
239
239
  it "#major_minor_patch returns nil" do
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: shakapacker
3
3
  version: !ruby/object:Gem::Version
4
- version: 7.2.3
4
+ version: 7.3.0.beta.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - David Heinemeier Hansson
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2024-03-23 00:00:00.000000000 Z
13
+ date: 2024-01-20 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: activesupport
@@ -566,7 +566,7 @@ homepage: https://github.com/shakacode/shakapacker
566
566
  licenses:
567
567
  - MIT
568
568
  metadata:
569
- source_code_uri: https://github.com/shakacode/shakapacker/tree/v7.2.3
569
+ source_code_uri: https://github.com/shakacode/shakapacker/tree/v7.3.0.beta.1
570
570
  post_install_message:
571
571
  rdoc_options: []
572
572
  require_paths:
@@ -578,9 +578,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
578
578
  version: 2.6.0
579
579
  required_rubygems_version: !ruby/object:Gem::Requirement
580
580
  requirements:
581
- - - ">="
581
+ - - ">"
582
582
  - !ruby/object:Gem::Version
583
- version: '0'
583
+ version: 1.3.1
584
584
  requirements: []
585
585
  rubygems_version: 3.4.12
586
586
  signing_key: