Skip to content

Commit

Permalink
Merge branch 'master' into f-self-exclusion-period-expired
Browse files Browse the repository at this point in the history
# Conflicts:
#	packages/components/pages/f-self-exclusion/CHANGELOG.md
#	packages/components/pages/f-self-exclusion/package.json
  • Loading branch information
xander-marjoram committed May 8, 2024
2 parents 8a668b2 + 128ec75 commit a3e0d4e
Show file tree
Hide file tree
Showing 110 changed files with 1,896 additions and 2,593 deletions.
37 changes: 37 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,43 @@
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## v7.57.0

_April 30, 2024_

### Changed

- Updated babel dependencies.

### Removed

- Babel plugin proposals which are now included in preset-env:
- `plugin-proposal-class-properties`
- `plugin-proposal-optional-chaining`


## v7.56.2

_April 29, 2024_

### Changed

- Bump `@vue/cli-service` from v4.5.16 to v4.5.19.
- Bump `@vue/cli-plugin-babel` from v5.0.0 to v5.0.8
- Bump `@vue/babel-preset-app` from v5.0.0 to v5.0.8
- Bump `@vue/cli-plugin-unit-jest` from v5.0.0 to v5.0.8


## v7.56.1

_April 26, 2024_

### Changed

- Assorted security package updates.
- Update `chromedriver` to v124


## v7.56.0

