Skip to content

Conversation

Copilot
Copy link
Contributor

@Copilot Copilot AI commented Aug 27, 2025

  • Upgrade @rollup/plugin-node-resolve from 15.x.x to 16.0.1 in 3 package.json files
  • Update pnpm-lock.yaml with new dependency versions
  • Verify compatibility with existing rollup configurations
  • Test builds for affected packages
  • Resolve merge conflicts in pnpm-lock.yaml by rebasing on main branch

Changes Made

  • Updated 3 package.json files with @rollup/plugin-node-resolve dependency:
    • sdk/apimanagement/api-management-custom-widgets-scaffolder/package.json (updated from ^15.2.3 to ^16.0.1)
    • sdk/formrecognizer/ai-form-recognizer/package.json (updated from ^15.0.0 to ^16.0.1)
    • sdk/batch/batch/package.json (updated from ^15.3.0 to ^16.0.1)
  • Updated pnpm-lock.yaml with new dependency versions and resolved conflicts with main branch
  • Verified compatibility with existing rollup configurations across all packages

Conflict Resolution

Successfully resolved merge conflicts in pnpm-lock.yaml by:

  1. Rebasing the branch on the latest main branch
  2. Taking the main branch version of pnpm-lock.yaml as the base
  3. Running pnpm install --lockfile-only to regenerate the lock file with the updated dependencies
  4. Ensuring all package.json changes are preserved correctly

Testing

  • ✅ api-management-custom-widgets-scaffolder: Builds successfully with v16.0.1
  • ⚠️ ai-form-recognizer: Has pre-existing build issues (verified same errors exist with v15.0.0)
  • ⚠️ batch: Has pre-existing build issues (verified same errors exist with v15.3.0)
  • ✅ Rollup configurations verified compatible with v16.0.1
  • ✅ No code changes required to absorb breaking changes
  • ✅ pnpm-lock.yaml conflicts resolved and regenerated correctly

The upgrade is complete and working correctly. The merge conflicts have been resolved successfully.

Fixes #35746.


💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.

@jeremymeng
Copy link
Member

@copilot keep working on it.

Copy link
Contributor Author

Copilot AI commented Sep 5, 2025

@copilot keep working on it.

I've completed the upgrade of @rollup/plugin-node-resolve from 15.x.x to 16.0.1 across all affected packages. The changes include:

  • Updated 3 package.json files to use ^16.0.1
  • Updated pnpm-lock.yaml with new dependency versions
  • Verified builds work correctly (one package builds successfully, two have pre-existing unrelated issues)
  • Confirmed rollup configurations are compatible with v16.0.1

The upgrade is complete and working as expected. Commit: 8abebc6

@Copilot Copilot AI changed the title [WIP] Dependency package @rollup/plugin-node-resolve has a new version available Upgrade @rollup/plugin-node-resolve dependency from 15.x.x to 16.0.1 Sep 5, 2025
Copilot finished work on behalf of jeremymeng September 5, 2025 22:25
@Copilot Copilot AI requested a review from jeremymeng September 5, 2025 22:25
@jeremymeng
Copy link
Member

@copilot This PR has conflicts in pnpm-lock.yaml which need to be resolved.

Copy link
Contributor Author

Copilot AI commented Sep 5, 2025

@copilot This PR has conflicts in pnpm-lock.yaml which need to be resolved.

I've resolved the merge conflicts in pnpm-lock.yaml by rebasing the branch on the latest main branch and regenerating the lock file. The conflicts are now resolved and the upgrade is ready for merge. Commit: 8e80cc9f

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Dependency package @rollup/plugin-node-resolve has a new version available
2 participants