fix: dist folder for browser/node/universal signer package

aws · Jan 13, 2020 · f42a420 · f42a420
1 parent de4795c
commit f42a420
Show file tree

Hide file tree

Showing 17 changed files with 116 additions and 118 deletions.
diff --git a/packages/signature-v4-browser/.npmignore b/packages/signature-v4-browser/.npmignore
@@ -1,6 +1,7 @@
 /src/
 /coverage/
 /docs/
+/build/
 tsconfig.test.json
 *.tsbuildinfo
 

diff --git a/packages/signature-v4-browser/jest.config.js b/packages/signature-v4-browser/jest.config.js
@@ -1,5 +1,7 @@
 const base = require("../../jest.config.base.js");
 
 module.exports = {
-  ...base
+  ...base,
+  //only test build dist, avoid testing the package twice
+  testPathIgnorePatterns: ["/node_modules/", "/dist/"]
 };
diff --git a/packages/signature-v4-browser/package.json b/packages/signature-v4-browser/package.json
@@ -3,16 +3,16 @@
   "description": "A standalone AWS Signature V4 request signer for browser JavaScript",
   "version": "1.0.0-alpha.3",
   "scripts": {
-    "build:cjs": "tsc -p ./tsconfig.test.json",
-    "build:es": "tsc -p ./tsconfig.es.json",
-    "build": "yarn build:es && yarn build:cjs",
+    "build:cjs": "tsc -p tsconfig.json",
+    "build:es": "tsc -p tsconfig.es.json",
+    "build": "yarn build:es",
     "prepublishOnly": "yarn build",
-    "pretest": "tsc -p tsconfig.test.json",
+    "pretest": "tsc -p tsconfig.json",
     "test": "jest"
   },
-  "main": "./build/index.js",
-  "types": "./build/index.d.ts",
-  "browser": "./dist/es/index.js",
+  "main": "./dist/es/index.js",
+  "types": "./dist/es/index.d.ts",
+  "module": "./dist/es/index.js",
   "author": {
     "name": "AWS SDK for JavaScript Team",
     "url": "https://aws.amazon.com/javascript/"

diff --git a/packages/signature-v4-browser/src/index.spec.ts b/packages/signature-v4-browser/src/index.spec.ts
@@ -5,7 +5,7 @@ import {
   requests,
   service,
   signingDate
-} from "@aws-sdk/signature-v4/build/suite.fixture";
+} from "@aws-sdk/signature-v4/dist/cjs/suite.fixture";
 
 /**
  * Executes the official AWS Signature Version 4 test suite.

diff --git a/packages/signature-v4-browser/tsconfig.test.json b/packages/signature-v4-browser/tsconfig.test.json
diff --git a/packages/signature-v4-node/src/index.spec.ts b/packages/signature-v4-node/src/index.spec.ts
@@ -5,7 +5,7 @@ import {
   requests,
   service,
   signingDate
-} from "@aws-sdk/signature-v4/build/suite.fixture";
+} from "@aws-sdk/signature-v4/dist/cjs/suite.fixture";
 
 /**
  * Executes the official AWS Signature Version 4 test suite.

diff --git a/packages/signature-v4-universal/.gitignore b/packages/signature-v4-universal/.gitignore
@@ -3,6 +3,7 @@
 /coverage/
 /docs/
 /dist/
+/types/
 *.tsbuildinfo
 *.tgz
 *.log

diff --git a/packages/signature-v4-universal/jest.config.js b/packages/signature-v4-universal/jest.config.js
@@ -1,5 +1,7 @@
 const base = require("../../jest.config.base.js");
 
 module.exports = {
-  ...base
+  ...base,
+  //only test cjs dist, avoid testing the package twice
+  testPathIgnorePatterns: ["/node_modules/", "/es/"]
 };
diff --git a/packages/signature-v4-universal/package.json b/packages/signature-v4-universal/package.json
@@ -3,15 +3,15 @@
   "description": "A standalone AWS Signature V4 request signer targeting all JS environments",
   "version": "1.0.0-alpha.3",
   "scripts": {
-    "build:cjs": "tsc -p ./tsconfig.test.json",
-    "build:es": "tsc -p ./tsconfig.es.json",
+    "build:cjs": "tsc -p tsconfig.json",
+    "build:es": "tsc -p tsconfig.es.json",
     "build": "yarn build:es && yarn build:cjs",
     "prepublishOnly": "yarn build",
-    "pretest": "tsc -p tsconfig.test.json",
+    "pretest": "yarn build",
     "test": "jest"
   },
-  "main": "./build/index.js",
-  "types": "./build/index.d.ts",
+  "main": "./dist/cjs/index.js",
+  "types": "./types/index.d.ts",
   "browser": "./dist/es/index.js",
   "author": {
     "name": "AWS SDK for JavaScript Team",

diff --git a/packages/signature-v4-universal/src/index.spec.ts b/packages/signature-v4-universal/src/index.spec.ts
@@ -5,7 +5,7 @@ import {
   requests,
   service,
   signingDate
-} from "@aws-sdk/signature-v4/build/suite.fixture";
+} from "@aws-sdk/signature-v4/dist/cjs/suite.fixture";
 
 /**
  * Executes the official AWS Signature Version 4 test suite.

diff --git a/packages/signature-v4-universal/tsconfig.es.json b/packages/signature-v4-universal/tsconfig.es.json
@@ -5,7 +5,8 @@
     "module": "esNext",
     "moduleResolution": "node",
     "lib": ["dom", "es5", "es2015.promise", "es2015.collection"],
-    "declaration": true,
+    "declaration": false,
+    "declarationDir": null,
     "sourceMap": true,
     "strict": true,
     "stripInternal": true,

diff --git a/packages/signature-v4-universal/tsconfig.json b/packages/signature-v4-universal/tsconfig.json
@@ -3,11 +3,12 @@
     "target": "es2017",
     "module": "commonjs",
     "declaration": true,
+    "declarationDir": "./types",
     "strict": true,
     "sourceMap": true,
     "stripInternal": true,
     "rootDir": "./src",
-    "outDir": "./build",
+    "outDir": "./dist/cjs",
     "importHelpers": true,
     "noEmitHelpers": true,
     "incremental": true

diff --git a/packages/signature-v4-universal/tsconfig.test.json b/packages/signature-v4-universal/tsconfig.test.json
diff --git a/packages/signature-v4/package.json b/packages/signature-v4/package.json
@@ -5,8 +5,8 @@
   "main": "./dist/cjs/index.js",
   "module": "./dist/es/index.js",
   "scripts": {
-    "build:cjs": "tsc -p ./tsconfig.json",
-    "build:es": "tsc -p ./tsconfig.es.json",
+    "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": "yarn build",
@@ -33,5 +33,5 @@
     "jest": "^24.7.1",
     "typescript": "~3.4.0"
   },
-  "types": "./types/index.d.ts"
+  "types": "./dist/cjs/index.d.ts"
 }