Stop bundling jsii packages - consume from npm instead (#521)

Simply source `jsii` modules from `npm` as per normal...
aws · Aug 8, 2018 · f553138 · f553138
1 parent 61be5cb
commit f553138
Show file tree

Hide file tree

Showing 163 changed files with 619 additions and 352 deletions.
diff --git a/bundle.sh b/bundle.sh
@@ -8,7 +8,7 @@ root=$PWD
 version="$(cat ${root}/lerna.json | grep version | cut -d '"' -f4)"
 
 # Get commit from CodePipeline (or git, if we are in CodeBuild)
-# If CODEBUILD_RESOLVED_SOURCE_VERSION is not defined (i.e. local 
+# If CODEBUILD_RESOLVED_SOURCE_VERSION is not defined (i.e. local
 # build or CodePipeline build), use the HEAD commit hash).
 commit="${CODEBUILD_RESOLVED_SOURCE_VERSION:-}"
 if [ -z "${commit}" ]; then
@@ -49,8 +49,6 @@ echo "Staging: ${staging}"
 # dist/ directories in the repo (this is what ./pack.sh is doing). This includes
 # 'docs', 'npm', 'java' and 'dotnet' and any other jsii language artifacts.
 rsync -av ${root}/pack/ .
-# Also bundle the JSII java runtime in the Maven Repository
-rsync -av ${root}/node_modules/jsii-java-runtime/maven-repo/ ./java/
 
 # We are keeping y-npm support only for backwards compatibility reasons and until
 # we publish y-npm itself and can devise instructions on how to use the self-contained .zip.

diff --git a/package.json b/package.json
@@ -4,27 +4,16 @@
     "ignore": true
   },
   "scripts": {
-    "preinstall": "rm -fr .local-npm && mkdir -p .local-npm && (cd .local-npm && unzip ../vendor/*.zip)",
     "pkglint": "tools/pkglint/bin/pkglint -f ."
   },
   "devDependencies": {
     "@types/node": "^8.9.4",
     "@types/nodeunit": "^0.0.30",
-    "codemaker": "file:.local-npm/codemaker-0.5.0-beta.tgz",
-    "jsii": "file:.local-npm/jsii-0.5.0-beta.tgz",
-    "jsii-dotnet-generator": "file:.local-npm/jsii-dotnet-generator-0.5.0-beta.tgz",
-    "jsii-dotnet-jsonmodel": "file:.local-npm/jsii-dotnet-jsonmodel-0.5.0-beta.tgz",
-    "jsii-dotnet-runtime": "file:.local-npm/jsii-dotnet-runtime-0.5.0-beta.tgz",
-    "jsii-java-runtime": "file:.local-npm/jsii-java-runtime-0.5.0-beta.tgz",
-    "jsii-kernel": "file:.local-npm/jsii-kernel-0.5.0-beta.tgz",
-    "jsii-pacmak": "file:.local-npm/jsii-pacmak-0.5.0-beta.tgz",
-    "jsii-runtime": "file:.local-npm/jsii-runtime-0.5.0-beta.tgz",
-    "jsii-spec": "file:.local-npm/jsii-spec-0.5.0-beta.tgz",
     "lerna": "^2.11.0",
     "nodeunit": "^0.11.2",
     "nyc": "^11.8.0",
     "tslint": "^5.10.0",
-    "typescript": "^2.8.3"
+    "typescript": "^3.0.1"
   },
   "repository": {
     "type": "git",

diff --git a/packages/@aws-cdk/assets/.npmignore b/packages/@aws-cdk/assets/.npmignore
@@ -8,4 +8,7 @@ coverage
 dist
 .LAST_PACKAGE
 .LAST_BUILD
-!*.js
+!*.js
+
+# Include .jsii
+!.jsii
diff --git a/packages/@aws-cdk/assets/package.json b/packages/@aws-cdk/assets/package.json
@@ -14,9 +14,6 @@
           "artifactId": "cdk-assets"
         }
       },
