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.

Sign up for GitHub

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

Jump to bottom

feat: upgrading rollup to latest version [TOL-2097] #559

Merged
merged 6 commits into from
May 22, 2024
Merged

feat: upgrading rollup to latest version [TOL-2097] #559

merged 6 commits into from
May 22, 2024

Conversation

2wce
Copy link
Contributor

@2wce 2wce commented May 22, 2024 •
edited
Loading

This PR contains the following

  • upgraded rollup & it's deps to the latest packages
  • removed duplicated dev dependencies & installed them from root level
  • fixed rollup command to work with latest
  • removed unsupported rollup sourcemaps package since it doesn't work with v3
  • jest has been upgraded to the latest version while fixing the tests. it required updating the snapshots since some syntax changed

Outstanding Tasks

  • I've done a visual comparison between the dist before & after upgrade but let me know if there's something unusual
  • should we make this a breaking change?

WARNING!!!

Versions after 0.56.0 for "typescript-json-schema" will change the snapshots & break tests. This can be done in a separate PR & is now out of scope for this

@2wce 2wce self-assigned this May 22, 2024
@2wce 2wce requested a review from a team May 22, 2024 08:09
@contentful-automation
Copy link
Contributor

contentful-automation bot commented May 22, 2024 •
edited
Loading

Size Change: -11.7 kB (-4%)

Total Size: 248 kB

