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

chore(project): create framework subdirectory for web components #303

Merged
merged 33 commits into from
Nov 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
48a840b
chore(framework): move wc components to wc packages dir
kennylam Oct 29, 2024
adc326c
chore(sb): move wc sb to wc dir
kennylam Oct 29, 2024
7b4a12b
chore(framework): move stuff to wc package dir
kennylam Oct 29, 2024
74acc6f
chore(project): update clean script
kennylam Oct 30, 2024
37fdfaf
chore(package): update build script paths
kennylam Nov 5, 2024
5cf4102
chore(project): update build; move examples
kennylam Nov 5, 2024
26b10cf
chore(package): update build paths
kennylam Nov 6, 2024
adbe2fb
chore(deps): update build dist
kennylam Nov 6, 2024
851b70d
chore(package): update build dist
kennylam Nov 7, 2024
0fdca60
chore(wc): update custom elements manifest
kennylam Nov 7, 2024
45be173
chore(build): update gulp tasks
kennylam Nov 10, 2024
d486ec2
chore(build): move build dist to tasks dir
kennylam Nov 10, 2024
ebd7678
chore(build): update build files
kennylam Nov 12, 2024
afde794
chore(build): update build tasks
kennylam Nov 13, 2024
5ce0e0a
Merge branch 'main' of github.com:carbon-design-system/carbon-labs in…
kennylam Nov 13, 2024
d7db584
chore(lint): fix lint errors
kennylam Nov 13, 2024
1c633dd
chore(gh): update workflows
kennylam Nov 13, 2024
963fd49
Merge branch 'chore/add-framework-dirs' of github.com:kennylam/carbon…
kennylam Nov 13, 2024
7abd603
chore(sb): update storybook paths
kennylam Nov 13, 2024
1a36c87
chore(styles): update carbon styles
kennylam Nov 14, 2024
0f232a6
chore(sb): upgrade sb to v8
kennylam Nov 14, 2024
342d55d
chore(package): update package scripts
kennylam Nov 14, 2024
1ebdc46
chore(styles): fix styles
kennylam Nov 14, 2024
3f1c1a7
Merge branch 'chore/add-framework-dirs' of github.com:kennylam/carbon…
kennylam Nov 14, 2024
f570954
chore(storybook): fix story doc file extensions
kennylam Nov 14, 2024
b57d4a9
chore(build): remove unused files
kennylam Nov 14, 2024
211d615
chore(gh): update workflow commands
kennylam Nov 14, 2024
86079ea
chore(build): retrigger builds
kennylam Nov 14, 2024
401b9c0
chore(examples): move to web components subdir
kennylam Nov 14, 2024
7841017
chore: move globals folder into src
annawen1 Nov 14, 2024
48aac13
chore: remove component folder from export path
annawen1 Nov 14, 2024
ec9cceb
chore: correct the pathing to globals folder
annawen1 Nov 15, 2024
f3ffd2e
chore: hide stories for certain components
annawen1 Nov 15, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
run: yarn install
- name: Check formatting of project files (staged)
if: ${{ github.event_name == 'pull_request' }}
run: yarn format:staged
run: yarn format:diff
- name: Check formatting of project files (non-staged)
if: ${{ github.event_name != 'pull_request' }}
run: yarn format
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/publish-canary-cdn.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,12 @@ concurrency:
cancel-in-progress: true

jobs:
build:
web-components:
if: github.repository == 'carbon-design-system/carbon-labs'
runs-on: ubuntu-latest
defaults:
run:
working-directory: 'packages/web-components'
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
Expand All @@ -33,7 +36,7 @@ jobs:
- name: Create one folder with dist contents from each package
run: |
mkdir dist
cp -r packages/*/dist/. dist/
cp -r src/components/**/dist/. dist/
- uses: jakejarvis/s3-sync-action@master
with:
args: --acl public-read --follow-symlinks
Expand All @@ -44,4 +47,4 @@ jobs:
AWS_REGION: ${{ secrets.COMMON_COS_REGION }}
AWS_S3_ENDPOINT: https://${{ secrets.COMMON_COS_ENDPOINT }}
SOURCE_DIR: 'dist'
DEST_DIR: 'common/carbon/labs'
DEST_DIR: 'common/carbon/labs/web-components'
9 changes: 6 additions & 3 deletions .github/workflows/publish-cdn.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,13 @@ concurrency:
cancel-in-progress: true