_April 10, 2024_
Expand Down
7 changes: 1 addition & 6 deletions babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@ module.exports = api => {
// Use isTest to determine what presets and plugins to use with jest
const isTest = api.env('test');
const presets = [];
const plugins = [
'@babel/plugin-proposal-optional-chaining',
'@babel/plugin-proposal-class-properties'
];
const builtIns = (api.env('development') ? 'entry' : false);

if (!isTest) {
Expand All @@ -18,7 +14,6 @@ module.exports = api => {
}

return {
presets,
plugins
presets
};
};
30 changes: 14 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "root",
"version": "7.56.0",
"version": "7.57.0",
"private": true,
"scripts": {
"build": "NODE_OPTIONS=--openssl-legacy-provider cross-env-shell turbo run build --continue --token=${TURBO_TOKEN}",
Expand Down Expand Up @@ -54,14 +54,12 @@
"typesafe-i18n": "5.16.3"
},
"devDependencies": {
"@babel/cli": "7.14.8",
"@babel/core": "7.14.8",
"@babel/eslint-parser": "7.16.5",
"@babel/plugin-proposal-class-properties": "7.14.5",
"@babel/plugin-proposal-optional-chaining": "7.14.5",
"@babel/plugin-transform-runtime": "7.14.5",
"@babel/preset-env": "7.14.9",
"@babel/register": "7.14.5",
"@babel/cli": "7.24.5",
"@babel/core": "7.24.5",
"@babel/eslint-parser": "7.24.5",
"@babel/plugin-transform-runtime": "7.24.3",
"@babel/preset-env": "7.24.5",
"@babel/register": "7.23.7",
"@faker-js/faker": "7.5.0",
"@justeat/browserslist-config-fozzie": "1.2.0",
"@justeat/eslint-config-fozzie": "5.4.0",
Expand All @@ -71,10 +69,10 @@
"@percy/cli": "1.0.5",
"@percy/webdriverio": "2.0.1",
"@vercel/ncc": "0.31.1",
"@vue/babel-preset-app": "5.0.0",
"@vue/cli-plugin-babel": "5.0.0",
"@vue/cli-plugin-unit-jest": "5.0.0",
"@vue/cli-service": "4.5.16",
"@vue/babel-preset-app": "5.0.8",
"@vue/cli-plugin-babel": "5.0.8",
"@vue/cli-plugin-unit-jest": "5.0.8",
"@vue/cli-service": "4.5.19",
"@vue/eslint-config-standard": "4.0.0",
"@vue/test-utils": "1.3.0",
"@wdio/allure-reporter": "7.19.7",
Expand All @@ -85,13 +83,13 @@
"allure-commandline": "2.17.2",
"axe-core": "4.3.5",
"axe-reports": "1.1.11",
"axios": "0.21.4",
"axios": "0.28.1",
"axios-mock-adapter": "1.19.0",
"babel-core": "7.0.0-bridge.0",
"babel-jest": "29.7.0",
"babel-loader": "8.1.0",
"bundlewatch": "0.3.3",
"chromedriver": "122.0.6",
"chromedriver": "124.0.1",
"core-js": "3.36.1",
"cross-env": "7.0.2",
"css-loader": "1.0.1",
Expand Down Expand Up @@ -125,7 +123,7 @@
"stylelint": "16.1.0",
"stylelint-scss": "3.18.0",
"turbo": "1.6.0",
"vite": "2.9.16",
"vite": "2.9.18",
"vue": "2.6.10",
"vue-router": "3.5.2",
"vue-svg-loader": "0.16.0",
Expand Down
6 changes: 1 addition & 5 deletions packages/components/atoms/f-button/babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ module.exports = api => {
// Use `isTest` to determine what presets and plugins to use with jest
const isTest = api.env('test');
const presets = [];
const plugins = [
'@babel/plugin-proposal-optional-chaining' // https://babeljs.io/docs/en/babel-plugin-proposal-optional-chaining
];
const builtIns = (api.env('development') ? 'entry' : false);

if (!isTest) {
Expand All @@ -20,7 +17,6 @@ module.exports = api => {
}

return {
presets,
plugins
presets
};
};
6 changes: 1 addition & 5 deletions packages/components/atoms/f-card/babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ module.exports = api => {
// Use `isTest` to determine what presets and plugins to use with jest
const isTest = api.env('test');
const presets = [];
const plugins = [
'@babel/plugin-proposal-optional-chaining' // https://babeljs.io/docs/en/babel-plugin-proposal-optional-chaining
];
const builtIns = (api.env('development') ? 'entry' : false);

if (!isTest) {
Expand All @@ -16,7 +13,6 @@ module.exports = api => {
}

return {
presets,
plugins
presets
};
};
6 changes: 1 addition & 5 deletions packages/components/atoms/f-error-boundary/babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ module.exports = api => {
// Use `isTest` to determine what presets and plugins to use with jest
const isTest = api.env('test');
const presets = [];
const plugins = [
'@babel/plugin-proposal-optional-chaining' // https://babeljs.io/docs/en/babel-plugin-proposal-optional-chaining
];
const builtIns = (api.env('development') ? 'entry' : false);

if (!isTest) {
Expand All @@ -20,7 +17,6 @@ module.exports = api => {
}

return {
presets,
plugins
presets
};
};
6 changes: 1 addition & 5 deletions packages/components/atoms/f-error-message/babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ module.exports = api => {
// Use `isTest` to determine what presets and plugins to use with jest
const isTest = api.env('test');
const presets = [];
const plugins = [
'@babel/plugin-proposal-optional-chaining' // https://babeljs.io/docs/en/babel-plugin-proposal-optional-chaining
];
const builtIns = (api.env('development') ? 'entry' : false);

if (!isTest) {
Expand All @@ -20,7 +17,6 @@ module.exports = api => {
}

return {
presets,
plugins
presets
};
};
6 changes: 1 addition & 5 deletions packages/components/atoms/f-filter-pill/babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ module.exports = api => {
// Use `isTest` to determine what presets and plugins to use with jest
const isTest = api.env('test');
const presets = [];
const plugins = [
'@babel/plugin-proposal-optional-chaining' // https://babeljs.io/docs/en/babel-plugin-proposal-optional-chaining
];
const builtIns = (api.env('development') ? 'entry' : false);

if (!isTest) {
Expand All @@ -20,7 +17,6 @@ module.exports = api => {
}

return {
presets,
plugins
presets
};
};
9 changes: 9 additions & 0 deletions packages/components/atoms/f-form-field/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,15 @@
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## v6.6.1

_April 29, 2024_

### Changed

- Bump `@vue/cli-plugin-babel` from v5.0.0 to v5.0.8


## v6.6.0

_March 13, 2024_
Expand Down
6 changes: 1 addition & 5 deletions packages/components/atoms/f-form-field/babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ module.exports = api => {
// Use `isTest` to determine what presets and plugins to use with jest
const isTest = api.env('test');
const presets = [];
const plugins = [
'@babel/plugin-proposal-optional-chaining' // https://babeljs.io/docs/en/babel-plugin-proposal-optional-chaining
];
const builtIns = (api.env('development') ? 'entry' : false);

if (!isTest) {
Expand All @@ -17,7 +14,6 @@ module.exports = api => {
}

return {
presets,
plugins
presets
};
};
4 changes: 2 additions & 2 deletions packages/components/atoms/f-form-field/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@justeat/f-form-field",
"description": "Fozzie Form Field - Fozzie Form Field Component",
"version": "6.6.0",
"version": "6.6.1",
"main": "dist/f-form-field.umd.min.js",
"maxBundleSize": "29kB",
"files": [
Expand Down Expand Up @@ -57,7 +57,7 @@
},
"devDependencies": {
"@justeat/f-wdio-utils": "1.x",
"@vue/cli-plugin-babel": "5.0.0",
"@vue/cli-plugin-babel": "5.0.8",
"postcss-assets": "5.0.0"
},
"volta": {
Expand Down
6 changes: 1 addition & 5 deletions packages/components/atoms/f-image-tile/babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ module.exports = api => {
// Use `isTest` to determine what presets and plugins to use with jest
const isTest = api.env('test');
const presets = [];
const plugins = [
'@babel/plugin-proposal-optional-chaining' // https://babeljs.io/docs/en/babel-plugin-proposal-optional-chaining
];
const builtIns = (api.env('development') ? 'entry' : false);

if (!isTest) {
Expand All @@ -20,7 +17,6 @@ module.exports = api => {
}

return {
presets,
plugins
presets
};
};
6 changes: 1 addition & 5 deletions packages/components/atoms/f-link/babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ module.exports = api => {
// Use `isTest` to determine what presets and plugins to use with jest
const isTest = api.env('test');
const presets = [];
const plugins = [
'@babel/plugin-proposal-optional-chaining' // https://babeljs.io/docs/en/babel-plugin-proposal-optional-chaining
];
const builtIns = (api.env('development') ? 'entry' : false);

if (!isTest) {
Expand All @@ -20,7 +17,6 @@ module.exports = api => {
}

return {
presets,
plugins
presets
};
};
6 changes: 1 addition & 5 deletions packages/components/atoms/f-popover/babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ module.exports = api => {
// Use `isTest` to determine what presets and plugins to use with jest
const isTest = api.env('test');
const presets = [];
const plugins = [
'@babel/plugin-proposal-optional-chaining' // https://babeljs.io/docs/en/babel-plugin-proposal-optional-chaining
];
const builtIns = (api.env('development') ? 'entry' : false);

if (!isTest) {
Expand All @@ -20,7 +17,6 @@ module.exports = api => {
}

return {
presets,
plugins
presets
};
};
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ module.exports = api => {
// Use `isTest` to determine what presets and plugins to use with jest
const isTest = api.env('test');
const presets = [];
const plugins = [
'@babel/plugin-proposal-optional-chaining' // https://babeljs.io/docs/en/babel-plugin-proposal-optional-chaining
];
const builtIns = (api.env('development') ? 'entry' : false);

if (!isTest) {
Expand All @@ -20,7 +17,6 @@ module.exports = api => {
}

return {
presets,
plugins
presets
};
};
6 changes: 1 addition & 5 deletions packages/components/atoms/f-spinner/babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ module.exports = api => {
// Use `isTest` to determine what presets and plugins to use with jest
const isTest = api.env('test');
const presets = [];
const plugins = [
'@babel/plugin-proposal-optional-chaining' // https://babeljs.io/docs/en/babel-plugin-proposal-optional-chaining
];
const builtIns = (api.env('development') ? 'entry' : false);

if (!isTest) {
Expand All @@ -20,7 +17,6 @@ module.exports = api => {
}

return {
presets,
plugins
presets
};
};
6 changes: 1 addition & 5 deletions packages/components/atoms/f-toggle-switch/babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ module.exports = api => {
// Use `isTest` to determine what presets and plugins to use with jest
const isTest = api.env('test');
const presets = [];
const plugins = [
'@babel/plugin-proposal-optional-chaining' // https://babeljs.io/docs/en/babel-plugin-proposal-optional-chaining
];
const builtIns = (api.env('development') ? 'entry' : false);

if (!isTest) {
Expand All @@ -20,7 +17,6 @@ module.exports = api => {
}

return {
presets,
plugins
presets
};
};
Loading

0 comments on commit a3e0d4e

Please sign in to comment.