chore(rollup): upgrade rollup deps, migrate to mjs config file, enforce linting on mjs files #5830

calebpollman · 2024-09-24T08:16:49Z

Description of changes

Upgrade rollup from ^2.70.0 to ^4.22.4 (ref). The approach taken by this PR configures rollup to emit a bundled output that aligns as closely as possible with the current output. While some of the flags may no longer be necessary, additional modifications to bundle output should be handled in a major version bump.

See this commit for a diff of the dist output between existing bundle output and the output of the changes from this PR.

Summary of changes:

migrate all rollup.config.ts files to rollup.config.mjs
add additional bundle output flags. Detailed comments included in code changes of react-ai package
update @aws-amplify/react-core/elements ESM subpaths
enforce linting on directory top level .mjs and .ts files
add some lightweight linting rules (and fixes) to the ui package
fix some warnings from unit test in the react-native package

Issue #, if available

NA

Description of how you validated changes

Manual tests, visual diffing of bundle output diff, CI workflows taken against this PR

Checklist

Have read the Pull Request Guidelines
PR description included
yarn test passes and tests are updated/added
PR title and commit messages follow conventional commit syntax
If this change should result in a version bump, changeset added (This can be done after creating the PR.) This does not apply to changes made to docs, e2e, examples, or other private packages.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

…ce linting on mjs files

changeset-bot · 2024-09-24T08:16:53Z

🦋 Changeset detected

Latest commit: 1336147

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 15 packages

Name	Type
@aws-amplify/ui-angular	Patch
@aws-amplify/ui-react	Patch
@aws-amplify/ui-react-ai	Patch
@aws-amplify/ui-react-core	Patch
@aws-amplify/ui-react-core-notifications	Patch
@aws-amplify/ui-react-geo	Patch
@aws-amplify/ui-react-liveness	Patch
@aws-amplify/ui-react-native	Patch
@aws-amplify/ui-react-notifications	Patch
@aws-amplify/ui-react-storage	Patch
@aws-amplify/ui	Patch
@aws-amplify/ui-vue	Patch
@aws-amplify/ui-react-auth	Patch
@aws-amplify/ui-react-core-auth	Patch
@aws-amplify/ui-react-native-auth	Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

dbanksdesign

Just 2 questions, but if they are intended, I am GTG

packages/react-core/rollup.config.mjs

packages/react-native/src/Authenticator/__tests__/withAuthenticator.spec.tsx

package.json

calebpollman · 2024-09-25T21:50:20Z

packages/react-ai/.eslintrc.js

-  extends: ['@aws-amplify/amplify-ui/react'],
-  ignorePatterns: ['.eslintrc.js', 'dist', 'rollup.config.ts'],
+  extends: '@aws-amplify/amplify-ui/react',
+  ignorePatterns: ['.eslintrc.js', 'coverage', 'dist', 'node_modules'],


Linting has been expanded to cover top level .ts and .mjs files. Added coverage and node_modules to the ignorePatterns to mitigate extraneous linting

calebpollman · 2024-09-25T21:50:57Z

