Skip to content

Commit b50bece

Browse files
author
Rajdeep Chandra
committed
Merge branch 'rajdeep/ipad-scroll-issue' of https://github.com/adobe/spectrum-web-components into rajdeep/ipad-scroll-issue
2 parents 09fac59 + 17825b8 commit b50bece

File tree

5 files changed

+30
-10
lines changed

5 files changed

+30
-10
lines changed

.changeset/three-teeth-joke.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@spectrum-web-components/core': patch
3+
'@spectrum-web-components/base': patch
4+
---
5+
6+
- **Fixed**: Added `typesVersions` to `@spectrum-web-components/core` to improve TypeScript module resolution for users with `moduleResolution: "node"`. This provides a fallback mechanism when the `exports` field resolution encounters issues, ensuring type declarations are properly resolved across different TypeScript configurations.

.circleci/config.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,7 @@ commands:
6565
- run:
6666
name: Build the project
6767
command: |
68-
yarn workspace @spectrum-web-components/core build
69-
yarn workspace @spectrum-web-components/1st-gen build
68+
yarn build
7069
7170
- save_cache:
7271
paths:

.github/workflows/publish-docs-site.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,23 @@ jobs:
2020
uses: ./.github/actions/setup-job
2121

2222
- name: Generate Custom Elements Manifest
23-
run: yarn docs:analyze
23+
run: yarn workspace @spectrum-web-components/1st-gen docs:analyze
2424

2525
- name: Move CEM to Storybook directory
26-
run: cp projects/documentation/custom-elements.json storybook/
26+
run: cp 1st-gen/projects/documentation/custom-elements.json 1st-gen/storybook/
2727

2828
- name: Build documentation
29-
run: yarn docs:production
29+
run: yarn workspace @spectrum-web-components/1st-gen docs:production
3030

3131
- name: Build Storybook
32-
run: yarn storybook:build
32+
run: yarn workspace @spectrum-web-components/1st-gen storybook:build
3333

3434
- name: Add redirects to documentation
35-
run: echo '/* /index.html 200' > projects/documentation/dist/_redirects
35+
run: echo '/* /index.html 200' > 1st-gen/projects/documentation/dist/_redirects
3636

3737
- name: Deploy to GitHub Pages
3838
run: |
3939
git remote set-url origin https://git:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git
40-
yarn gh-pages -d projects/documentation/dist -m "[skip ci] update demonstration site" -t -u "github-actions-bot <[email protected]>" --nojekyll
40+
yarn gh-pages -d 1st-gen/projects/documentation/dist -m "[skip ci] update demonstration site" -t -u "github-actions-bot <[email protected]>" --nojekyll
4141
env:
4242
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

1st-gen/package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,6 @@
210210
"wireit": {
211211
"build": {
212212
"dependencies": [
213-
"prebuild",
214213
"build:ts",
215214
"build:types"
216215
]
@@ -237,6 +236,7 @@
237236
"clean": "if-file-deleted",
238237
"command": "node ./scripts/build-ts.js",
239238
"dependencies": [
239+
"prebuild",
240240
"process-icons",
241241
"test:create",
242242
"build:css"
@@ -292,6 +292,7 @@
292292
"clean": "if-file-deleted",
293293
"command": "tsc --build tsconfig-all.json --pretty",
294294
"dependencies": [
295+
"prebuild",
295296
"process-icons",
296297
"test:create",
297298
"build:css"
@@ -374,7 +375,8 @@
374375
"../2nd-gen/packages/core/package.json",
375376
"../2nd-gen/packages/core/vite.config.js",
376377
"../2nd-gen/packages/core/tsconfig.json"
377-
]
378+
],
379+
"output": []
378380
},
379381
"prestorybook": {
380382
"command": "cem analyze --outdir storybook/",

2nd-gen/packages/core/package.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,19 @@
4848
"prepublishOnly": "yarn build"
4949
},
5050
"types": "./dist/index.d.ts",
51+
"typesVersions": {
52+
"*": {
53+
"components/*": [
54+
"dist/components/*"
55+
],
56+
"shared/*": [
57+
"dist/shared/*"
58+
],
59+
"shared/base/*": [
60+
"dist/shared/base/*"
61+
]
62+
}
63+
},
5164
"dependencies": {
5265
"lit": "^2.5.0 || ^3.1.3"
5366
},

0 commit comments

Comments
 (0)