Skip to content

Commit 6ba32ed

Browse files
authored
chore: remove node-bundle in favor of node-backpack (#653)
In cdklabs/node-backpack#1167, we moved the code of this private tool to the external `node-backpack` package. Remove it here and use the external tool wherever we used to use the private package. Closes #17 --- By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license
1 parent da12596 commit 6ba32ed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+430
-3188
lines changed

.github/workflows/pull-request-lint.yml

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.projenrc.ts

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -531,35 +531,6 @@ const yargsGen = configureProject(
531531

532532
//////////////////////////////////////////////////////////////////////
533533

534-
const nodeBundle = configureProject(
535-
new yarn.TypeScriptWorkspace({
536-
...genericCdkProps({
537-
private: true,
538-
}),
539-
parent: repo,
540-
name: '@aws-cdk/node-bundle',
541-
description: 'Tool for generating npm-shrinkwrap from yarn.lock',
542-
deps: ['esbuild', 'fs-extra@^9', 'license-checker', 'madge', 'shlex', 'yargs'],
543-
devDeps: ['@types/license-checker', '@types/madge', '@types/fs-extra@^9', 'jest-junit', 'standard-version'],
544-
jestOptions: jestOptionsForProject({
545-
jestConfig: {
546-
coverageThreshold: {
547-
branches: 75,
548-
},
549-
},
550-
}),
551-
tsconfig: {
552-
compilerOptions: {
553-
...defaultTsOptions,
554-
},
555-
},
556-
}),
557-
);
558-
// Too many console statements
559-
nodeBundle.eslint?.addRules({ 'no-console': ['off'] });
560-
561-
//////////////////////////////////////////////////////////////////////
562-
563534
// This should be deprecated, but only after the move
564535
const cliPluginContract = configureProject(
565536
new yarn.TypeScriptWorkspace({
@@ -991,7 +962,6 @@ const cli = configureProject(
991962
description: 'AWS CDK CLI, the command line tool for CDK apps',
992963
srcdir: 'lib',
993964
devDeps: [
994-
nodeBundle,
995965
yargsGen,
996966
cliPluginContract,
997967
'@types/archiver',
@@ -1340,7 +1310,7 @@ new JsiiBuild(cliLibAlpha, {
13401310
cliLibAlpha.package.addField('deprecated', 'Deprecated in favor of @aws-cdk/toolkit-lib, a newer approach providing similar functionality to this package. Please migrate.');
13411311

13421312
// clilib needs to bundle some resources, same as the CLI
1343-
cliLibAlpha.postCompileTask.exec('node-bundle validate --external=fsevents:optional --entrypoint=lib/index.js --fix --dont-attribute "^@aws-cdk/|^cdk-assets$|^cdk-cli-wrapper$|^aws-cdk$"');
1313+
cliLibAlpha.postCompileTask.exec('node-backpack validate --external=fsevents:optional --entrypoint=lib/index.js --fix --dont-attribute "^@aws-cdk/|^cdk-assets$|^cdk-cli-wrapper$|^aws-cdk$"');
13441314
cliLibAlpha.postCompileTask.exec('mkdir -p ./lib/api/bootstrap/ && cp ../../aws-cdk/lib/api/bootstrap/bootstrap-template.yaml ./lib/api/bootstrap/');
13451315
for (const resourceCommand of includeCliResourcesCommands) {
13461316
cliLibAlpha.postCompileTask.exec(resourceCommand);

aws-cdk-cli.code-workspace

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk/cli-lib-alpha/.projen/tasks.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk/integ-runner/.projen/deps.json

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk/integ-runner/.projen/tasks.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk/integ-runner/package.json

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk/node-bundle/.eslintrc.js

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)