Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🔖 Release [email protected] #3239

Merged
merged 6 commits into from
Jan 26, 2024
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
1 change: 1 addition & 0 deletions assets/icons/system-icons/energy/jacket.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions assets/icons/system-icons/energy/monopile.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1,484 changes: 754 additions & 730 deletions packages/eds-core-react/stories/assets/icons/system-icons.json

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions packages/eds-icons/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [0.21.0] - 2024-01-26

### Added

- `jacket`
- `monopile`

## [0.20.0] - 2023-12-13

### Changed
Expand Down
2 changes: 1 addition & 1 deletion packages/eds-icons/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@equinor/eds-icons",
"version": "0.20.0",
"version": "0.21.0",
"description": "Icons from the Equinor Design System",
"main": "dist/icons.cjs",
"module": "dist/esm/index.js",
Expand Down
18 changes: 18 additions & 0 deletions packages/eds-icons/src/data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4209,6 +4209,24 @@ export const image_add: IconData = {
'M19.5 1.5v3h3v2h-3v2.99s-1.99.01-2 0V6.5h-3s.01-1.99 0-2h3v-3h2Zm-2 19h-14v-14h9v-2h-9c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2v-9h-2v9Zm-7.79-3.17-1.96-2.36L5 18.5h11l-3.54-4.71-2.75 3.54Z',
}

export const monopile: IconData = {
name: 'monopile',
prefix: 'eds',
height: '24',
width: '24',
svgPathData:
'M17 15a2 2 0 0 0-2-2H9a2 2 0 0 0-2 2v4H3v2h4v1h2v-6.5a.5.5 0 0 1 .5-.5h5a.5.5 0 0 1 .5.5V22h2v-1h4v-2h-4v-4ZM14 18h-4v4h4v-4ZM11.5 2A1.5 1.5 0 0 0 10 3.5V7a1 1 0 0 0 1 1h.333L10 10v1h4v-1l-1.333-2H13a1 1 0 0 0 1-1h5a1 1 0 1 0 0-2h-5a1 1 0 0 0-1-1h-1V2h-.5Z',
}

export const jacket: IconData = {
name: 'jacket',
prefix: 'eds',
height: '24',
width: '24',
svgPathData:
'M7.351 4.822A2 2 0 0 1 9.343 3h5.314a2 2 0 0 1 1.992 1.822L17.915 19H21v2H3v-2h3.085L7.351 4.822ZM8.093 19h7.814l-.418-4.679-7.266 3.23L8.093 19ZM14.81 6.713l.427 4.787-5-2.5 4.573-2.287ZM9.343 5h4.42L9.138 7.314 9.343 5Zm-.917 10.272.422-4.73 4.81 2.405-5.232 2.325Z',
}

export const sun: IconData = {
name: 'sun',
prefix: 'eds',
Expand Down
11 changes: 7 additions & 4 deletions scripts/figma-broker/functions/file.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import { deleteAsync } from 'del'
import fetch from 'node-fetch'
import * as R from 'ramda'
import { createFolder } from './folder'
import prettier from 'prettier'
//import prettier from 'prettier'

const prettierConfig = fs.readFileSync('./../../.prettierrc.yaml', 'utf8')
//const prettierConfig = fs.readFileSync('./../../.prettierrc.yaml', 'utf8')
const getFilePath = (path, name, ext) => `${path}/${name}.${ext}`

const write = (file, path, name, ext) => {
Expand Down Expand Up @@ -41,8 +41,11 @@ export const writeFile = (path, name, ext, file) => {
let value = file

if (ext === 'js' || ext === 'ts') {
const options = prettier.resolveConfig.sync(prettierConfig)
value = prettier.format(file, { ...options, parser: 'babel' })
/* prettier "resolveConfig" and "format" was made async in v3
@todo rewrite this and the cascade of other functions using it to async.
In the meantime autoformat packages\eds-icons\src\data.ts with vsCode instead */
//const options = await prettier.resolveConfig(prettierConfig)
//value = await prettier.format(file, { ...options, parser: 'babel' })
}

write(value, path, name, ext)
Expand Down
Loading