-      "dotnet": {
-        "namespace": "Amazon.CDK.Assets"
-      },
       "sphinx": {}
     }
   },

diff --git a/packages/@aws-cdk/aws-apigateway/.npmignore b/packages/@aws-cdk/aws-apigateway/.npmignore
@@ -8,4 +8,7 @@ coverage
 dist
 .LAST_PACKAGE
 .LAST_BUILD
-!*.js
+!*.js
+
+# Include .jsii
+!.jsii
diff --git a/packages/@aws-cdk/aws-apigateway/package.json b/packages/@aws-cdk/aws-apigateway/package.json
@@ -14,9 +14,6 @@
           "artifactId": "apigateway"
         }
       },
-      "dotnet": {
-        "namespace": "Amazon.CDK.AWS.APIGateway"
-      },
       "sphinx": {}
     }
   },

diff --git a/packages/@aws-cdk/aws-applicationautoscaling/.npmignore b/packages/@aws-cdk/aws-applicationautoscaling/.npmignore
@@ -8,4 +8,7 @@ coverage
 dist
 .LAST_PACKAGE
 .LAST_BUILD
-!*.js
+!*.js
+
+# Include .jsii
+!.jsii
diff --git a/packages/@aws-cdk/aws-applicationautoscaling/package.json b/packages/@aws-cdk/aws-applicationautoscaling/package.json
@@ -14,9 +14,6 @@
           "artifactId": "applicationautoscaling"
         }
       },
-      "dotnet": {
-        "namespace": "Amazon.CDK.AWS.ApplicationAutoScaling"
-      },
       "sphinx": {}
     }
   },

diff --git a/packages/@aws-cdk/aws-appsync/.npmignore b/packages/@aws-cdk/aws-appsync/.npmignore
@@ -8,4 +8,7 @@ coverage
 dist
 .LAST_PACKAGE
 .LAST_BUILD
-!*.js
+!*.js
+
+# Include .jsii
+!.jsii
diff --git a/packages/@aws-cdk/aws-appsync/package.json b/packages/@aws-cdk/aws-appsync/package.json
@@ -14,9 +14,6 @@
           "artifactId": "appsync"
         }
       },
-      "dotnet": {
-        "namespace": "Amazon.CDK.AWS.AppSync"
-      },
       "sphinx": {}
     }
   },

diff --git a/packages/@aws-cdk/aws-athena/.npmignore b/packages/@aws-cdk/aws-athena/.npmignore
@@ -8,4 +8,7 @@ coverage
 dist
 .LAST_PACKAGE
 .LAST_BUILD
-!*.js
+!*.js
+
+# Include .jsii
+!.jsii
diff --git a/packages/@aws-cdk/aws-athena/package.json b/packages/@aws-cdk/aws-athena/package.json
@@ -14,9 +14,6 @@
           "artifactId": "athena"
         }
       },
-      "dotnet": {
-        "namespace": "Amazon.CDK.AWS.Athena"
-      },
       "sphinx": {}
     }
   },

diff --git a/packages/@aws-cdk/aws-autoscaling/.npmignore b/packages/@aws-cdk/aws-autoscaling/.npmignore
@@ -8,4 +8,7 @@ coverage
 dist
 .LAST_PACKAGE
 .LAST_BUILD
-!*.js
+!*.js
+
+# Include .jsii
+!.jsii
diff --git a/packages/@aws-cdk/aws-autoscaling/package.json b/packages/@aws-cdk/aws-autoscaling/package.json
@@ -14,9 +14,6 @@
           "artifactId": "autoscaling"
         }
       },
-      "dotnet": {
-        "namespace": "Amazon.CDK.AWS.AutoScaling"
-      },
       "sphinx": {}
     }
   },

diff --git a/packages/@aws-cdk/aws-autoscalingplans/.npmignore b/packages/@aws-cdk/aws-autoscalingplans/.npmignore
@@ -8,4 +8,7 @@ coverage
 dist
 .LAST_PACKAGE
 .LAST_BUILD
