chore(signature-v4): using ES2017 on sigv4 package and ES5 for sigv4 browser entry (#361)

AllanZhengYP · web-flow · commit e6fa8b1949eb · 2019-09-18T13:46:49.000-07:00
diff --git a/buildspec.yml b/buildspec.yml
@@ -0,0 +1,14 @@
+version: 0.2
+
+phases:
+  install:
+    runtime-versions:
+      nodejs: 10
+    commands:
+      - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.17.3
+      - export PATH="$HOME/.yarn/bin:$PATH"
+      - yarn
+  build:
+    commands:
+      - echo Executing unit tests
+      - yarn test
diff --git a/package.json b/package.json
@@ -11,7 +11,8 @@
     "clear-build-info": "rimraf ./packages/*/*.tsbuildinfo ./clients/*/*/*.tsbuildinfo",
     "copy-models": "node ./scripts/copyModels.js",
     "update-clients": "node ./packages/package-generator/build/cli.js import-all --matching './models/*/*/service-2.json'",
-    "pretest": "lerna run pretest --since 'HEAD^' --include-filtered-dependents --include-filtered-dependencies",
+    "build-crypto-dependencies": "lerna run --scope '@aws-sdk/types' --scope '@aws-sdk/util-utf8-browser' --scope '@aws-sdk/util-locate-window' --scope '@aws-sdk/hash-node' --include-filtered-dependencies pretest",
+    "pretest": "yarn build-crypto-dependencies && lerna run pretest --since 'master' --include-filtered-dependencies",
     "test": "jest --coverage --passWithNoTests",
     "pretest-all": "lerna run pretest",
     "test-all": "jest --coverage"
diff --git a/packages/signature-v4-browser/.gitignore b/packages/signature-v4-browser/.gitignore
@@ -2,6 +2,7 @@
 /build/
 /coverage/
 /docs/
+/dist/
 *.tsbuildinfo
 *.tgz
 *.log
diff --git a/packages/signature-v4-browser/package.json b/packages/signature-v4-browser/package.json
@@ -3,12 +3,16 @@
   "description": "A standalone AWS Signature V4 request signer for browser JavaScript",
   "version": "0.1.0-preview.6",
   "scripts": {
-    "prepublishOnly": "tsc",
+    "build:cjs": "tsc -p ./tsconfig.test.json",
+    "build:es": "tsc -p ./tsconfig.es.json",
+    "build": "yarn build:es && yarn build:cjs",
+    "prepublishOnly": "yarn build",
     "pretest": "tsc -p tsconfig.test.json",
     "test": "jest"
   },
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
+  "browser": "./dist/es/index.js",
   "author": {
     "name": "AWS SDK for JavaScript Team",
     "url": "https://aws.amazon.com/javascript/"
diff --git a/packages/signature-v4-browser/tsconfig.es.json b/packages/signature-v4-browser/tsconfig.es.json
@@ -0,0 +1,19 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "target": "es5",
+    "module": "esNext",
+    "moduleResolution": "node",
+    "lib": ["dom", "es5", "es2015.promise", "es2015.collection"],
+    "declaration": true,
+    "sourceMap": true,
+    "strict": true,
+    "stripInternal": true,
+    "rootDir": "./src",
+    "outDir": "./dist/es",
+    "importHelpers": true,
+    "noEmitHelpers": true,
+    "noUnusedLocals": true,
+    "incremental": true
+  }
+}
diff --git a/packages/signature-v4-browser/tsconfig.json b/packages/signature-v4-browser/tsconfig.json
@@ -1,11 +1,11 @@
 {
   "compilerOptions": {
-    "target": "es5",
+    "target": "es2017",
     "module": "commonjs",
     "declaration": true,
     "strict": true,
     "sourceMap": true,
-    "lib": ["dom", "es5", "es2015.promise", "es2015.collection"],
+    "stripInternal": true,
     "rootDir": "./src",
     "outDir": "./build",
     "importHelpers": true,
diff --git a/packages/signature-v4-universal/.gitignore b/packages/signature-v4-universal/.gitignore
@@ -2,6 +2,7 @@
 /build/
 /coverage/
 /docs/
+/dist/
 *.tsbuildinfo
 *.tgz
 *.log
diff --git a/packages/signature-v4-universal/package.json b/packages/signature-v4-universal/package.json
@@ -3,12 +3,16 @@
   "description": "A standalone AWS Signature V4 request signer targeting all JS environments",
   "version": "0.1.0-preview.6",
   "scripts": {
-    "prepublishOnly": "tsc",
+    "build:cjs": "tsc -p ./tsconfig.test.json",
+    "build:es": "tsc -p ./tsconfig.es.json",
+    "build": "yarn build:es && yarn build:cjs",
+    "prepublishOnly": "yarn build",
     "pretest": "tsc -p tsconfig.test.json",
     "test": "jest"
   },
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
+  "browser": "./dist/es/index.js",
   "author": {
     "name": "AWS SDK for JavaScript Team",
     "url": "https://aws.amazon.com/javascript/"
diff --git a/packages/signature-v4-universal/tsconfig.es.json b/packages/signature-v4-universal/tsconfig.es.json
@@ -0,0 +1,19 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "target": "es5",
+    "module": "esNext",
+    "moduleResolution": "node",
+    "lib": ["dom", "es5", "es2015.promise", "es2015.collection"],
+    "declaration": true,
+    "sourceMap": true,
+    "strict": true,
+    "stripInternal": true,
+    "rootDir": "./src",
+    "outDir": "./dist/es",
+    "importHelpers": true,
+    "noEmitHelpers": true,
+    "noUnusedLocals": true,
+    "incremental": true
+  }
+}
diff --git a/packages/signature-v4-universal/tsconfig.json b/packages/signature-v4-universal/tsconfig.json
@@ -1,11 +1,11 @@
 {
   "compilerOptions": {
-    "target": "es5",
+    "target": "es2017",
     "module": "commonjs",
     "declaration": true,
     "strict": true,
     "sourceMap": true,
-    "lib": ["dom", "es5", "es2015.promise", "es2015.collection"],
+    "stripInternal": true,
     "rootDir": "./src",
     "outDir": "./build",
     "importHelpers": true,
diff --git a/packages/signature-v4/.gitignore b/packages/signature-v4/.gitignore
@@ -1,5 +1,6 @@
 /node_modules/
 /build/
+/dist/
 /coverage/
 /docs/
 *.tsbuildinfo
diff --git a/packages/signature-v4/jest.config.js b/packages/signature-v4/jest.config.js
@@ -1,5 +1,6 @@
 const base = require("../../jest.config.base.js");
 
 module.exports = {
-  ...base
+  ...base,
+  testPathIgnorePatterns: ["/node_modules/", "/es/"]
 };
diff --git a/packages/signature-v4/package.json b/packages/signature-v4/package.json
@@ -3,9 +3,12 @@
   "version": "0.1.0-preview.6",
   "description": "A standalone implementation of the AWS Signature V4 request signing algorithm",
   "main": "./build/index.js",
+  "browser": "./dist/es/index.js",
   "scripts": {
-    "build": "node scripts/buildSuiteFixture.js && tsc",
-    "prepublishOnly": "npm run build",
+    "build:cjs": "tsc -p ./tsconfig.json",
+    "build:es": "tsc -p ./tsconfig.es.json",
+    "build": "node scripts/buildSuiteFixture.js && yarn build:es && yarn build:cjs",
+    "prepublishOnly": "yarn build",
     "pretest": "tsc -p tsconfig.test.json",
     "test": "jest --coverage"
   },
diff --git a/packages/signature-v4/src/SignatureV4.ts b/packages/signature-v4/src/SignatureV4.ts
@@ -152,9 +152,9 @@ export class SignatureV4
       request.query[TOKEN_QUERY_PARAM] = credentials.sessionToken;
     }
     request.query[ALGORITHM_QUERY_PARAM] = ALGORITHM_IDENTIFIER;
-    request.query[CREDENTIAL_QUERY_PARAM] = `${
-      credentials.accessKeyId
-    }/${scope}`;
+    request.query[
+      CREDENTIAL_QUERY_PARAM
+    ] = `${credentials.accessKeyId}/${scope}`;
     request.query[AMZ_DATE_QUERY_PARAM] = longDate;
     request.query[EXPIRES_QUERY_PARAM] = ttl.toString(10);
 
diff --git a/packages/signature-v4/tsconfig.es.json b/packages/signature-v4/tsconfig.es.json
@@ -0,0 +1,19 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "target": "es5",
+    "module": "esNext",
+    "moduleResolution": "node",
+    "lib": ["es5", "es2015.promise", "es2015.collection"],
+    "declaration": true,
+    "sourceMap": true,
+    "strict": true,
+    "stripInternal": true,
+    "rootDir": "./src",
+    "outDir": "./dist/es",
+    "importHelpers": true,
+    "noEmitHelpers": true,
+    "noUnusedLocals": true,
+    "incremental": true
+  }
+}
diff --git a/packages/signature-v4/tsconfig.json b/packages/signature-v4/tsconfig.json
@@ -1,8 +1,7 @@
 {
   "compilerOptions": {
-    "target": "es5",
+    "target": "es2017",
     "module": "commonjs",
-    "lib": ["es5", "es2015.promise", "es2015.collection"],
     "declaration": true,
     "sourceMap": true,
     "strict": true,