packages/react-ai/.eslintrc.js

  // point to local tsconfig
  parserOptions: { project: ['tsconfig.json'], tsconfigRootDir: __dirname },
  overrides: [
    {
      extends: ['@aws-amplify/amplify-ui/jest'],
      files: ['**/__mocks__/**', '**/__tests__/**'],
    },
+    { files: '*.mjs' },


Captures top level .mjs files (basically just rollup.config.mjs

Does this do anything if it's not paired with a rule?

It runs the default set of rules

Do the default rules not get run by default for those files?

They were not but this could potentially be removed as some changes were made after it was added, either way preference is not to make any changes to this PR unless they impact the bundle output

calebpollman · 2024-09-25T21:51:14Z

packages/react-ai/.lintstagedrc.js

@@ -2,5 +2,5 @@ const config = require('../../.lintstagedrc.js');

 module.exports = {
  ...config,
-  '*.{ts,tsx,js}': 'eslint',
+  '*.{ts,tsx,js,mjs}': 'eslint',


Lint .mjs files on commit

calebpollman · 2024-09-25T21:51:35Z

packages/react-ai/package.json

@@ -34,7 +34,7 @@
    "check:esm": "node --input-type=module --eval 'import \"@aws-amplify/ui-react-ai\"'",
    "clean": "rimraf dist node_modules",
    "dev": "yarn build:rollup --watch",
-    "lint": "yarn typecheck && eslint src",
+    "lint": "yarn typecheck && eslint .",


src -> . to allow linting of top level config files

calebpollman · 2024-09-25T22:14:09Z

packages/ui/src/theme/components/buttonGroup.ts

@@ -1,4 +1,3 @@
 import { ComponentStyles } from './utils';

-export type ButtonGroupTheme<Required extends boolean = false> =
-  ComponentStyles;
+export interface ButtonGroupTheme extends ComponentStyles {}


Linting fix due to new rules (ref)

calebpollman · 2024-09-25T22:14:14Z

packages/ui/src/theme/components/checkboxField.ts

@@ -1,4 +1,3 @@
 import { ComponentStyles } from './utils';

-export type CheckboxFieldTheme<Required extends boolean = false> =
-  ComponentStyles;
+export interface CheckboxFieldTheme extends ComponentStyles {}


Linting fix due to new rules (ref)

calebpollman · 2024-09-25T22:14:19Z

packages/ui/src/theme/components/selectField.ts

@@ -1,4 +1,3 @@
 import { ComponentStyles } from './utils';

-export type SelectFieldTheme<Required extends boolean = false> =
-  ComponentStyles;
+export interface SelectFieldTheme extends ComponentStyles {}


Linting fix due to new rules (ref)

calebpollman · 2024-09-25T22:14:26Z

packages/ui/src/theme/createTheme/createComponentCSS.ts

-import { DefaultTheme, WebTheme } from '../types';
+import { WebTheme } from '../types';


Linting fix due to new rules (ref)

calebpollman · 2024-09-25T22:14:58Z

packages/ui/tsconfig.dist.json

@@ -1,4 +1,5 @@
 {
  "extends": "./tsconfig.json",
+  "include": ["src/**/*.ts"],


Ensures that only .ts files under src are included in build output

dbanksdesign

Most thorough comment walk-through in a PR I've seen in a while. Kudos!

.changeset/good-bats-teach.md

Co-authored-by: Danny Banks <djb@amazon.com>

chore(rollup): upgrade rollup deps, migrate to mjs config file, enfor…

96ac313

…ce linting on mjs files

calebpollman requested a review from a team as a code owner September 24, 2024 08:16

calebpollman added 2 commits September 24, 2024 11:46

add esModule flag for CJS output of shared packages

a4c4926

Merge branch 'main' into rollup/upgrade

5dc668b

dbanksdesign previously approved these changes Sep 24, 2024

View reviewed changes

packages/react-core/rollup.config.mjs Outdated Show resolved Hide resolved

packages/react-native/src/Authenticator/__tests__/withAuthenticator.spec.tsx Show resolved Hide resolved

calebpollman added 2 commits September 24, 2024 16:18

Merge branch 'main' into rollup/upgrade

ed692d2

address linting issues in ui pkg

2c98427

calebpollman dismissed dbanksdesign’s stale review via 2c98427 September 25, 2024 00:43

calebpollman changed the title ~~chore(rollup): upgrade rollup deps, migrate to mjs config file, enforce linting on mjs files~~ [WIP] chore(rollup): upgrade rollup deps, migrate to mjs config file, enforce linting on mjs files Sep 25, 2024

update react-core elemetns subpath, add cjs output options

d1560b4

calebpollman temporarily deployed to ci September 25, 2024 06:17 — with GitHub Actions Inactive

add additional output config options

5d07440

calebpollman temporarily deployed to ci September 25, 2024 21:26 — with GitHub Actions Inactive

calebpollman commented Sep 25, 2024

View reviewed changes

calebpollman added 2 commits September 25, 2024 15:29

Update package.json

3564c4a

Create good-bats-teach.md

aa5f125

calebpollman changed the title ~~[WIP] chore(rollup): upgrade rollup deps, migrate to mjs config file, enforce linting on mjs files~~ chore(rollup): upgrade rollup deps, migrate to mjs config file, enforce linting on mjs files Sep 25, 2024

calebpollman temporarily deployed to ci September 25, 2024 22:41 — with GitHub Actions Inactive

calebpollman temporarily deployed to ci September 25, 2024 22:42 — with GitHub Actions Inactive

dbanksdesign previously approved these changes Sep 25, 2024

View reviewed changes

.changeset/good-bats-teach.md Outdated Show resolved Hide resolved

calebpollman dismissed dbanksdesign’s stale review via 1336147 September 25, 2024 23:15

Update .changeset/good-bats-teach.md

1336147

Co-authored-by: Danny Banks <djb@amazon.com>

calebpollman temporarily deployed to ci September 25, 2024 23:24 — with GitHub Actions Inactive

dbanksdesign approved these changes Sep 25, 2024

View reviewed changes

esauerbo approved these changes Sep 26, 2024

View reviewed changes

thaddmt approved these changes Sep 26, 2024

View reviewed changes

calebpollman merged commit 545aa6a into main Sep 26, 2024
40 checks passed

calebpollman deleted the rollup/upgrade branch September 26, 2024 17:10

github-actions bot mentioned this pull request Sep 26, 2024

Version Packages #5842

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore(rollup): upgrade rollup deps, migrate to mjs config file, enforce linting on mjs files #5830

chore(rollup): upgrade rollup deps, migrate to mjs config file, enforce linting on mjs files #5830

calebpollman commented Sep 24, 2024 •

edited

Loading

changeset-bot bot commented Sep 24, 2024 •

edited

Loading

dbanksdesign left a comment

calebpollman Sep 25, 2024

calebpollman Sep 25, 2024

esauerbo Sep 26, 2024

calebpollman Sep 26, 2024

esauerbo Sep 26, 2024

calebpollman Sep 26, 2024

calebpollman Sep 25, 2024

calebpollman Sep 25, 2024

calebpollman Sep 25, 2024

calebpollman Sep 25, 2024

calebpollman Sep 25, 2024

calebpollman Sep 25, 2024

calebpollman Sep 25, 2024

dbanksdesign left a comment

		import { DefaultTheme, WebTheme } from '../types';
		import { WebTheme } from '../types';

chore(rollup): upgrade rollup deps, migrate to mjs config file, enforce linting on mjs files #5830

chore(rollup): upgrade rollup deps, migrate to mjs config file, enforce linting on mjs files #5830

Conversation

calebpollman commented Sep 24, 2024 • edited Loading

Description of changes

Issue #, if available

Description of how you validated changes

Checklist

changeset-bot bot commented Sep 24, 2024 • edited Loading

🦋 Changeset detected

dbanksdesign left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dbanksdesign left a comment

Choose a reason for hiding this comment

calebpollman commented Sep 24, 2024 •

edited

Loading

changeset-bot bot commented Sep 24, 2024 •

edited

Loading