add resolutions, change yarn-cling, and auto-generate files

fix build error about strip-ansi

comment

fix error by string-width

resolution for wrap-ansi

add new modules to resolutions

regenerate yarn.lock instead of resolutions

chore: trigger CI rebuild

resolutions

avoid to regenerate yarn.lock but re-resolutions

modify yarn-cling

build and auto-generate files

add tests for resolutions

Author: go-to-k

.projen/deps.json

@@ -322,6 +322,13 @@ new AdcPublishing(repoProject);
 
 const repo = configureProject(repoProject);
 
+// Force CommonJS versions to prevent Yarn from hoisting ESM-only versions, which break the build
+repo.package.addPackageResolutions(
+  'strip-ansi@^6.0.1',
+  'string-width@^4.2.3',
+  'wrap-ansi@^7.0.0',
+);
+
 interface GenericProps {
   private?: boolean;
 }

.projenrc.ts

@@ -822,6 +822,212 @@ The @aws-cdk/integ-runner package includes the following third-party software/li
    limitations under the License.
 
 
+----------------
+
+** @aws-sdk/[email protected] - https://www.npmjs.com/package/@aws-sdk/client-bedrock-agentcore-control/v/3.948.0 | Apache-2.0
+                                Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2018-2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
 ----------------
 
 ** @aws-sdk/[email protected] - https://www.npmjs.com/package/@aws-sdk/client-cloudcontrol/v/3.948.0 | Apache-2.0

package.json

@@ -36,13 +36,21 @@ export async function generateShrinkwrap(options: ShrinkwrapOptions): Promise<Pa
   const yarnLock: YarnLock = lockfile.parse(await fs.readFile(yarnLockLoc, { encoding: 'utf8' }));
   const pkgJson = await loadPackageJson(packageJsonFile);
 
-  let lock = await generateLockFile(pkgJson, yarnLock, packageJsonDir);
+  // Load resolutions from root package.json (for monorepo support)
+  const rootPkgJsonPath = path.join(path.dirname(yarnLockLoc), 'package.json');
+  let resolutions: Record<string, string> = {};
+  if (await fileExists(rootPkgJsonPath)) {
+    const rootPkgJson = await loadPackageJson(rootPkgJsonPath);
+    resolutions = rootPkgJson.resolutions || {};
+  }
+
+  let lock = await generateLockFile(pkgJson, yarnLock, packageJsonDir, resolutions);
 
   if (options.hoist ?? true) {
     lock = hoistDependencies(lock);
   }
 
-  _validateTree(lock);
+  _validateTree(lock, resolutions);
 
   if (options.outputFile) {
     // Write the shrinkwrap file
@@ -52,7 +60,12 @@ export async function generateShrinkwrap(options: ShrinkwrapOptions): Promise<Pa
   return lock;
 }
 
-async function generateLockFile(pkgJson: PackageJson, yarnLock: YarnLock, rootDir: string): Promise<PackageLockFile> {
+async function generateLockFile(
+  pkgJson: PackageJson,
+  yarnLock: YarnLock,
+  rootDir: string,
+  resolutions: Record<string, string> = {},
+): Promise<PackageLockFile> {
   const builder = new PackageGraphBuilder(yarnLock);
   const rootKeys = await builder.buildGraph(pkgJson.dependencies || {}, rootDir);
 
@@ -65,7 +78,7 @@ async function generateLockFile(pkgJson: PackageJson, yarnLock: YarnLock, rootDi
   };
 
   try {
-    checkRequiredVersions(lockFile);
+    checkRequiredVersions(lockFile, resolutions);
   } catch (e: any) {
     const tempFile = path.join(os.tmpdir(), 'npm-shrinkwrap.json');
     await fs.writeFile(tempFile, JSON.stringify(lockFile, undefined, 2), 'utf-8');
@@ -366,7 +379,7 @@ async function findPackageDir(depName: string, rootDir: string) {
  * tell our future selves that is cannot and will not work, and we should find another
  * solution.
  */
-export function checkRequiredVersions(root: PackageLockFile) {
+export function checkRequiredVersions(root: PackageLockFile, resolutions: Record<string, string> = {}) {
   recurse(root, [[root.name, root]]);
 
   // rootPath does include 'entry'
@@ -386,8 +399,11 @@ export function checkRequiredVersions(root: PackageLockFile) {
           range = range.split('@')[1];
         }
 
+        // If there's a resolution for this package, use that instead of the required range
+        const effectiveRange = resolutions[name] || range;
+
         const depPath = [name, ...rootPath.map(x => x[0])];
-        if (!semver.satisfies(resolvedPackage.version, range)) {
+        if (!semver.satisfies(resolvedPackage.version, effectiveRange)) {
           // Ruh-roh.
           throw new Error(`Looks like we're trying to force '${renderRootPath(depPath)}' to version '${resolvedPackage.version}' (found at ${resolvedPath} => ${name}), but `
             + `${depPath[depPath.length - 1]} specifies the dependency as '${range}'. NPM will not respect this shrinkwrap file. Try vendoring a patched `
@@ -421,7 +437,7 @@ export function checkRequiredVersions(root: PackageLockFile) {
  * We have manipulated the tree a bunch. Do a sanity check to ensure that all declared
  * dependencies are satisfied.
  */
-export function _validateTree(lock: PackageLockTree) {
+export function _validateTree(lock: PackageLockTree, resolutions: Record<string, string> = {}) {
   const errors = new Array<string>();
   recurse(lock, [['root', lock]], {});
   if (errors.length > 0) {
@@ -452,13 +468,16 @@ export function _validateTree(lock: PackageLockTree) {
       declaredRange = declaredRange.split('@')[1];
     }
 
+    // If there's a resolution for this package, use that instead of the declared range
+    const effectiveRange = resolutions[name] || declaredRange;
+
     const foundVersion = depsVersions[name];
     const newRootPath = [name, ...rootPath.map(x => x[0])];
     if (!foundVersion) {
       errors.push(`Dependency on ${renderRootPath(newRootPath)} not satisfied: not found`);
-    } else if (!semver.satisfies(foundVersion, declaredRange)) {
+    } else if (!semver.satisfies(foundVersion, effectiveRange)) {
       // eslint-disable-next-line no-console
-      errors.push(`Dependency on ${renderRootPath(newRootPath)} not satisfied: declared range '${declaredRange}', found '${foundVersion}'`);
+      errors.push(`Dependency on ${renderRootPath(newRootPath)} not satisfied: declared range '${effectiveRange}', found '${foundVersion}'`);
     }
   }
 }

packages/@aws-cdk/integ-runner/THIRD_PARTY_LICENSES

@@ -6,6 +6,11 @@ export interface PackageJson {
    * Dependency name to version range
    */
   dependencies?: Record<string, string>;
+
+  /**
+   * Yarn resolutions to force specific package versions
+   */
+  resolutions?: Record<string, string>;
 }
 
 export interface YarnLock {