Skip to content

Commit

Permalink
Merge branch 'main' into feat/entity_list_selected_style
Browse files Browse the repository at this point in the history
  • Loading branch information
mgueyraud committed Nov 1, 2022
2 parents 3069882 + 72528f9 commit 4c4b111
Show file tree
Hide file tree
Showing 479 changed files with 87,007 additions and 27,863 deletions.
9 changes: 9 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -639,6 +639,15 @@
"contributions": [
"code"
]
},
{
"login": "maxcheremisin",
"name": "Maxim Cheremisin",
"avatar_url": "https://avatars.githubusercontent.com/u/22265863?v=4",
"profile": "http://t.me/maxcheremisin",
"contributions": [
"code"
]
}
],
"contributorsPerLine": 7,
Expand Down
7 changes: 5 additions & 2 deletions .changeset/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@
"$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
"changelog": [
"@changesets/changelog-github",
{ "repo": "contentful/forma-36" }
{
"repo": "contentful/forma-36"
}
],
"ignore": ["@contentful/f36-website"],
"commit": false,
"fixed": [
[
Expand All @@ -15,6 +18,7 @@
"@contentful/f36-card",
"@contentful/f36-collapse",
"@contentful/f36-copybutton",
"@contentful/f36-datepicker",
"@contentful/f36-datetime",
"@contentful/f36-drag-handle",
"@contentful/f36-entity-list",
Expand All @@ -37,7 +41,6 @@
"@contentful/f36-tooltip",
"@contentful/f36-typography",
"@contentful/f36-utils",
"@contentful/f36-workbench",
"@contentful/f36-core",
"@contentful/f36-components"
]
Expand Down
85 changes: 34 additions & 51 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,42 +1,23 @@
version: 2.1

orbs:
docker: circleci/[email protected]

cache-key: &cache-key
key: dependency-cache-primary-{{ arch }}-yarn-packages-{{ checksum ".nvmrc" }}-{{ checksum "yarn.lock" }}

commands:
yarn_install:
steps:
- restore_cache: *cache-key
- run: 'echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" >> ~/.npmrc'
- run: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
- save_cache:
<<: *cache-key
paths:
- ~/.cache/yarn
check-changed-files-or-halt:
parameters:
pattern:
type: string
steps:
- run: git show -m HEAD --name-only --pretty="" | egrep -q '<< parameters.pattern >>' || circleci step halt
docker: circleci/[email protected]
node: circleci/[email protected]

jobs:
build:
docker:
- image: circleci/node:14.15.0-browsers
- image: cimg/node:lts-browsers
resource_class: xlarge
working_directory: ~/circleci-f36-build
steps:
- checkout
- attach_workspace:
at: ~/circleci-f36-build
- yarn_install
- node/install-packages
- run:
name: Build packages
command: yarn build
command: npm run-script build
- persist_to_workspace:
root: .
paths:
Expand All @@ -48,126 +29,128 @@ jobs:

analyze_code:
docker:
- image: circleci/node:14.15.0-browsers
- image: cimg/node:lts
resource_class: xlarge
working_directory: ~/circleci-f36-build
steps:
- checkout
- attach_workspace:
at: ~/circleci-f36-build
- yarn_install
- node/install-packages
- run:
name: Prettier
command: yarn prettier:check
command: npm run-script prettier:check
- run:
name: Lint
command: yarn lint
command: npm run-script lint
- run:
name: Check types
command: yarn tsc
command: npm run-script tsc

test:
docker:
- image: circleci/node:14.15.0-browsers
- image: cimg/node:lts
resource_class: xlarge
working_directory: ~/circleci-f36-build
steps:
- checkout
- attach_workspace:
at: ~/circleci-f36-build
- yarn_install
- node/install-packages
- run:
name: Test
command: yarn test
command: npm run-script test

check-links:
docker:
- image: circleci/node:14.15.0-browsers
- image: cimg/node:lts-browsers
resource_class: xlarge
working_directory: ~/circleci-f36-build
steps:
- checkout
- attach_workspace:
at: ~/circleci-f36-build
- yarn_install
- node/install-packages
- run:
name: Build Next.js website
command: yarn docs:next:build
command: npm run-script docs:next:build
- run:
name: Run production version of the website locally
command: yarn docs:next:start-prod
command: npm run-script docs:next:start-prod
background: true
- run:
name: Wait for localhost:3000 to be ready
command: yarn wait-on http://localhost:3000
command: npx wait-on http://localhost:3000
- run:
name: Run links checker
command: yarn blc http://localhost:3000 -ro --exclude "https://medium.com/contentful-design" --exclude "https://github.com/contentful/forma-36" --exclude "https://www.figma.com/@contentful"
command: npx blc http://localhost:3000 -ro --exclude "https://medium.com/contentful-design" --exclude "https://github.com/contentful/forma-36" --exclude "https://www.figma.com/@contentful"

deploy_chromatic:
docker:
- image: circleci/node:14.15.0-browsers
- image: cimg/node:lts
resource_class: xlarge
working_directory: ~/circleci-f36-build
steps:
- checkout
- attach_workspace:
at: ~/circleci-f36-build
- yarn_install
- node/install-packages
- run:
name: Storybook
command: yarn storybook:build
command: npm run-script storybook:build
- run:
name: Chromatic
command: yarn chromatic
command: npm run-script chromatic

release:
docker:
- image: circleci/node:14.15.0-browsers
- image: cimg/node:lts
working_directory: ~/circleci-f36-build
resource_class: xlarge
steps:
- checkout
- attach_workspace:
at: ~/circleci-f36-build
- yarn_install
- node/install-packages
- add_ssh_keys:
fingerprints:
- '2b:9f:13:79:d8:7b:f5:38:43:8f:3d:a8:7d:53:22:b2'
- run: git config --global user.email ${GITHUB_EMAIL}
- run: git config --global user.name ${GITHUB_USER}
- run:
name: Generate changelogrc
command: yarn changelog:gen
command: npm run-script changelog:gen
- run:
name: Generate packages changelogs
command: yarn changeset version
command: npx changeset version
- run:
name: Publish packages and create releases
command: yarn run changeset:publish
command: |
npm config set //registry.npmjs.org/:_authToken=$NPM_TOKEN
npm run-script changeset:publish
changelog:
docker:
- image: circleci/node:14.15.0-browsers
- image: cimg/node:lts
resource_class: xlarge
working_directory: ~/circleci-f36-build
steps:
- checkout
- attach_workspace:
at: ~/circleci-f36-build
- yarn_install
- node/install-packages
- add_ssh_keys:
fingerprints:
- '2b:9f:13:79:d8:7b:f5:38:43:8f:3d:a8:7d:53:22:b2'
- run: git config --global user.email ${GITHUB_EMAIL}
- run: git config --global user.name ${GITHUB_USER}
- run:
name: Generate changelog files
command: yarn changelog:write
command: npm run-script changelog:write
- run:
name: Commit changelog files
command: |
git add . && yarn run pretty:quick
git add . && npm run-script pretty:quick
git diff --staged --quiet || git commit -am "docs: update changelog on repository and website" && git push origin ${CIRCLE_BRANCH}
workflows:
Expand Down
3 changes: 2 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ esm
*.css.d.ts
public
.cache
tsup.config.ts

# next.js
**/.next/
**/out/
**/out/
10 changes: 7 additions & 3 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,6 @@ module.exports = {
{
files: [
'**/forma-36-react-components/tools/**/*',
'**/forma-36-react-components/**/Icon/svg/*',
'**/forma-36-react-components/**/ProductIcon/**/*',
'**/forma-36-react-components/**/Illustration/**/*',
'**/packages/components/**/*',
'**/packages/**/examples/**',
],
Expand All @@ -125,5 +122,12 @@ module.exports = {
'import/no-extraneous-dependencies': 'off',
},
},
{
// Example files and codemods are allowed to log to console
files: ['**/examples/**', '**/packages/forma-36-codemod/**/*'],
rules: {
'no-console': 'off',
},
},
],
};
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @contentful/team-bauhaus @mshaaban0 @Lelith
* @contentful/team-bauhaus @Lelith @fabe
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/bug-report.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ name: "\U0001F41B Bug Report"
about: Spotted a bug? Add a report to help us improve Forma 36
title: "\U0001F41B Bug - "
labels: bug, needs triage
assignees: m10l, burakukula, mshaaban0, gui-santos, denkristoffer, Lelith
---