jobs:
publish-cdn:
web-components:
if: |
github.repository == 'carbon-design-system/carbon-labs'
runs-on: ubuntu-latest
defaults:
run:
working-directory: 'packages/web-components'
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
Expand All @@ -33,7 +36,7 @@ jobs:
- name: Create one folder with dist contents from each package
run: |
mkdir dist
cp -r packages/*/dist/. dist/
cp -r src/components/**/dist/. dist/
- uses: jakejarvis/s3-sync-action@master
with:
args: --acl public-read --follow-symlinks
Expand All @@ -44,4 +47,4 @@ jobs:
AWS_REGION: ${{ secrets.COMMON_COS_REGION }}
AWS_S3_ENDPOINT: https://${{ secrets.COMMON_COS_ENDPOINT }}
SOURCE_DIR: 'dist'
DEST_DIR: 'common/carbon/labs'
DEST_DIR: 'common/carbon/labs/web-components'
7 changes: 5 additions & 2 deletions .github/workflows/storybook-publish-production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,12 @@ on:
types: [deploy-latest-storybook]

jobs:
build:
web-components:
if: github.repository == 'carbon-design-system/carbon-labs'
runs-on: ubuntu-latest
defaults:
run:
working-directory: 'packages/web-components'
steps:
- uses: actions/checkout@v4
- name: Use Node.js 18.x
Expand All @@ -26,7 +29,7 @@ jobs:
run: yarn install

- name: Build storybook
run: yarn build-storybook
run: npx storybook build

- uses: jakejarvis/s3-sync-action@master
with:
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/storybook-publish-staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,12 @@ on:
types: [deploy-staging-storybook]

jobs:
build:
web-components:
if: github.repository == 'carbon-design-system/carbon-labs'
runs-on: ubuntu-latest
defaults:
run:
working-directory: 'packages/web-components'
steps:
- uses: actions/checkout@v4
- name: Use Node.js 18.x
Expand All @@ -26,7 +29,7 @@ jobs:
run: yarn install

- name: Build storybook
run: yarn build-storybook
run: npx storybook build

- uses: jakejarvis/s3-sync-action@master
with:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,13 @@
<meta charset="UTF-8" />
<link
rel="stylesheet"
href="https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/plex.css"
/>
href="https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/plex.css" />
<link
rel="stylesheet"
href="https://1.www.s81c.com/common/carbon/web-components/tag/v2/latest/grid.css"
/>
href="https://1.www.s81c.com/common/carbon/web-components/tag/v2/latest/grid.css" />
<link
rel="stylesheet"
href="https://1.www.s81c.com/common/carbon/web-components/tag/v2/latest/themes.css"
/>
href="https://1.www.s81c.com/common/carbon/web-components/tag/v2/latest/themes.css" />
<style>
/* Suppress custom element until styles are loaded */
clabs-feedback:not(:defined) {
Expand All @@ -31,8 +28,7 @@
</style>
<script
type="module"
src="https://1.www.s81c.com/common/carbon/labs/feedback/v0.3.0/index.min.js"
></script>
src="https://1.www.s81c.com/common/carbon/labs/feedback/v0.3.0/index.min.js"></script>
</head>
<body class="cds-theme-zone-white">
<clabs-feedback model="llama-2"
Expand All @@ -45,12 +41,10 @@
width="24"
height="24"
viewBox="0 0 32 32"
slot="icon"
>
slot="icon">
<!--?lit$372005272$-->
<path
d="M6,30H4V2H28l-5.8,9L28,20H6ZM6,18H24.33L19.8,11l4.53-7H6Z"
></path></svg
d="M6,30H4V2H28l-5.8,9L28,20H6ZM6,18H24.33L19.8,11l4.53-7H6Z"></path></svg
>The standard chunk of Lorem Ipsum used since the 1500s is reproduced
below for those interested. Sections 1.10.32 and 1.10.33 from "de Finibus
Bonorum et Malorum" by Cicero are also reproduced in their exact original
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
<meta charset="UTF-8" />
<link
rel="stylesheet"
href="https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/plex.css"
/>
href="https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/plex.css" />
<link rel="stylesheet" href="src/styles.scss" />
<script type="module" src="src/index.js"></script>
</head>
Expand All @@ -29,11 +28,9 @@
width="24"
height="24"
viewBox="0 0 32 32"
slot="icon"
>
slot="icon">
<path
d="M6,30H4V2H28l-5.8,9L28,20H6ZM6,18H24.33L19.8,11l4.53-7H6Z"
></path></svg
d="M6,30H4V2H28l-5.8,9L28,20H6ZM6,18H24.33L19.8,11l4.53-7H6Z"></path></svg
>The standard chunk of Lorem Ipsum used since the 1500s is reproduced
below for those interested. Sections 1.10.32 and 1.10.33 from "de Finibus
Bonorum et Malorum" by Cicero are also reproduced in their exact original
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"vite": "^3.2.2"
},
"dependencies": {
"@carbon/styles": "^1.53.0",
"@carbon-labs/ai-feedback": "latest"
"@carbon-labs/ai-feedback": "latest",
"@carbon/styles": "^1.69.0"
}
}
Loading
Loading