Skip to content

Commit

Permalink
chore: remove monocdk-experiment build exceptions (aws#8366)
Browse files Browse the repository at this point in the history
MonoCDK was previously using a special packaging process, but this was
changed to use the standard packaging process used by any other CDK
library. It is thus no longer necessary to apply those exceptions which
risk making the build slower.


----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
  • Loading branch information
RomainMuller authored Jun 4, 2020
1 parent 68cbcb4 commit 4c6a413
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 9 deletions.
3 changes: 1 addition & 2 deletions pack.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ rm -fr ${distdir}
mkdir -p ${distdir}

# Split out jsii and non-jsii packages. Jsii packages will be built all at once.
# Non-jsii packages will be run individually. Note that currently the monoCDK
# package is handled as non-jsii because of the way it is packaged.
# Non-jsii packages will be run individually.
echo "Collecting package list..." >&2
scripts/list-packages $TMPDIR/jsii.txt $TMPDIR/nonjsii.txt

Expand Down
5 changes: 0 additions & 5 deletions packages/@monocdk-experiment/assert/clone.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,3 @@ for file in ${files}; do
done

npx rewrite-imports "**/*.ts"

# symlink the full staged monocdk from the staging directory to node_modules
rm -fr node_modules/monocdk-experiment
mkdir -p node_modules
ln -s $PWD/../../monocdk-experiment/staging node_modules/monocdk-experiment
3 changes: 1 addition & 2 deletions scripts/list-packages
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ child_process.exec('lerna ls --toposort --json', { shell: true }, (error, stdout

for (const module of modules) {
const pkgJson = require(path.join(module.location, 'package.json'));
// MonoCDK-Experiment does its own packaging, should be handled "non-JSII style"
if (pkgJson.jsii && pkgJson.name !== 'monocdk-experiment') {
if (pkgJson.jsii) {
jsiiDirectories.push(module.location);
} else {
nonJsiiNames.push(pkgJson.name);
Expand Down

0 comments on commit 4c6a413

Please sign in to comment.