Skip to content

Commit

Permalink
Merge branch 'main' of github.com:MetaMask/design-tokens into fix/581…
Browse files Browse the repository at this point in the history
…/brand-colors-css-in-js
  • Loading branch information
georgewrmarshall committed Jan 17, 2024
2 parents a9038d2 + a035c35 commit a7d5c11
Show file tree
Hide file tree
Showing 7 changed files with 4,596 additions and 5,231 deletions.
18 changes: 18 additions & 0 deletions .babelrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"sourceType": "unambiguous",
"presets": [
[
"@babel/preset-env",
{
"targets": {
"chrome": 100,
"safari": 15,
"firefox": 91
}
}
],
"@babel/preset-typescript",
"@babel/preset-react"
],
"plugins": []
}
2 changes: 1 addition & 1 deletion .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
node-version: 16.x
node-version: [16.x]
steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
Expand Down
29 changes: 0 additions & 29 deletions .github/workflows/require-additional-reviewer.yml

This file was deleted.

9 changes: 8 additions & 1 deletion .storybook/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ module.exports = {
'@storybook/addon-essentials',
'@storybook/preset-scss',
'@storybook/addon-a11y',
'@storybook/addon-mdx-gfm',
],
framework: '@storybook/react',
framework: {
name: '@storybook/react-webpack5',
options: {},
},
docs: {
autodocs: true,
},
};
4 changes: 2 additions & 2 deletions docs/Introduction.stories.mdx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Meta, Description } from '@storybook/addon-docs';
import { Meta, Markdown } from '@storybook/addon-docs';

import README from '../README.md';

<Meta title="Getting Started/Introduction" />

<Description markdown={README} />
<Markdown>{README}</Markdown>
29 changes: 19 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,33 +23,38 @@
],
"scripts": {
"build": "tsc --project .",
"build-storybook": "build-storybook",
"build-storybook": "storybook build",
"build:clean": "rimraf dist && yarn build",
"lint": "yarn lint:eslint && yarn lint:misc --check",
"lint:eslint": "eslint . --cache --ext js,ts",
"lint:fix": "yarn lint:eslint --fix && yarn lint:misc --write",
"lint:misc": "prettier '**/*.json' '**/*.md' '!CHANGELOG.md' '**/*.yml' --ignore-path .gitignore",
"prepublishOnly": "yarn build:clean && yarn lint && yarn test",
"setup": "yarn install && yarn allow-scripts",
"storybook": "start-storybook -p 6006",
"storybook": "storybook dev -p 6006",
"test": "jest",
"test:watch": "jest --watch"
},
"dependencies": {},
"devDependencies": {
"@babel/core": "^7.17.0",
"@babel/preset-env": "^7.23.2",
"@babel/preset-react": "^7.22.15",
"@babel/preset-typescript": "^7.23.2",
"@lavamoat/allow-scripts": "^1.0.5",
"@metamask/auto-changelog": "^3.1.0",
"@metamask/eslint-config": "^9.0.0",
"@metamask/eslint-config-jest": "^9.0.0",
"@metamask/eslint-config-nodejs": "^9.0.0",
"@metamask/eslint-config-typescript": "^9.0.1",
"@storybook/addon-a11y": "^6.5.13",
"@storybook/addon-actions": "^6.5.13",
"@storybook/addon-essentials": "^6.5.13",
"@storybook/addon-links": "^6.5.13",
"@storybook/addon-a11y": "^7.5.0",
"@storybook/addon-actions": "^7.5.0",
"@storybook/addon-essentials": "^7.5.0",
"@storybook/addon-links": "^7.5.0",
"@storybook/addon-mdx-gfm": "^7.5.0",
"@storybook/preset-scss": "^1.0.3",
"@storybook/react": "^6.5.13",
"@storybook/react": "^7.5.0",
"@storybook/react-webpack5": "^7.5.0",
"@types/jest": "^26.0.13",
"@typescript-eslint/eslint-plugin": "^4.21.0",
"@typescript-eslint/parser": "^4.21.0",
Expand All @@ -63,7 +68,7 @@
"eslint-plugin-jsdoc": "^36.1.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^3.3.1",
"eslint-plugin-storybook": "^0.6.7",
"eslint-plugin-storybook": "^0.6.15",
"jest": "^26.4.2",
"node-fetch": "^2.6.0",
"prettier": "^2.2.1",
Expand All @@ -73,9 +78,11 @@
"rimraf": "^3.0.2",
"sass": "^1.54.3",
"sass-loader": "10.1.1",
"storybook": "^7.5.0",
"style-loader": "2.0.0",
"ts-jest": "^26.3.0",
"typescript": "^4.2.4"
"typescript": "^4.2.4",
"webpack": "5"
},
"engines": {
"node": "^16.20.0"
Expand All @@ -89,7 +96,9 @@
"@lavamoat/preinstall-always-fail": false,
"core-js": false,
"fsevents": false,
"core-js-pure": false
"core-js-pure": false,
"esbuild": false,
"@swc/core": false
}
}
}
Loading

0 comments on commit a7d5c11

Please sign in to comment.