Skip to content

Commit

Permalink
Merge branch 'releases/2.0.0' into feat/logical-css-props
Browse files Browse the repository at this point in the history
  • Loading branch information
madhurisandbhor committed Apr 15, 2024
2 parents be41c57 + 1f23552 commit fee047c
Show file tree
Hide file tree
Showing 58 changed files with 4,987 additions and 6,083 deletions.
4 changes: 2 additions & 2 deletions .changeset/config.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"$schema": "https://unpkg.com/@changesets/config@2.3.1/schema.json",
"commit": false,
"changelog": false,
"changelog": ["@changesets/changelog-github", { "repo": "strapi/design-system" }],
"access": "public",
"baseBranch": "main",
"baseBranch": "develop",
"fixed": [["@strapi/*"]],
"ignore": ["@strapi/design-system-docs"],
"___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
Expand Down
11 changes: 11 additions & 0 deletions .changeset/pre.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"mode": "pre",
"tag": "beta",
"initialVersions": {
"@strapi/design-system-docs": "1.6.5",
"@strapi/ui-primitives": "1.17.0",
"@strapi/design-system": "1.17.0",
"@strapi/icons": "1.17.0"
},
"changesets": []
}
12 changes: 1 addition & 11 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,14 +1,4 @@
{
"extends": ["@strapi/eslint-config/front/typescript"],
"parserOptions": {
"project": ["./tsconfig.json"]
},
"settings": {
"import/resolver": {
"typescript": {
"project": "./tsconfig.json"
}
}
},
"ignorePatterns": ["./packages/**"]
"ignorePatterns": ["./packages/**"],
}
23 changes: 0 additions & 23 deletions .github/ISSUE_TEMPLATE/rfc.yml

This file was deleted.

77 changes: 0 additions & 77 deletions .github/dependabot.yml

This file was deleted.

25 changes: 16 additions & 9 deletions .github/workflows/bundle-size.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,30 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- name: Checkout repo
uses: actions/checkout@v4
with:
fetch-depth: 0

- uses: actions/setup-node@v4
- name: Setup node
uses: actions/setup-node@v4
with:
node-version: 18
cache: yarn
node-version-file: '.nvmrc'
cache: 'yarn'

- uses: actions/cache@v3
- name: 'Restore cache'
uses: actions/cache@v4
with:
path: '**/node_modules'
key: ${{ runner.os }}-${{ matrix.node }}-${{ hashFiles('**/yarn.lock') }}
key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}

- run: yarn install
- name: Install deps
run: yarn install

- name: Build packages
- name: Build
run: yarn build --filter=\!@strapi/design-system-docs

- uses: preactjs/compressed-size-action@v2
- name: Calculate size
uses: preactjs/compressed-size-action@v2
with:
pattern: '**/dist/**/*.{cjs,js,mjs,svg}'
39 changes: 32 additions & 7 deletions .github/workflows/experimental.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@ name: 'Experimental Releases'

on:
workflow_dispatch:
inputs:
branch:
required: true

concurrency: ${{ github.workflow }}-${{ github.ref }}

permissions:
contents: read # to fetch code (actions/checkout)
Expand All @@ -12,14 +17,34 @@ jobs:
runs-on: ubuntu-latest
if: github.repository == 'strapi/design-system'
steps:
- uses: actions/checkout@v4
- name: Setup npmrc
run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > .npmrc
- uses: actions/setup-node@v4
- name: Checkout repo
uses: actions/checkout@v4
with:
node-version: 16
- run: yarn
- run: yarn build --ignore="@strapi/design-system-docs"
fetch-depth: 0

- name: Setup npm auth
run: |
echo "registry=https://registry.npmjs.org" >> ~/.npmrc
echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ~/.npmrc
- name: Setup node
uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
cache: 'yarn'

- name: 'Restore cache'
uses: actions/cache@v4
with:
path: '**/node_modules'
key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}

- name: Install deps
run: yarn install

- name: Build
run: yarn build --filter=\!@strapi/design-system-docs

- run: ./scripts/pre-publish.sh --yes
env:
VERSION: '0.0.0-${{ github.sha }}'
Expand Down

0 comments on commit fee047c

Please sign in to comment.