Filename Size Change
./packages/rich-text-from-markdown/dist/rich-text-from-es5.js 180 kB -11 kB (-6%) ✅
ℹ️ View Unchanged
Filename Size Change
./packages/contentful-slatejs-adapter/dist/contentful-slatejs-adapter.es5.js 2.46 kB -11 B (0%)
./packages/contentful-slatejs-adapter/dist/lib/__test__/contentful-helpers.js 344 B 0 B
./packages/contentful-slatejs-adapter/dist/lib/__test__/contentful-to-slatejs-adapter.test.js 2.09 kB 0 B
./packages/contentful-slatejs-adapter/dist/lib/contentful-to-slatejs-adapter.js 858 B 0 B
./packages/contentful-slatejs-adapter/dist/lib/helpers.js 157 B 0 B
./packages/contentful-slatejs-adapter/dist/lib/index.js 143 B 0 B
./packages/contentful-slatejs-adapter/dist/lib/schema.js 536 B 0 B
./packages/contentful-slatejs-adapter/dist/lib/slatejs-to-contentful-adapter.js 1.01 kB 0 B
./packages/contentful-slatejs-adapter/dist/lib/types/index.js 64 B 0 B
./packages/contentful-slatejs-adapter/dist/lib/types/slate.js 67 B 0 B
./packages/rich-text-from-markdown/dist/lib/__test__/helpers.js 640 B 0 B
./packages/rich-text-from-markdown/dist/lib/__test__/index.test.js 2.35 kB 0 B
./packages/rich-text-from-markdown/dist/lib/__test__/real-world.test.js 2.6 kB 0 B
./packages/rich-text-from-markdown/dist/lib/index.js 4.06 kB 0 B
./packages/rich-text-from-markdown/dist/lib/types/index.js 125 B 0 B
./packages/rich-text-html-renderer/dist/lib/__test__/documents/embedded-entry.js 310 B 0 B
./packages/rich-text-html-renderer/dist/lib/__test__/documents/embedded-js 318 B 0 B
./packages/rich-text-html-renderer/dist/lib/__test__/documents/heading.js 322 B 0 B
./packages/rich-text-html-renderer/dist/lib/__test__/documents/hr.js 257 B 0 B
./packages/rich-text-html-renderer/dist/lib/__test__/documents/hyperlink.js 309 B 0 B
./packages/rich-text-html-renderer/dist/lib/__test__/documents/index.js 602 B 0 B
./packages/rich-text-html-renderer/dist/lib/__test__/documents/inline-entity.js 376 B 0 B
./packages/rich-text-html-renderer/dist/lib/__test__/documents/invalid-marks.js 282 B 0 B
./packages/rich-text-html-renderer/dist/lib/__test__/documents/invalid-type.js 312 B 0 B
./packages/rich-text-html-renderer/dist/lib/__test__/documents/mark.js 278 B 0 B
./packages/rich-text-html-renderer/dist/lib/__test__/documents/ol.js 321 B 0 B
./packages/rich-text-html-renderer/dist/lib/__test__/documents/paragraph.js 244 B 0 B
./packages/rich-text-html-renderer/dist/lib/__test__/documents/quote.js 257 B 0 B
./packages/rich-text-html-renderer/dist/lib/__test__/documents/table-header.js 410 B 0 B
./packages/rich-text-html-renderer/dist/lib/__test__/documents/table.js 399 B 0 B
./packages/rich-text-html-renderer/dist/lib/__test__/documents/ul.js 322 B 0 B
./packages/rich-text-html-renderer/dist/lib/__test__/index.test.js 2.19 kB 0 B
./packages/rich-text-html-renderer/dist/lib/index.js 1.75 kB 0 B
./packages/rich-text-html-renderer/dist/rich-text-html-es5.js 5.06 kB -72 B (-1%)
./packages/rich-text-links/dist/lib/__test__/index.test.js 2.19 kB 0 B
./packages/rich-text-links/dist/lib/index.js 1.61 kB 0 B
./packages/rich-text-links/dist/lib/types/utils.js 124 B 0 B
./packages/rich-text-links/dist/rich-text-links.es5.js 3.95 kB -176 B (-4%)
./packages/rich-text-plain-text-renderer/dist/lib/__test__/index.test.js 960 B 0 B
./packages/rich-text-plain-text-renderer/dist/lib/index.js 1.29 kB 0 B
./packages/rich-text-plain-text-renderer/dist/rich-text-plain-text-es5.js 3.66 kB -173 B (-5%) ✅
./packages/rich-text-react-renderer/dist/lib/__test__/components/js 287 B 0 B
./packages/rich-text-react-renderer/dist/lib/__test__/components/Paragraph.js 287 B 0 B
./packages/rich-text-react-renderer/dist/lib/__test__/components/Strong.js 287 B 0 B
./packages/rich-text-react-renderer/dist/lib/__test__/documents/embedded-entry.js 310 B 0 B
./packages/rich-text-react-renderer/dist/lib/__test__/documents/embedded-js 318 B 0 B
./packages/rich-text-react-renderer/dist/lib/__test__/documents/heading.js 322 B 0 B
./packages/rich-text-react-renderer/dist/lib/__test__/documents/hr.js 257 B 0 B
./packages/rich-text-react-renderer/dist/lib/__test__/documents/hyperlink.js 309 B 0 B
./packages/rich-text-react-renderer/dist/lib/__test__/documents/index.js 661 B 0 B
./packages/rich-text-react-renderer/dist/lib/__test__/documents/inline-entity.js 376 B 0 B
./packages/rich-text-react-renderer/dist/lib/__test__/documents/invalid-marks.js 282 B 0 B
./packages/rich-text-react-renderer/dist/lib/__test__/documents/invalid-type.js 312 B 0 B
./packages/rich-text-react-renderer/dist/lib/__test__/documents/mark.js 278 B 0 B
./packages/rich-text-react-renderer/dist/lib/__test__/documents/multi-mark.js 290 B 0 B
./packages/rich-text-react-renderer/dist/lib/__test__/documents/ol.js 321 B 0 B
./packages/rich-text-react-renderer/dist/lib/__test__/documents/paragraph.js 244 B 0 B
./packages/rich-text-react-renderer/dist/lib/__test__/documents/quote.js 257 B 0 B
./packages/rich-text-react-renderer/dist/lib/__test__/documents/table-header.js 410 B 0 B
./packages/rich-text-react-renderer/dist/lib/__test__/documents/table.js 399 B 0 B
./packages/rich-text-react-renderer/dist/lib/__test__/documents/ul.js 322 B 0 B
./packages/rich-text-react-renderer/dist/lib/__test__/index.test.js 2.74 kB 0 B
./packages/rich-text-react-renderer/dist/lib/index.js 1.25 kB 0 B
./packages/rich-text-react-renderer/dist/lib/util/appendKeyToValidElement.js 267 B 0 B
./packages/rich-text-react-renderer/dist/lib/util/nodeListToReactComponents.js 815 B 0 B
./packages/rich-text-react-renderer/dist/rich-text-react-es5.js 4.49 kB -220 B (-5%) ✅
./packages/rich-text-types/dist/__test__/index.test.js 587 B 0 B
./packages/rich-text-types/dist/__test__/schemaConstraints.test.js 564 B 0 B
./packages/rich-text-types/dist/blocks.js 491 B 0 B
./packages/rich-text-types/dist/emptyDocument.js 356 B 0 B
./packages/rich-text-types/dist/helpers.js 489 B 0 B
./packages/rich-text-types/dist/index.js 765 B 0 B
./packages/rich-text-types/dist/inlines.js 337 B 0 B
./packages/rich-text-types/dist/marks.js 296 B 0 B
./packages/rich-text-types/dist/nodeTypes.js 127 B 0 B
./packages/rich-text-types/dist/schemaConstraints.js 1.08 kB 0 B
./packages/rich-text-types/dist/schemas/__test__/helpers.test.js 371 B 0 B
./packages/rich-text-types/dist/schemas/__test__/schemas.test.js 425 B 0 B
./packages/rich-text-types/dist/schemas/index.js 274 B 0 B
./packages/rich-text-types/dist/types.js 124 B 0 B

