Merge branch 'main' into websocket-accesslog

Author: phuhung273

lerna.json

@@ -12,12 +12,10 @@
     "tools/@aws-cdk/cdk-build-tools",
     "tools/@aws-cdk/user-input-gen",
     "tools/@aws-cdk/cdk-release",
-    "tools/@aws-cdk/node-bundle",
     "tools/@aws-cdk/pkglint",
     "tools/@aws-cdk/pkgtools",
     "tools/@aws-cdk/prlint",
     "tools/@aws-cdk/spec2cdk",
-    "tools/@aws-cdk/yarn-cling",
     "tools/@aws-cdk/lazify",
     "tools/@aws-cdk/lambda-integration-test-updater",
     "tools/@aws-cdk/construct-metadata-updater",
@@ -26,4 +24,4 @@
   "rejectCycles": true,
   "version": "0.0.0",
   "$schema": "node_modules/lerna/schemas/lerna-schema.json"
-}
+}

package.json

@@ -79,12 +79,10 @@
       "tools/@aws-cdk/cdk-build-tools",
       "tools/@aws-cdk/user-input-gen",
       "tools/@aws-cdk/cdk-release",
-      "tools/@aws-cdk/node-bundle",
       "tools/@aws-cdk/pkglint",
       "tools/@aws-cdk/pkgtools",
       "tools/@aws-cdk/prlint",
       "tools/@aws-cdk/spec2cdk",
-      "tools/@aws-cdk/yarn-cling",
       "tools/@aws-cdk/lazify",
       "tools/@aws-cdk/lambda-integration-test-updater",
       "tools/@aws-cdk/construct-metadata-updater",

packages/aws-cdk-lib/package.json

@@ -508,7 +508,6 @@
     "./core/lib/helpers-internal": "./core/lib/helpers-internal/index.js",
     "./core/lib/metadata-resource": "./core/lib/metadata-resource.js",
     "./core/lib/prop-injectable": "./core/lib/prop-injectable.js",
-    "./core/lib/errors": "./core/lib/errors.js",
     "./custom-resources": "./custom-resources/index.js",
     "./custom-resources/lib/helpers-internal": "./custom-resources/lib/helpers-internal/index.js",
     "./cx-api": "./cx-api/index.js",

tools/@aws-cdk/cdk-build-tools/bin/cdk-package.ts

@@ -1,6 +1,5 @@
+/* eslint-disable @cdklabs/no-throw-default-error */
 import * as path from 'path';
-import { Bundle } from '@aws-cdk/node-bundle';
-import * as yarnCling from '@aws-cdk/yarn-cling';
 import * as fs from 'fs-extra';
 import * as yargs from 'yargs';
 import { shell } from '../lib/os';
@@ -58,14 +57,6 @@ async function main() {
     return;
   }
 
-  // If we need to shrinkwrap this, do so now.
-  if (options.shrinkWrap) {
-    await yarnCling.generateShrinkwrap({
-      packageJsonFile: 'package.json',
-      outputFile: 'npm-shrinkwrap.json',
-    });
-  }
-
   // if this is a jsii package, use jsii-packmak
   if (isJsii()) {
     const command = [args['jsii-pacmak'],
@@ -77,15 +68,9 @@ async function main() {
     const target = path.join(outdir, 'js');
     await fs.remove(target);
     await fs.mkdirp(target);
-    if (options.bundle) {
-      // bundled packages have their own bundler.
-      const bundle = new Bundle({ packageDir: process.cwd(), ...options.bundle });
-      bundle.pack({ target });
-    } else {
-      // just "npm pack" and deploy to "outdir"
-      const tarball = (await shell(['npm', 'pack'], { timers })).trim();
-      await fs.move(tarball, path.join(target, path.basename(tarball)));
-    }
+    // just "npm pack" and deploy to "outdir"
+    const tarball = (await shell(['npm', 'pack'], { timers })).trim();
+    await fs.move(tarball, path.join(target, path.basename(tarball)));
   }
 
   if (options.post) {

tools/@aws-cdk/cdk-build-tools/lib/package-info.ts

@@ -1,7 +1,6 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import * as util from 'util';
-import type { BundleProps } from '@aws-cdk/node-bundle';
 
 const readdir = util.promisify(fs.readdir);
 const stat = util.promisify(fs.stat);
@@ -186,11 +185,6 @@ export interface CDKBuildOptions {
 }
 
 export interface CDKPackageOptions {
-  /**
-   *  Should this package be shrinkwrap
-   */
-  shrinkWrap?: boolean;
-
   /**
    * Optional commands (formatted as a list of strings, which will be joined together with the && operator) to run before packaging
    */
@@ -201,11 +195,6 @@ export interface CDKPackageOptions {
   */
   post?: string[];
 
-  /**
-   * Should this package be bundled. (and if so, how)
-   */
-  bundle?: Omit<BundleProps, 'packageDir'>;
-
   /**
    * Also package private packages for local usage.
    * @default false

tools/@aws-cdk/cdk-build-tools/package.json

@@ -46,8 +46,6 @@
   "main": "lib/index.js",
   "dependencies": {
     "@cdklabs/eslint-plugin": "^1.3.2",
-    "@aws-cdk/yarn-cling": "0.0.0",
-    "@aws-cdk/node-bundle": "0.0.0",
     "@typescript-eslint/eslint-plugin": "^8",
     "@stylistic/eslint-plugin": "^2",
     "@typescript-eslint/parser": "^8",