v5.0.0 Release (#335)

* v5.0.0-beta.0 – Initial v5 work to move all styles into optional mixins (#316)

* v5.0.0-beta.0 – Initial v5 work to move all styles into optional mixins

* v5.0.0-beta.0 – Fixing initial changes after testing importing the legacy styles

* v5.0.0-beta.1 - Updating eyeglass version (#318)

* v5.0.0-beta.2 - Updating dependencies (#319)

* v5.0.0-beta.3 - Add loading indicator component (#322)

* Add optional loading indicator component

* Prevent Prettier ruining files

* Added line breaks back to file after format

* Added change to changelog

* v5.0.0-beta.4 – Updating colours to use new pie-design-tokens variable equivalents (#323)

* v5.0.0-beta.5 - Import typography design tokens into Fozzie (#324)

* v5.0.0-beta.5 - Version bump

* v5.0.0-beta.6 - more color vars transition + link styles changes (#326)

* v5.0.0-beta.6 - more color vars transitioned + o-link styles changes

* v5.0.0-beta.6 - code style

Co-authored-by: Maryia Radchuk <maryia.radchuk@just-eat.com>

* v5.0.0-beta.7 - more color vars transitioned from fozzie-color-pallete vars to pie-design-tokens (#327)

Co-authored-by: Maryia Radchuk <maryia.radchuk@just-eat.com>

* v5.0.0-beta.8 - Adding a mixin in loading-indicator to be able to customise the colours of the spinner. (#328)

* v5.0.0 - Extending the loadingIndicator mixin to specify colours.

* v5.0.0-beta.8 - Adding mixin to be able to customise the colours of the spinner of the loading indicator.

Co-authored-by: Sacha Zvetelman <sacha.zvetelman@justeattakeaway.com>

* v5.0.0-beta.9 - aliases instead of global vars + missed vars update (#329)

* v5.0.0-beta.10 - pie-design-token package update (#332)

* v5.0.0 – Release v5

Co-authored-by: Charlie Waite <cw5790@gmail.com>
Co-authored-by: Anastasiya <tyshkavets@gmail.com>
Co-authored-by: Anastasiya Tyshkavets <a.tyshkavets@justeattakeaway.com>
Co-authored-by: Mariya Radchuk <radchuk.mary@gmail.com>
Co-authored-by: Maryia Radchuk <maryia.radchuk@just-eat.com>
Co-authored-by: Sacha <sacha.zvetelman@just-eat.com>
Co-authored-by: Sacha Zvetelman <sacha.zvetelman@justeattakeaway.com>

CHANGELOG.md

@@ -3,6 +3,183 @@
 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)
 
+Future Todo List
+------------------------------
+- Make typography and utility classes silent extenders (so that they can be extended by components without importing all utility classes).
+
+
+v5.0.0
+------------------------------
+*August 23, 2021*
+
+## Main changes:
+- Colour and typography variables updated to use `pie-design-tokens` repo instead of `fozzie-colour-palette`.
+- When importing v5 fozzie, consuming applications only get included variables, functions and mixins (no classes). Component styles for buttons, form-fields etc are being deprecated as we move our components over to versionable packages, but can still be included via optional mixins applications that still need this as part of the transition.
+- Two optional variables can be used to include a base set of styles (similar to v4). These are `$includeBaseFramework` and `$includeMinimalFramework`. Check out the `_templates.scss` file to see what styles are included when these are set to true.
+
+### Changed
+- Eyeglass version bumped to v3.
+- Made all styles and components optional (wrapped in a mixin).
+- Lots of colour variables moved over as part of using the new `pie-design-tokens` repo instead of `fozzie-colour-palette`.
+- Updated type-map with new typography variables for font-size and line-height.
+
+### Removed
+- `/settings/glyphs` moved into badges, as it is the only place it is used.
+- `/images` as not used.
+- `kickoff-grid` dependency brought into fozzie, to remove external dependency (making it easier to change if needed).
+- `$font-weight-bold` was removed as it now comes straight from `pie-design-tokens`.
+
+
+** Full list of changes (including all colour variable changes) can be found below in beta release CHANGELOGs **
+
+
+v5.0.0-beta.10
+------------------------------
+*July 8, 2021*
+
+### Changed
+- pie-design-tokens package
+
+
+v5.0.0-beta.9
+------------------------------
+*June 30, 2021*
+
+### Changed
+
+- More colour variables transitioned:
+  - `$color-headings--highlight` > `$color-content-brand`
+  - `$color-bg--accept` > `$color-support-positive-02`
+  - `$color-bg--notification` > `$color-support-warning-02`
+  - `$color-bg--error` > `$color-support-error-02`
+  - `$color-disabled` > `$color-disabled-01`
+  - `$color-bg--component` > `$color-container-default`
+- Changed some global tokens to aliases
+
+
+v5.0.0-beta.8
+------------------------------
+*June 4, 2021*
+
+### Added
+- Mixin in `loading-indicator` to be able to customise the colours of the spinner.
+
+
+v5.0.0-beta.7
+------------------------------
+*April 29, 2021*
+
+### Changed
+- More colour variables transitioned:
+  - `$color-secondary` > `$color-blue`
+  - `$color-text--hint` > `$color-grey-40`
+  - `$color-text--success` > `$color-content-positive`
+  - `$color-text--danger` > `$color-content-error`
+  - `$color-text--warning` > `$color-content-brand-strong`
+  - `$color-focus-outline` > `$color-focus`
+- Updated `f-utils` to v2.0.0
+
+
+v5.0.0-beta.6
+------------------------------
+*March 31, 2021*
+
+### Changed
+- Underlined hover and focus state for `.o-link--noDecoration`.
+- More colour variables transitioned:
+  - `$color-bg` > `$color-background-default`
+  - `$color-text` > `$color-content-default`
+  - `$color-headings` > `$color-content-default`
+  - `$color-link-default` > `$color-content-link`
+  - `$color-border` > `$color-border-strong`
+  - `$color-link-hover` > `$color-content-link` & darken(4%)
+  - `$color-link-active` > `$color-content-link` & darken(6%)
+
+
+v5.0.0-beta.5
+------------------------------
+*March 23, 2021*
+
+### Changed
+- Updated type-map with new typography variables for font-size and line-height.
+- `$font-weight-bold` was removed as it now comes straight from pie-design-tokens
+- Typography variables transitioned:
+  - `$font-weight-base` > `$font-weight-regular`
+
+
+v5.0.0-beta.4
+------------------------------
+*March 5, 2021*
+
+### Changed
+- Moved from using `fozzie-colour-palette` to `pie-design-tokens`.
+- Colour variables transitioned:
+  - `$black` > `$color-black`
+  - `$white` > `$color-white`
+  - `$grey--light` > `$color-grey-30`
+  - `$brand--orange` > `$color-orange-30`
+  - `$orange` > `$color-orange`
+  - `$orange-dark` > `$color-orange` & darken(4%)
+  - `$orange-darkest` > `$color-orange` & darken(10%)
+  - `$orange--aa` > `$color-orange-60`
+  - `$orange--offWhite` > `$color-orange-10`
+  - `$blue` > `$color-blue`
+  - `$blue--offWhite` > `$color-blue-10`
+  - `$blue--offWhite--dark`> `$color-blue-10` & darken(4%)
+  - `$blue--offWhite--darkest`> `$color-blue-10` & darken(10%)
+  - `$red` > `$color-red`
+  - `$green` > `$color-green`
+  - `$green--offWhite` > `$color-green-10`
+  - `$yellow--offWhite` > `$color-yellow-10`
+  - `$grey--offWhite` > `$color-grey-10`
+  - `$grey--lighter` > `$color-grey-20`
+  - `$grey--mid` > `$color-grey-40`
+  - `$grey--dark` > `$color-grey-50`
+  - `$grey--darkest` > `$color-grey`
+  - `$purple` > `$color-purple`
+  - `$purple--light` > `color-purple-10`
+
+
+v5.0.0-beta.3
+------------------------------
+*February 16, 2021*
+
+### Added
+- Loading indicator which was in version 4 with an optional size
+
+
+v5.0.0-beta.2
+------------------------------
+*December 31, 2020*
+
+### Changed
+- Updated versions of `f-utils` and `fozzie-colour-palette` and other minor deps.
+
+
+v5.0.0-beta.1
+------------------------------
+*December 31, 2020*
+
+### Changed
+- Eyeglass version bumped to v3.
+
+
+v5.0.0-beta.0
+------------------------------
+*November 3, 2020*
+
+### Added
+- Base template includes for legacy consuming applications (PoC – needs testing).
+
+### Changed
+- Made all styles and components optional (wrapped in a mixin).
+
+### Removed
+- `/settings/glyphs` moved into badges, as it is the only place it is used.
+- `/images` as not used.
+- `kickoff-grid` dependency brought into fozzie, to remove external dependency (making it easier to change if needed).
+
+
 v4.5.2
 ------------------------------
 *July 7, 2021*

jest.config.js

@@ -14,5 +14,8 @@ module.exports = {
         '**/*.{spec,test}.(js|jsx|ts|tsx)',
         '**/__tests__/*.(js|jsx|ts|tsx)'
     ],
+    testPathIgnorePatterns: [
+        '/.yalc/'
+    ],
     testURL: 'http://localhost/'
 };

package.json

@@ -2,7 +2,7 @@
   "name": "@justeat/fozzie",
   "title": "Fozzie – Just Eat UI Web Framework",
   "description": "UI Web Framework for the Just Eat Global Platform",
-  "version": "4.5.2",
+  "version": "5.0.0",
   "main": "dist/js/index.js",
   "files": [
     "dist/js",
@@ -35,20 +35,19 @@
   "dependencies": {
     "@justeat/f-dom": "1.1.0",
     "@justeat/f-logger": "0.8.1",
-    "@justeat/f-utils": "1.1.0",
-    "@justeat/fozzie-colour-palette": "3.1.0",
+    "@justeat/f-utils": "2.0.0",
+    "@justeat/pie-design-tokens": "0.19.0",
     "fontfaceobserver": "2.1.0",
-    "include-media": "1.4.9",
-    "kickoff-grid.css": "1.2.0",
+    "include-media": "1.4.10",
     "normalize-scss": "7.0.1"
   },
   "devDependencies": {
     "@justeat/browserslist-config-fozzie": "1.2.0",
     "@justeat/gulp-build-fozzie": "10.2.1",
     "@justeat/js-test-buddy": "0.4.1",
-    "concurrently": "5.3.0",
-    "coveralls": "3.1.0",
-    "danger": "10.6.0"
+    "concurrently": "6.2.1",
+    "coveralls": "3.1.1",
+    "danger": "10.6.6"
   },
   "resolutions": {
     "babel-core": "7.0.0-bridge.0"
@@ -60,7 +59,7 @@
   "eyeglass": {
     "name": "fozzie",
     "sassDir": "src/scss",
-    "needs": "^1.1.2",
+    "needs": "^3.0.2",
     "exports": false
   },
   "scripts": {

src/scss/_dependencies.scss

@@ -30,10 +30,9 @@
 // =================================
 // The colour variables are imported from https://www.npmjs.com/package/@justeat/fozzie-colour-palette
 // If a custom theme is specified, it applies a set of colour overides to the base theme depending on the $theme
-@import 'fozzie-colour-palette';
+@import 'pie-design-tokens';
 
 @import 'settings/variables';
-@import 'settings/glyphs';
 @import 'f-utils/helpers/breakpoints'; // breakpoint helper – https://github.com/justeat/f-utils/blob/96508ae19809c4b8b83cebb55b9d74728d01c1a5/src/scss/helpers/_breakpoints.scss
 
 
@@ -44,7 +43,7 @@
 // Global typography styles
 @import 'base/typography';
 
-@import 'kickoff-grid'; // Grid system based on flexbox w float fallbacks – https://github.com/TryKickoff/kickoff-grid.css
+@import 'base/grid'; // Grid system based on flexbox w float fallbacks – https://github.com/TryKickoff/kickoff-grid.css
 
 /**
  * Objects
@@ -60,7 +59,6 @@
  */
 @import 'objects/body';
 @import 'objects/buttons';
-@import 'objects/images';
 @import 'objects/links';
 @import 'objects/lists';
 @import 'objects/tables';
@@ -89,6 +87,7 @@
 @import 'components/optional/fullscreen-pop-over';
 @import 'components/optional/listings';
 @import 'components/optional/listings-skeleton';
+@import 'components/optional/loading-indicator';
 @import 'components/optional/menu';
 @import 'components/optional/modal';
 @import 'components/optional/order-card';
@@ -123,8 +122,13 @@
 @import 'trumps/rwd';
 
 
-
 /**
  * Print styles
  */
 @import 'base/print';
+
+
+/**
+ * Templates for including base sets of styles
+ */
+@import 'templates';

src/scss/_templates.scss

@@ -0,0 +1,60 @@
+/**
+ * Setting $includeBaseFramework to `true` includes the base styles that were included
+ * as part of Fozzie v4 (useful for anyone upgrading that wants to keep things as-is)
+**/
+@if $includeBaseFramework {
+    @include reset();
+    @include typography();
+
+    @include grid();
+
+    // base objects
+    @include bodyStyles();
+    @include buttons();
+    @include links();
+    @include lists();
+    @include tables();
+    @include formControls();
+    @include formToggle();
+
+    // base components
+    @include alerts();
+    @include breadcrumbs();
+    @include cards();
+    @include mediaElement();
+
+    // layout
+    @include layout();
+
+    // trumps
+    @include trumps-utilities();
+    @include trumps-rwd();
+
+    @include print();
+}
+
+/**
+ * Setting $includeMinimalFramework to `true` includes a recommended base set of styles
+ * that provides styling for most use-cases (links, lists, buttons, grid)
+ **/
+@if $includeMinimalFramework {
+    @include reset();
+    @include typography();
+
+    @include grid();
+
+    // base objects
+    @include bodyStyles();
+    @include buttons();
+    @include links();
+    @include lists();
+
+    // layout
+    @include layout();
+
+    // trumps
+    @include trumps-utilities();
+    @include trumps-rwd();
+
+    @include print();
+}