-!*.js
+!*.js
+
+# Include .jsii
+!.jsii
diff --git a/packages/@aws-cdk/aws-autoscalingplans/package.json b/packages/@aws-cdk/aws-autoscalingplans/package.json
@@ -14,9 +14,6 @@
           "artifactId": "autoscalingplans"
         }
       },
-      "dotnet": {
-        "namespace": "Amazon.CDK.AWS.AutoScalingPlans"
-      },
       "sphinx": {}
     }
   },

diff --git a/packages/@aws-cdk/aws-batch/.npmignore b/packages/@aws-cdk/aws-batch/.npmignore
@@ -8,4 +8,7 @@ coverage
 dist
 .LAST_PACKAGE
 .LAST_BUILD
-!*.js
+!*.js
+
+# Include .jsii
+!.jsii
diff --git a/packages/@aws-cdk/aws-batch/package.json b/packages/@aws-cdk/aws-batch/package.json
@@ -14,9 +14,6 @@
           "artifactId": "batch"
         }
       },
-      "dotnet": {
-        "namespace": "Amazon.CDK.AWS.Batch"
-      },
       "sphinx": {}
     }
   },

diff --git a/packages/@aws-cdk/aws-budgets/.npmignore b/packages/@aws-cdk/aws-budgets/.npmignore
@@ -8,4 +8,7 @@ coverage
 dist
 .LAST_PACKAGE
 .LAST_BUILD
-!*.js
+!*.js
+
+# Include .jsii
+!.jsii
diff --git a/packages/@aws-cdk/aws-budgets/package.json b/packages/@aws-cdk/aws-budgets/package.json
@@ -14,9 +14,6 @@
           "artifactId": "budgets"
         }
       },
-      "dotnet": {
-        "namespace": "Amazon.CDK.AWS.Budgets"
-      },
       "sphinx": {}
     }
   },

diff --git a/packages/@aws-cdk/aws-certificatemanager/.npmignore b/packages/@aws-cdk/aws-certificatemanager/.npmignore
@@ -8,4 +8,7 @@ coverage
 dist
 .LAST_PACKAGE
 .LAST_BUILD
-!*.js
+!*.js
+
+# Include .jsii
+!.jsii
diff --git a/packages/@aws-cdk/aws-certificatemanager/package.json b/packages/@aws-cdk/aws-certificatemanager/package.json
@@ -14,9 +14,6 @@
           "artifactId": "certificatemanager"
         }
       },
-      "dotnet": {
-        "namespace": "Amazon.CDK.AWS.CertificateManager"
-      },
       "sphinx": {}
     }
   },

diff --git a/packages/@aws-cdk/aws-cloud9/.npmignore b/packages/@aws-cdk/aws-cloud9/.npmignore
@@ -8,4 +8,7 @@ coverage
 dist
 .LAST_PACKAGE
 .LAST_BUILD
-!*.js
+!*.js
+
+# Include .jsii
+!.jsii
diff --git a/packages/@aws-cdk/aws-cloud9/package.json b/packages/@aws-cdk/aws-cloud9/package.json
@@ -14,9 +14,6 @@
           "artifactId": "cloud9"
         }
       },
-      "dotnet": {
-        "namespace": "Amazon.CDK.AWS.Cloud9"
-      },
       "sphinx": {}
     }
   },

diff --git a/packages/@aws-cdk/aws-cloudformation/.npmignore b/packages/@aws-cdk/aws-cloudformation/.npmignore
@@ -8,4 +8,7 @@ coverage
 dist
 .LAST_PACKAGE
 .LAST_BUILD
-!*.js
+!*.js
+
+# Include .jsii
+!.jsii
diff --git a/packages/@aws-cdk/aws-cloudformation/package.json b/packages/@aws-cdk/aws-cloudformation/package.json
@@ -14,9 +14,6 @@
           "artifactId": "cloudformation"
         }
       },
-      "dotnet": {
-        "namespace": "Amazon.CDK.AWS.CloudFormation"
-      },
       "sphinx": {}
     }
   },

