-
Notifications
You must be signed in to change notification settings - Fork 4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore(toolkit): change bundling to not have a dependency on the aws-c…
…dk package (#32989) Instead use local file references. We still have it listed as a dev dependency, because we do need the cli build in the monorepo before the toolkit. Also adds a script to publish a "public" version locally ### Describe any new or updated permissions being added n/a ### Description of how you validated changes It builds and the "published" package can be used successfully ### Checklist - [x] My code adheres to the [CONTRIBUTING GUIDE](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) and [DESIGN GUIDELINES](https://github.com/aws/aws-cdk/blob/main/docs/DESIGN_GUIDELINES.md) ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
- Loading branch information
Showing
7 changed files
with
89 additions
and
81 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
import { createRequire } from 'node:module'; | ||
import * as path from 'node:path'; | ||
import * as esbuild from 'esbuild'; | ||
import * as fs from 'fs-extra'; | ||
|
||
const require = createRequire(import.meta.url); | ||
|
||
const cliPackage = path.dirname(require.resolve('aws-cdk/package.json')); | ||
let copyFromCli = (from, to = undefined) => { | ||
return fs.copy(path.join(cliPackage, ...from), path.join(process.cwd(), ...(to ?? from))); | ||
}; | ||
|
||
// This is a build script, we are fine | ||
// eslint-disable-next-line @cdklabs/promiseall-no-unbounded-parallelism | ||
await Promise.all([ | ||
copyFromCli(['build-info.json']), | ||
copyFromCli(['/db.json.gz']), | ||
copyFromCli(['lib', 'index_bg.wasm']), | ||
]); | ||
|
||
// # Copy all resources that aws_cdk/generate.sh produced, and some othersCall the generator for the | ||
// cp -R $aws_cdk/lib/init-templates ./lib/ | ||
// mkdir -p ./lib/api/bootstrap/ && cp $aws_cdk/lib/api/bootstrap/bootstrap-template.yaml ./lib/api/bootstrap/ | ||
|
||
await esbuild.build({ | ||
entryPoints: ['lib/api/aws-cdk.ts'], | ||
target: 'node18', | ||
platform: 'node', | ||
packages: 'external', | ||
sourcemap: true, | ||
bundle: true, | ||
outfile: 'lib/api/aws-cdk.js', | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
#!/usr/bin/env bash | ||
|
||
version=${1:-latest} | ||
reset=0.0.0 | ||
|
||
# Toolkit package root | ||
cd "$(dirname $(dirname "$0"))" | ||
|
||
npm pkg set dependencies.@aws-cdk/cx-api=$version | ||
npm pkg set dependencies.@aws-cdk/cloudformation-diff=$version | ||
npm pkg set dependencies.@aws-cdk/region-info=$version | ||
yarn package --private | ||
npm pkg set dependencies.@aws-cdk/cx-api=$reset | ||
npm pkg set dependencies.@aws-cdk/cloudformation-diff=$reset | ||
npm pkg set dependencies.@aws-cdk/region-info=$reset |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,27 +1,26 @@ | ||
/* eslint-disable import/no-extraneous-dependencies */ | ||
export { DEFAULT_TOOLKIT_STACK_NAME, SdkProvider } from 'aws-cdk/lib'; | ||
export type { SuccessfulDeployStackResult } from 'aws-cdk/lib'; | ||
export { formatSdkLoggerContent } from 'aws-cdk/lib/api/aws-auth/sdk-logger'; | ||
export { CloudAssembly, sanitizePatterns, StackCollection, ExtendedStackSelection } from 'aws-cdk/lib/api/cxapp/cloud-assembly'; | ||
export { prepareDefaultEnvironment, prepareContext, spaceAvailableForContext } from 'aws-cdk/lib/api/cxapp/exec'; | ||
export { Deployments } from 'aws-cdk/lib/api/deployments'; | ||
export { HotswapMode } from 'aws-cdk/lib/api/hotswap/common'; | ||
export { StackActivityProgress } from 'aws-cdk/lib/api/util/cloudformation/stack-activity-monitor'; | ||
export { RWLock } from 'aws-cdk/lib/api/util/rwlock'; | ||
export type { ILock } from 'aws-cdk/lib/api/util/rwlock'; | ||
export { formatTime } from 'aws-cdk/lib/api/util/string-manipulation'; | ||
export * as contextproviders from 'aws-cdk/lib/context-providers'; | ||
export { ResourceMigrator } from 'aws-cdk/lib/migrator'; | ||
export { obscureTemplate, serializeStructure } from 'aws-cdk/lib/serialize'; | ||
export { Context, Settings, PROJECT_CONTEXT } from 'aws-cdk/lib/settings'; | ||
export { tagsForStack } from 'aws-cdk/lib/tags'; | ||
export { CliIoHost } from 'aws-cdk/lib/toolkit/cli-io-host'; | ||
export { loadTree, some } from 'aws-cdk/lib/tree'; | ||
export { splitBySize } from 'aws-cdk/lib/util'; | ||
export { validateSnsTopicArn } from 'aws-cdk/lib/util/validate-notification-arn'; | ||
export { WorkGraph } from 'aws-cdk/lib/util/work-graph'; | ||
export type { Concurrency } from 'aws-cdk/lib/util/work-graph'; | ||
export { WorkGraphBuilder } from 'aws-cdk/lib/util/work-graph-builder'; | ||
export type { AssetBuildNode, AssetPublishNode, StackNode } from 'aws-cdk/lib/util/work-graph-types'; | ||
export { versionNumber } from 'aws-cdk/lib/version'; | ||
export { guessExecutable } from 'aws-cdk/lib/api/cxapp/exec'; | ||
export { DEFAULT_TOOLKIT_STACK_NAME, SdkProvider } from '../../../../aws-cdk/lib'; | ||
export type { SuccessfulDeployStackResult } from '../../../../aws-cdk/lib'; | ||
export { formatSdkLoggerContent } from '../../../../aws-cdk/lib/api/aws-auth/sdk-logger'; | ||
export { CloudAssembly, sanitizePatterns, StackCollection, ExtendedStackSelection } from '../../../../aws-cdk/lib/api/cxapp/cloud-assembly'; | ||
export { prepareDefaultEnvironment, prepareContext, spaceAvailableForContext } from '../../../../aws-cdk/lib/api/cxapp/exec'; | ||
export { Deployments } from '../../../../aws-cdk/lib/api/deployments'; | ||
export { HotswapMode } from '../../../../aws-cdk/lib/api/hotswap/common'; | ||
export { StackActivityProgress } from '../../../../aws-cdk/lib/api/util/cloudformation/stack-activity-monitor'; | ||
export { RWLock } from '../../../../aws-cdk/lib/api/util/rwlock'; | ||
export type { ILock } from '../../../../aws-cdk/lib/api/util/rwlock'; | ||
export { formatTime } from '../../../../aws-cdk/lib/api/util/string-manipulation'; | ||
export * as contextproviders from '../../../../aws-cdk/lib/context-providers'; | ||
export { ResourceMigrator } from '../../../../aws-cdk/lib/migrator'; | ||
export { obscureTemplate, serializeStructure } from '../../../../aws-cdk/lib/serialize'; | ||
export { Context, Settings, PROJECT_CONTEXT } from '../../../../aws-cdk/lib/settings'; | ||
export { tagsForStack } from '../../../../aws-cdk/lib/tags'; | ||
export { CliIoHost } from '../../../../aws-cdk/lib/toolkit/cli-io-host'; | ||
export { loadTree, some } from '../../../../aws-cdk/lib/tree'; | ||
export { splitBySize } from '../../../../aws-cdk/lib/util'; | ||
export { validateSnsTopicArn } from '../../../../aws-cdk/lib/util/validate-notification-arn'; | ||
export { WorkGraph } from '../../../../aws-cdk/lib/util/work-graph'; | ||
export type { Concurrency } from '../../../../aws-cdk/lib/util/work-graph'; | ||
export { WorkGraphBuilder } from '../../../../aws-cdk/lib/util/work-graph-builder'; | ||
export type { AssetBuildNode, AssetPublishNode, StackNode } from '../../../../aws-cdk/lib/util/work-graph-types'; | ||
export { versionNumber } from '../../../../aws-cdk/lib/version'; | ||
export { guessExecutable } from '../../../../aws-cdk/lib/api/cxapp/exec'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters