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

[DO NOT MERGE] experiment geist font #2837

Draft
wants to merge 127 commits into
base: next
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
127 commits
Select commit Hold shift + click to select a range
47d639f
feat: v5 icons
denkristoffer Jan 11, 2024
4ed7044
chore: pin v4 icons
denkristoffer Jan 11, 2024
7fe7a9a
fix: imports
denkristoffer Jan 11, 2024
740e920
fix: fix imports, pkg lock update
bgutsol Feb 22, 2024
146a242
fix: pin f36-icon dep in f36-icons
bgutsol Feb 22, 2024
ad1e8f3
chore: update import
cf-remylenoir Apr 15, 2024
7bb233c
build: replace tsup with swc
cf-remylenoir Apr 16, 2024
e1cbed8
refactor: export individual icons modules
cf-remylenoir Apr 16, 2024
6735907
refactor: store icons in distinct directories
cf-remylenoir Apr 16, 2024
395ba74
chore: restore original package name
cf-remylenoir Apr 16, 2024
c33e52d
build: enable pure ESM
cf-remylenoir Apr 16, 2024
6d7fc51
fix: lockfile
denkristoffer Apr 17, 2024
68c1af5
feat: duotone icons
denkristoffer Apr 17, 2024
27c3ea9
build: update package + move module type in config
cf-remylenoir Apr 17, 2024
79f0193
chore: document config change
cf-remylenoir Apr 17, 2024
439757a
chore: put previous version before publish bump
cf-remylenoir Apr 17, 2024
cd4a028
build: bump version after release
cf-remylenoir Apr 18, 2024
ece83e8
chore: pin dependency version
cf-remylenoir Apr 18, 2024
c60fe45
build: bump version after release
cf-remylenoir Apr 18, 2024
3cedbe1
chore: build CJS
denkristoffer Apr 22, 2024
aac8102
feat: prebuild script
denkristoffer Apr 24, 2024
64fdff3
feat: add FileArchive
denkristoffer Apr 24, 2024
3d5806f
chore: improved pre-build script
denkristoffer Apr 24, 2024
c647218
feat: add Gift icon
denkristoffer Apr 24, 2024
2c85c72
feat:(codemod) add v5-icons codemod (#2716)
massao Apr 25, 2024
5fa7e05
Extract Icon weight type from Phosphor (#2727)
denkristoffer Apr 25, 2024
76d185e
build icon with swc (#2726)
denkristoffer Apr 25, 2024
60c965c
feat: V5 icons codemod (#2732)
massao Apr 26, 2024
d04b804
fix: icon props typing
cf-remylenoir Apr 30, 2024
b7de477
fix(icon): add module export
cf-remylenoir Apr 30, 2024
cb126b6
fix(icons): adjust module import
cf-remylenoir Apr 30, 2024
69f2581
fix: adjust dependency path
cf-remylenoir Apr 30, 2024
d5d57bd
fix(icon): wrong SWC config file name
cf-remylenoir May 3, 2024
21c8b23
fix(icon): wrong types definition path
cf-remylenoir May 3, 2024
41ee803
build: switch to dual package emitting (#2746)
cf-remylenoir May 8, 2024
12bf14d
feat: duotone icons
denkristoffer May 15, 2024
25516f9
feat(icon): active colour change
denkristoffer May 15, 2024
561859b
fix(icon): use color property instead of fill
denkristoffer May 15, 2024
255b8c5
chore(pre-build): typo
denkristoffer May 15, 2024
d35cbb0
fix: bring back pre-build script
denkristoffer May 15, 2024
65a4f8f
feat(icon): 5.0.0-alpha.9
denkristoffer May 15, 2024
abb8732
feat(icons): 5.0.0-alpha.9
denkristoffer May 15, 2024
0b31940
refactor: update icons v5 codemod (#2759)
massao May 16, 2024
4b7d62f
fix: properly pass testId as data-test-id to components [] (#2761)
massao May 17, 2024
ec45ebe
fix: properly pass the props from Icon to underling icon [] (#2762)
massao May 22, 2024
a164a97
feat: add new utility to codemod to update identifier
massao May 23, 2024
e16f581
feat: update icons v5 codemod with correct mapping and upate identifiers
massao May 23, 2024
e4d0ddb
feat: make codemod replace trimmed icons
massao May 23, 2024
cf80308
refactor: update mapping on icons codemod
massao May 23, 2024
5e622d3
feat: codemod also migrate IconProps
massao May 23, 2024
2ee27f8
feat: add support for mapping variant to color
massao May 28, 2024
7aa6f06
refactor: set default color to currentColor
massao May 28, 2024
8c699bb
chore: release new alpha version
massao May 28, 2024
b80b0f7
feat: update link icon + add link-break icon
cf-remylenoir May 29, 2024
7ccfe8d
chore: update references icon replacement
cf-remylenoir May 30, 2024
b6d6397
refactor(codemod): only add IconProps import if necessary
massao May 30, 2024
2e51cc6
feat: add Icon component to icons codemod
massao May 30, 2024
18e810f
refactor: improve codemod handling size prop
massao May 30, 2024
bbff4d7
feat: improve codemod handling Icon component
massao May 31, 2024
7f7fc7e
refactor: pass size and color prop to Icon component
massao Jun 3, 2024
7cb0efc
chore: release new alpha version
massao Jun 3, 2024
df96be4
chore: bump lock version
cf-remylenoir Jun 6, 2024
324bf86
feat: add icons
cf-remylenoir Jun 6, 2024
8897d40
feat: migrate icons from custom to Phosphor
cf-remylenoir Jun 10, 2024
7c9bcfb
feat: add HalfCircleIcon and DotsThreeVerticalIcon
massao Jun 10, 2024
889d759
chore: bump icons alpha version
massao Jun 10, 2024
a3b6945
feat: add missing icons
cf-remylenoir Jun 10, 2024
75d9ee1
fix: prevent prop leaking into Phosphor
cf-remylenoir Jun 14, 2024
87d9c2b
refactor: improve prop values ternary updates
massao Jun 17, 2024
0b59c59
refactor: make codemod accept only one directory or file per run
massao Jun 17, 2024
7de8668
fix: reset import package name
Lelith Jun 17, 2024
9b18f77
chore: version update
Lelith Jun 17, 2024
c65ce1b
chore: udpate dependencies
massao Jun 17, 2024
8400952
chore: release codemod as alpha
massao Jun 17, 2024
35d051a
feat: add custom Sparkle + SparkleFilled icons, remove Phosphor one
cf-remylenoir Jun 17, 2024
f593447
feat(layout): begin updating component to new page cut design
stephanLeece May 6, 2024
c42f12f
feat(layouty): tweak box shadow, border colour values
stephanLeece May 7, 2024
6359cc3
feat(layout): add narrow variant
stephanLeece May 7, 2024
a3b5dc6
feat(layout): cleanup
stephanLeece May 7, 2024
2384537
feat(layout): correct type casting
stephanLeece May 7, 2024
de187a2
feat(layout, header): increase border-radius on layout. Remove header…
stephanLeece May 7, 2024
05b33fb
feat(header): tweak horizontal spacing, update story wrapper
stephanLeece May 7, 2024
2668f34
feat(layout): update examples
stephanLeece May 8, 2024
2a8159b
feat(layout): simiply conditional sidebar borders
stephanLeece May 10, 2024
393886f
feat(layout, header): revert changes to header. Remove padding on Lay…
stephanLeece May 10, 2024
bbff8b4
revert changes to header stories
stephanLeece May 10, 2024
fc872c5
feat(layout): split out getMaxWidth style functions
stephanLeece May 10, 2024
db895f9
feat(layout): update examples with spacing on child components"
stephanLeece May 10, 2024
062ee91
feat(layout): use tokens in component margin"
stephanLeece May 10, 2024
c3bd1d8
feat(layout): add grey background/spacing as part of the Layout compo…
stephanLeece May 13, 2024
3447434
feat(layout): center page cut
stephanLeece May 14, 2024
a3f818e
feat(layout): padding on layout components
stephanLeece May 14, 2024
0470cb0
feat(layout): update examples
stephanLeece May 14, 2024
2afcced
feat(layout): add full screen example
stephanLeece May 14, 2024
211aefe
feat(layout): remove unused backgroundClassName prop"
stephanLeece May 14, 2024
516e4c3
feat(layout): move relevant props to top level component
stephanLeece May 15, 2024
bd10ed6
feat(layout): bump version to 5.0.0-alpha.0
stephanLeece May 15, 2024
e2aba0e
feat(layout): add withBoxShadow prop, remove root background, story a…
stephanLeece May 27, 2024
68e0bef
feat: add sidebar widths
denkristoffer May 31, 2024
98fcea4
chore: alpha.3
denkristoffer May 31, 2024
c5d3c9d
fix(layout-sidebar): default to wide
denkristoffer May 31, 2024
7cf68a5
chore: npm install
denkristoffer Jun 26, 2024
461bff8
chore: layout deps
denkristoffer Jun 28, 2024
418dcd8
Revert "chore: layout deps"
massao Jun 28, 2024
93f4f9e
chore: try to recreate package-lock with npm registry
massao Jun 28, 2024
f282b41
fix(layout): remove top margin (#2815)
denkristoffer Jul 1, 2024
6db80fb
feat: add custom InspectorMode icon
cf-remylenoir Jul 4, 2024
be5a9d9
feat: add Key icon
cf-remylenoir Jul 9, 2024
d075503
feat: add custom Variable icon
cf-remylenoir Jul 9, 2024
bc5e274
feat: add translate icon (#2826)
YvesRijckaert Jul 17, 2024
fbba29a
chore: update deps
cf-remylenoir Jul 17, 2024
99e432f
feat(layout): increase max width of wide and narrow variants
stephanLeece Jul 17, 2024
356b422
chore: update SWC packages
cf-remylenoir Jul 17, 2024
1fd1381
test: ignore dist path
cf-remylenoir Jul 17, 2024
218323b
test: map ESM import extension
cf-remylenoir Jul 17, 2024
19f6714
Merge branch 'next' of github.com:contentful/forma-36 into CFISO-1695…
stephanLeece Jul 17, 2024
ef87281
Merge branch 'next' into CFISO-1695-layout-increase-max-width
cf-remylenoir Jul 17, 2024
3020a0c
feat(layout): reduce max width on narrow variant of layout
stephanLeece Jul 17, 2024
35c4af0
Merge branch 'CFISO-1695-layout-increase-max-width' of github.com:con…
stephanLeece Jul 17, 2024
e3733b9
feat(layout): new alpha version
stephanLeece Jul 17, 2024
b26c4f1
[DO NOT MERGE] feat: navigation light mode (#2730)
Lelith Jul 17, 2024
69ba16a
feat(layout): new alpha version
stephanLeece Jul 19, 2024
d6a3ec9
Merge branch 'next' into CFISO-1695-layout-increase-max-width
stephanLeece Jul 19, 2024
edd2dba
Merge pull request #2827 from contentful/CFISO-1695-layout-increase-m…
stephanLeece Jul 19, 2024
ce30f5d
feat(navbar): increase wide variant max-width (#2831)
cf-remylenoir Jul 23, 2024
2c92d2d
feat: introduce geist as main primary font
Lelith Jul 23, 2024
44eb184
feat: enable font integration
Lelith Jul 25, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 9 additions & 1 deletion .changeset/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,17 @@
}
],
"ignore": [
"@contentful/f36-core",
"@contentful/f36-codemod",
"@contentful/f36-icon",
"@contentful/f36-icons",
"@contentful/f36-avatar",
"@contentful/f36-image",
"@contentful/f36-header",
"@contentful/f36-layout",
"@contentful/f36-progress-stepper",
"@contentful/f36-navlist",
"@contentful/f36-navbar",
"@contentful/f36-website"
],
"commit": false,
Expand Down Expand Up @@ -59,4 +67,4 @@
"___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
"onlyUpdatePeerDependentsWhenOutOfRange": true
}
}
}
3 changes: 3 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@ tsup.config.ts
# next.js
**/.next/
**/out/

# codemod tests
**/__testfixtures__
34 changes: 34 additions & 0 deletions BUILD.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# Building

We are using [tsup](https://tsup.egoist.dev/) and [esbuild](https://esbuild.github.io/) together with [Microbundle](https://www.npmjs.com/package/microbundle) to build our component library.

Each component builds to its own `dist` directory with:

- `index.d.ts` – TypeScript type declaration file
- `index.js` – CJS (CommonJS)
- `index.modern.mjs` – [Modern](https://github.com/developit/microbundle#-modern-mode-) output (work in all modern browsers)
- `index.module.js` – legacy ESM (ES Modules) output (for bundlers)
- `index.umd.js` – legacy UMD (Universal Module Definition) output (for Node & CDN use)

## Create a build of the library

```bash
npm run-script build
```

## v5 alpha/beta pre-releases

> [!WARNING]
>
> Revisit the build setup before the v5 release

We aim to emit ESM only in our next major release.

Until then, we emit CJS and ESM using a dual-package approach with `tsc` and [tsconfig-to-dual-package](https://github.com/azu/tsconfig-to-dual-package/tree/main).

This ensures Node/TypeScript point to the right package type (commonjs, module) depending on the consumer's configuration, without the hassle of us to "hack" the main `package.json` and `tsconfig` to satisfy all use cases.

The build has the following structure in its own `dist` directory:

- `./cjs` – CJS (CommonJS) with declaration + inline source map.
- `./esm` – ESM (ES Modules) with declaration + inline source map.
3 changes: 2 additions & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,12 @@ module.exports = {
moduleNameMapper: {
'\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$':
'<rootDir>/scripts/test/__mocks__/fileMock.js',
'(.+)\\.js': '$1',
'@/scripts/(.*)': '<rootDir>/scripts/$1',
},

// An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
// modulePathIgnorePatterns: [],
modulePathIgnorePatterns: ['/dist/'],

// Activates notifications for test results
// notify: false,
Expand Down
Loading