diff --git a/packages/@aws-cdk/aws-cloudfront/.npmignore b/packages/@aws-cdk/aws-cloudfront/.npmignore
@@ -9,4 +9,7 @@ coverage
 
 .LAST_PACKAGE
 .LAST_BUILD
-!*.js
+!*.js
+
+# Include .jsii
+!.jsii
diff --git a/packages/@aws-cdk/aws-cloudfront/package.json b/packages/@aws-cdk/aws-cloudfront/package.json
@@ -14,9 +14,6 @@
           "artifactId": "cloudfront"
         }
       },
-      "dotnet": {
-        "namespace": "Amazon.CDK.AWS.CloudFront"
-      },
       "sphinx": {}
     }
   },

diff --git a/packages/@aws-cdk/aws-cloudtrail/.npmignore b/packages/@aws-cdk/aws-cloudtrail/.npmignore
@@ -8,4 +8,7 @@ coverage
 dist
 .LAST_PACKAGE
 .LAST_BUILD
-!*.js
+!*.js
+
+# Include .jsii
+!.jsii
diff --git a/packages/@aws-cdk/aws-cloudtrail/package.json b/packages/@aws-cdk/aws-cloudtrail/package.json
@@ -14,9 +14,6 @@
           "artifactId": "cloudtrail"
         }
       },
-      "dotnet": {
-        "namespace": "Amazon.CDK.AWS.CloudTrail"
-      },
       "sphinx": {}
     }
   },

diff --git a/packages/@aws-cdk/aws-cloudwatch/.npmignore b/packages/@aws-cdk/aws-cloudwatch/.npmignore
@@ -8,4 +8,7 @@ coverage
 dist
 .LAST_PACKAGE
 .LAST_BUILD
-!*.js
+!*.js
+
+# Include .jsii
+!.jsii
diff --git a/packages/@aws-cdk/aws-cloudwatch/package.json b/packages/@aws-cdk/aws-cloudwatch/package.json
@@ -14,9 +14,6 @@
           "artifactId": "cloudwatch"
         }
       },
-      "dotnet": {
-        "namespace": "Amazon.CDK.AWS.CloudWatch"
-      },
       "sphinx": {}
     }
   },

diff --git a/packages/@aws-cdk/aws-codebuild-codepipeline/.npmignore b/packages/@aws-cdk/aws-codebuild-codepipeline/.npmignore
@@ -13,4 +13,7 @@ dist
 !*.js
 coverage
 .nyc_output
-*.tgz
+*.tgz
+
+# Include .jsii
+!.jsii
diff --git a/packages/@aws-cdk/aws-codebuild-codepipeline/package.json b/packages/@aws-cdk/aws-codebuild-codepipeline/package.json
@@ -14,9 +14,6 @@
           "artifactId": "codebuild-codepipeline"
         }
       },
-      "dotnet": {
-        "namespace": "Amazon.CDK.AWS.Codebuild.Codepipeline"
-      },
       "sphinx": {}
     }
   },

diff --git a/packages/@aws-cdk/aws-codebuild/.npmignore b/packages/@aws-cdk/aws-codebuild/.npmignore
@@ -8,4 +8,7 @@ coverage
 dist
 .LAST_PACKAGE
 .LAST_BUILD
-!*.js
+!*.js
+
+# Include .jsii
+!.jsii
diff --git a/packages/@aws-cdk/aws-codebuild/lib/project.ts b/packages/@aws-cdk/aws-codebuild/lib/project.ts
@@ -378,7 +378,7 @@ export class Project extends ProjectRef {
     /**
      * The IAM role for this project.
      */
-    public readonly role: iam.Role;
+    public readonly role?: iam.Role;
 
     /**
      * The ARN of the project.
@@ -450,7 +450,9 @@ export class Project extends ProjectRef {
      * @param statement The permissions statement to add
      */
     public addToRolePolicy(statement: cdk.PolicyStatement) {
-        return this.role.addToPolicy(statement);
+        if (this.role) {
+            this.role.addToPolicy(statement);
+        }
     }
 
     private createLoggingPermission() {