Skip to content
This repository has been archived by the owner on Nov 29, 2022. It is now read-only.

v9.0.0-beta.7 - scss unit tests on publish #377

Merged
merged 6 commits into from
Jul 6, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 45 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# version: 2.1 # use CircleCI 2.1
#
# Check https://circleci.com/docs/2.0/language-javascript/ for more details
#
version: 2.1

workflows:
build-and-test:
jobs:
- build:
context: web-core

jobs:
build:
docker:
# specify the version you desire here
- image: cimg/node:16.15 # For latest available images check – https://circleci.com/docs/2.0/docker-image-tags.json

working_directory: ~/repo

steps: # a collection of executable commands
- checkout # special step to check out source code to working directory
- restore_cache:
name: Restore Yarn Package Cache
keys:
- yarn-packages-{{ checksum "yarn.lock" }}
- run:
name: Install Dependencies
command: yarn install --frozen-lockfile
- save_cache:
name: Save Yarn Package Cache
key: yarn-packages-{{ checksum "yarn.lock" }}
paths:
- ~/.cache/yarn
- run: # Lint JS files
name: Run Lint Task on files
command: yarn lint
- run: # run tests
name: Unit Tests
command: yarn test
- store_artifacts:
path: dist
- run: # run PR checks
name: PR Checks (Dangerfile)
command: yarn danger ci
19 changes: 0 additions & 19 deletions .travis.yml

This file was deleted.

27 changes: 27 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@ Future Todo List
- Deprecate modal and orderCard component styles in next major version as unused.


v9.0.0-beta.7
------------------------------
*July 06, 2022*

### Changed
- `yarn test` command now tests js and scss together with `test:js` and `test:scss` individually being called


v9.0.0-beta.6
------------------------------
*July 01, 2022*
Expand Down Expand Up @@ -72,6 +80,25 @@ v9.0.0-beta.0
- README updated with new usage info. Documentation on vue.pie.design to be updated with full info on migration and usage.


v8.4.0
------------------------------
*July 06, 2022*

### Added
- circleci config file

### Removed
- unused travis config


v8.3.0
------------------------------
*June 17, 2022*

### Added
- `sass:map` to resolve `map-get` error when using `sass` in consuming apps.


v8.2.0
------------------------------
*May 23, 2022*
Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "9.0.0-beta.6",
"version": "9.0.0-beta.7",
"main": "dist/js/index.js",
"files": [
"dist/js",
Expand Down Expand Up @@ -72,7 +72,8 @@
"lint:css": "stylelint src/scss/**/*.scss",
"lint:js": "eslint --ext .js .",
"prepare": "concurrently -n \"lint,compile,test\" -c \"blue,yellow,green\" \"yarn lint\" \"yarn compile\" \"yarn test\" --kill-others-on-fail",
"test": "jest --config=jest.config.js",
"test": "concurrently -n \"test:js,test:scss\" -c \"cyan,magenta\" \"yarn test:js\" \"yarn test:scss\"",
"test:js": "jest --config=jest.config.js",
"test:scss": "jest --config=src/test/scss/jest.config.js",
"test:build": "sass --no-source-map --load-path=node_modules --style=compressed src/scss:dist/css",
"test:cover": "jest --collect-coverage",
Expand Down
1 change: 1 addition & 0 deletions src/scss/tools/functions/_units.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
// Returns a unitless line-height value
//
@use 'sass:math';
@use 'sass:map';

$line-height-base : line-height(); // Lifted out of the variables file to fix circular reference issues

Expand Down