@2wce 2wce changed the title feat: upgrading rollup to latest version [] feat: upgrading rollup to latest version [TOL-2097] May 22, 2024
z0al
z0al approved these changes May 22, 2024
View reviewed changes
Copy link
Member

@z0al z0al left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. It would be great if we can get the sourcemaps to work but not a deal breaker for merging this PR to me

rollup.config.js
@@ -32,9 +31,6 @@ export default (outputFile, overrides = {}) => ({
// which external modules to include in the bundle
// https://github.com/rollup/rollup-plugin-node-resolve#usage
resolve(),

// Resolve source maps to the original source
sourceMaps(),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the alternative? It can be useful to have this working

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i couldn't find an alternative & this package isn't being maintained regularly so it looks like if we want the functionality we have to create our own plugin at the moment

@2wce 2wce merged commit f14d197 into master May 22, 2024
5 checks passed
@2wce 2wce deleted the chore/upgrade-rollup branch May 22, 2024 10:18
@2wce 2wce mentioned this pull request May 22, 2024
Closed
YvesRijckaert added a commit that referenced this pull request May 27, 2024
@YvesRijckaert
Revert "feat: upgrading rollup to latest version [TOL-2097] (#559)"
92ea549 
This reverts commit f14d197.
YvesRijckaert added a commit that referenced this pull request May 27, 2024
@YvesRijckaert
Revert "feat: upgrading rollup to latest version [TOL-2097] (#559)"
ed63163 
This reverts commit f14d197.
YvesRijckaert added a commit that referenced this pull request May 27, 2024
@YvesRijckaert
Revert "feat: upgrading rollup to latest version [TOL-2097] (#559)"
2795f5d 
This reverts commit f14d197.
YvesRijckaert added a commit that referenced this pull request May 27, 2024
@YvesRijckaert
Revert "feat: upgrading rollup to latest version [TOL-2097] (#559)"
b844e86 
This reverts commit f14d197.
YvesRijckaert added a commit that referenced this pull request May 27, 2024
@YvesRijckaert
chore: revert "feat: upgrading rollup to latest version [TOL-2097] (#559
41c5c2c 
)"

This reverts commit f14d197.
YvesRijckaert added a commit that referenced this pull request May 27, 2024
@YvesRijckaert
chore: revert "feat: upgrading rollup to latest version [TOL-2097] (#559
c43938f 
)"

This reverts commit f14d197.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@z0al z0al z0al approved these changes

Assignees

@2wce 2wce

Labels
package:contentful-slatejs-adapter package:rich-text-from-markdown package:rich-text-html-renderer package:rich-text-links package:rich-text-plain-text-renderer package:rich-text-react-renderer package:rich-text-types
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@2wce @z0al