<!--
Expand Down
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/component-feedback.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ name: "\U0001F4AC Give feedback on a component"
about: Give us a feedback to help us improve Forma 36
title: "\U0001F4AC Feedback - "
labels: needs triage
assignees: m10l, burakukula, mshaaban0, gui-santos, denkristoffer, Lelith
---

<!--
Expand Down
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/proposal.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ name: "\U0001F4A1 Proposal"
about: Want to extend an existing component or contribute an entirely new one? Send us a proposal
title: "\U0001F4A1 Proposal - "
labels: needs review, needs triage, proposal
assignees: domarku, m10l, burakukula, mshaaban0, gui-santos, denkristoffer, Lelith
---

<!--
Expand Down
23 changes: 23 additions & 0 deletions .github/workflows/remove-stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# This workflow removes the stale label from PRs and issues when a new comment is created
#
name: Remove stale label

on:
issue_comment:
types: [created]

jobs:
remove_stale:
if: contains(github.event.issue.labels.*.name, 'stale')
runs-on: ubuntu-latest
permissions:
issues: write
pull-requests: write

steps:
- name: Remove stale label
run: gh issue edit $ISSUE --remove-label $LABEL
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
ISSUE: ${{ github.event.issue.number }}
LABEL: 'stale'
17 changes: 17 additions & 0 deletions .github/workflows/size-limit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: 'size'

on:
pull_request:
branches:
- main

jobs:
size:
runs-on: ubuntu-latest
env:
CI_JOB_NUMBER: 1
steps:
- uses: actions/checkout@v2
- uses: andresz1/size-limit-action@v1
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
30 changes: 30 additions & 0 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# This workflow warns issues and PRs that have had no activity for a specified amount of time.
#
# You can adjust the behavior by modifying this file.
# For more information, see:
# https://github.com/actions/stale
name: Mark stale issues and pull requests

on:
schedule:
- cron: '30 7 * * *'

jobs:
stale:

runs-on: ubuntu-latest
permissions:
issues: write
pull-requests: write

steps:
- uses: actions/stale@v5
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
days-before-stale: 30
days-before-close: -1
operations-per-run: 300
stale-issue-message: 'Marking issue as stale since there was no activity for 30 days'
stale-pr-message: 'Marking pull request as stale since there was no activity for 30 days'
stale-issue-label: 'stale'
stale-pr-label: 'stale'
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,14 @@
**/npm-debug.log*
**/yarn-debug.log*
**/yarn-error.log*
**/package-lock.json
**/yarn.lock
**/tsconfig.tsbuildinfo

**/.cache
**/.rts2_cache_cjs
**/.rts2_cache_esm
**/.rts2_cache_umd
**/.rts2_cache_system
**/.parcel-cache

# editors
.vscode/
Expand Down
Loading

0 comments on commit 4c4b111

Please sign in to comment.