Commit Graph

34849 Commits

Author SHA1 Message Date
Gaetan Craig-Riou
1b03528aca Switch to v349_with-relaxed-dependencies for select2
It allows us to remove dependency on `rails-sass`
Sass files are handled by `shakapacker/wepack`, so we no use for
`rails-sass`
2026-01-26 14:51:32 +11:00
Gaetan Craig-Riou
9a90e46b78 Move mail css back to be managed by wepack
It wil allow us to remove dependency on `rails-sass`, and `sass` which
are not maintained anymore.
More or less revert this PR: https://github.com/openfoodfoundation/openfoodnetwork/pull/12743
2026-01-26 14:50:31 +11:00
Gaetan Craig-Riou
7e4886ad67 Merge pull request #13878 from openfoodfoundation/dependabot/npm_and_yarn/sass-embedded-1.97.3
Bump sass-embedded from 1.97.2 to 1.97.3
2026-01-26 14:27:15 +11:00
dependabot[bot]
9297dbfa63 Bump sass-embedded from 1.97.2 to 1.97.3
Bumps [sass-embedded](https://github.com/sass/embedded-host-node) from 1.97.2 to 1.97.3.
- [Changelog](https://github.com/sass/embedded-host-node/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/embedded-host-node/compare/1.97.2...1.97.3)

---
updated-dependencies:
- dependency-name: sass-embedded
  dependency-version: 1.97.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-01-26 00:15:46 +00:00
Maikel
7bfe51d067 Merge pull request #13849 from rioug/10298-upgrade-to-shakapaker_v7
Upgrade to shakapaker v7
2026-01-26 11:14:31 +11:00
Ahmed Ejaz
6ad49cc080 Update all locales with the latest Transifex translations v5.4.0 2026-01-26 03:50:53 +05:00
Rachel Arnould
2a7e8816c0 Merge pull request #13834 from mkllnk/pay-methods
Simplify code listing available payment method types
2026-01-23 22:52:29 +01:00
Gaetan Craig-Riou
988f903164 Update locale cache key to invalidate cache 2026-01-23 16:23:14 +01:00
Gaetan Craig-Riou
108e313e48 Remove ci config that was missed during rebase 2026-01-23 16:23:14 +01:00
Gaetan Craig-Riou
e502aad7c9 Coffee scripts are managed by sproket
There is no need to add coffee script dependencies for webpack
2026-01-23 16:23:14 +01:00
Gaetan Craig-Riou
9af57e1fc4 Remove deprecated config options 2026-01-23 16:23:14 +01:00
Gaetan Craig-Riou
a0c23825b8 Top level dir is not stripped anymore for static assets 2026-01-23 16:23:14 +01:00
Gaetan Craig-Riou
4e5238d1bb Update dependencies 2026-01-23 16:23:14 +01:00
Gaetan Craig-Riou
26b8f62325 Fix wepack config, move to generateWebpackConfig 2026-01-23 16:23:14 +01:00
Gaetan Craig-Riou
ee087f9eff Change spelling to Shakapacker 2026-01-23 16:23:14 +01:00
Gaetan Craig-Riou
3152362b9d Upgrade to Shakapacker 7.2.3 2026-01-23 16:23:14 +01:00
Rachel Arnould
601c921b4b Merge pull request #13831 from dacook/affiliate-sales-data
[DFC Anonymized orders endpoint] Fix unit_type for affiliate sales data
2026-01-23 15:59:49 +01:00
Gaetan Craig-Riou
39fbf01e98 Merge pull request #13876 from openfoodfoundation/dependabot/npm_and_yarn/mini-css-extract-plugin-2.10.0
Bump mini-css-extract-plugin from 2.9.4 to 2.10.0
2026-01-23 10:20:46 +11:00
Gaetan Craig-Riou
69586ae5ae Merge pull request #13875 from openfoodfoundation/dependabot/npm_and_yarn/webpack-5.104.1
Bump webpack from 5.104.0 to 5.104.1
2026-01-23 10:19:27 +11:00
Gaetan Craig-Riou
c87eb05c0e Merge pull request #13874 from openfoodfoundation/dependabot/npm_and_yarn/babel/core-7.28.6
Bump @babel/core from 7.28.5 to 7.28.6
2026-01-23 10:18:30 +11:00
Gaetan Craig-Riou
a1f363c53b Merge pull request #13868 from mkllnk/spec-helper
Merge and simplify rspec config
2026-01-23 10:14:53 +11:00
dependabot[bot]
76c6362db0 Bump mini-css-extract-plugin from 2.9.4 to 2.10.0
Bumps [mini-css-extract-plugin](https://github.com/webpack/mini-css-extract-plugin) from 2.9.4 to 2.10.0.
- [Release notes](https://github.com/webpack/mini-css-extract-plugin/releases)
- [Changelog](https://github.com/webpack/mini-css-extract-plugin/blob/main/CHANGELOG.md)
- [Commits](https://github.com/webpack/mini-css-extract-plugin/compare/v2.9.4...v2.10.0)

---
updated-dependencies:
- dependency-name: mini-css-extract-plugin
  dependency-version: 2.10.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-01-22 09:32:58 +00:00
dependabot[bot]
5c3308de36 Bump webpack from 5.104.0 to 5.104.1
Bumps [webpack](https://github.com/webpack/webpack) from 5.104.0 to 5.104.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Changelog](https://github.com/webpack/webpack/blob/main/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack/compare/v5.104.0...v5.104.1)

---
updated-dependencies:
- dependency-name: webpack
  dependency-version: 5.104.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-01-22 09:32:50 +00:00
dependabot[bot]
a82b2c2799 Bump @babel/core from 7.28.5 to 7.28.6
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.28.5 to 7.28.6.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.28.6/packages/babel-core)

---
updated-dependencies:
- dependency-name: "@babel/core"
  dependency-version: 7.28.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-01-22 09:32:43 +00:00
Maikel
4895010fe0 Merge pull request #13872 from openfoodfoundation/dependabot/npm_and_yarn/lodash-4.17.23
Bump lodash from 4.17.21 to 4.17.23
2026-01-22 14:36:50 +11:00
Maikel
962097f237 Merge pull request #13871 from openfoodfoundation/dependabot/npm_and_yarn/postcss-preset-env-10.6.1
Bump postcss-preset-env from 10.5.0 to 10.6.1
2026-01-22 14:35:59 +11:00
Maikel
941707a0df Merge pull request #13870 from openfoodfoundation/dependabot/npm_and_yarn/sass-embedded-1.97.2
Bump sass-embedded from 1.96.0 to 1.97.2
2026-01-22 14:34:31 +11:00
David Cook
f7e119d06f Merge pull request #13869 from openfoodfoundation/dependabot/npm_and_yarn/cross-spawn-7.0.6
Bump cross-spawn from 7.0.3 to 7.0.6
2026-01-22 10:19:18 +11:00
dependabot[bot]
52ee5929cf Bump lodash from 4.17.21 to 4.17.23
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.21 to 4.17.23.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.21...4.17.23)

---
updated-dependencies:
- dependency-name: lodash
  dependency-version: 4.17.23
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-01-21 23:05:03 +00:00
dependabot[bot]
1e58882217 Bump postcss-preset-env from 10.5.0 to 10.6.1
Bumps [postcss-preset-env](https://github.com/csstools/postcss-plugins/tree/HEAD/plugin-packs/postcss-preset-env) from 10.5.0 to 10.6.1.
- [Changelog](https://github.com/csstools/postcss-plugins/blob/main/plugin-packs/postcss-preset-env/CHANGELOG.md)
- [Commits](https://github.com/csstools/postcss-plugins/commits/HEAD/plugin-packs/postcss-preset-env)

---
updated-dependencies:
- dependency-name: postcss-preset-env
  dependency-version: 10.6.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-01-21 09:32:46 +00:00
dependabot[bot]
ca23f12451 Bump sass-embedded from 1.96.0 to 1.97.2
Bumps [sass-embedded](https://github.com/sass/embedded-host-node) from 1.96.0 to 1.97.2.
- [Changelog](https://github.com/sass/embedded-host-node/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/embedded-host-node/compare/1.96.0...1.97.2)

---
updated-dependencies:
- dependency-name: sass-embedded
  dependency-version: 1.97.2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-01-21 09:32:39 +00:00
David Cook
cce37aa915 Add explanation for magic number 2026-01-21 17:09:33 +11:00
dependabot[bot]
f808fe9685 Bump cross-spawn from 7.0.3 to 7.0.6
Bumps [cross-spawn](https://github.com/moxystudio/node-cross-spawn) from 7.0.3 to 7.0.6.
- [Changelog](https://github.com/moxystudio/node-cross-spawn/blob/master/CHANGELOG.md)
- [Commits](https://github.com/moxystudio/node-cross-spawn/compare/v7.0.3...v7.0.6)

---
updated-dependencies:
- dependency-name: cross-spawn
  dependency-version: 7.0.6
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-01-21 05:18:48 +00:00
Gaetan Craig-Riou
dd5db396b4 Merge pull request #13828 from rioug/10298-upgrade-to-shakapaker
Upgrade to shakapaker
2026-01-21 16:17:50 +11:00
David Cook
e121a799ed Refer to unit from variant
variant_unit was moved to variant as part of product refactor.
Old products probably still had a value there, but new ones would have been appearing with nil.
2026-01-21 16:10:30 +11:00
David Cook
5dfef4a3ae Add specs for data, with product and variant grouping
Oh and by the way, we missed something in the product refactor.
2026-01-21 16:10:30 +11:00
David Cook
8236603f76 Add ability to specify variant for order
I will need this in the following commit. For existing specs where no variant is specified, a product with variant will be created (I think this is what the line item factory would have done before).
2026-01-21 16:10:30 +11:00
Gaetan Craig-Riou
315d52961a Add "v1" to locale cache key
This is to invalidate existing locale cache key, so it will pick up
image path changes in cached fragment with locale
2026-01-21 14:29:46 +11:00
Maikel Linke
dcb6f4676d Remove all unnecessary spec_helper require statements
The `.rspec` file is doing this for us.
2026-01-21 12:35:34 +11:00
Maikel Linke
3455ceb722 Use standard spec_helper filename 2026-01-21 12:09:12 +11:00
Maikel Linke
7361b2da0b Move related rspec config to one place 2026-01-21 12:09:12 +11:00
Maikel Linke
3ebacbc31a Move require statement to the right file 2026-01-21 12:09:11 +11:00
David Cook
c0bcf177e7 Merge pull request #13861 from mkllnk/bump-ruby
Bump Ruby from 3.3.10 to 3.4.8
2026-01-20 16:34:31 +11:00
David Cook
8dfede11c6 Merge pull request #13862 from mkllnk/allow_checkout_on_gateway_error
Remove unused switch to allow checkout on failures
2026-01-20 12:25:03 +11:00
Maikel Linke
bac123f223 Remove unused switch to allow checkout on failures
The inherited payment logic is complicated enough. Removing this dead
code makes it slightly simpler.
2026-01-19 14:35:54 +11:00
Maikel Linke
fdc775ae6d Style arguments forwarding 2026-01-19 10:55:24 +11:00
Maikel Linke
26b39d6626 Add convenience script to bump ruby version 2026-01-19 10:40:01 +11:00
Maikel Linke
8953e8481d Remove unnecessary bundler install script
Bundler does the same already.
2026-01-19 10:40:01 +11:00
Maikel Linke
1ce76a3166 Bump Ruby from 3.3.10p183 to 3.4.8p72 2026-01-19 10:34:34 +11:00
Maikel Linke
1c703905fe Remove now redundant install of bundler 2026-01-19 10:34:34 +11:00