Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: use a common tsconfig for the monorepo #1297

Merged
merged 13 commits into from
Jul 2, 2020
Merged

feat: use a common tsconfig for the monorepo #1297

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b385a0a
feat: add common root tsconfig for es and cjs builds
alexforsyth Jun 25, 2020
ecf2891
feat: apply common root tsconfig to a single package
alexforsyth Jun 25, 2020
69b3972
feat: propagate common tsconfig to interesting packages
alexforsyth Jun 25, 2020
db9c880
feat: propogate common tsconfig to all packages
alexforsyth Jun 25, 2020
ae34c51
Update tsconfig.json
alexforsyth Jun 29, 2020
5b656d8
feat: dist outdir applied to one package
alexforsyth Jun 30, 2020
ca64ceb
feat: auto-convert-one
alexforsyth Jul 1, 2020
3052624
feat: propagate changes across packages
alexforsyth Jul 1, 2020
4118bb3
Merge branch 'aforsyth/root-tsconfig' of github.com:aws/aws-sdk-js-v3…
alexforsyth Jul 1, 2020
0febcdc
Merge branch 'master' into aforsyth/root-tsconfig
alexforsyth Jul 1, 2020
366eb62
feat: convert karma-credential-loader
alexforsyth Jul 1, 2020
7995bb8
Update .gitignore to ignore build and build-es
alexforsyth Jul 1, 2020
3ff565a
fix: update tsconfig to reflect protocol tests
alexforsyth Jul 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ package-lock.json

!serviceModels/logs
build
build-es
alexforsyth marked this conversation as resolved.
Show resolved Hide resolved

.idea/
*.iml
Expand Down
2 changes: 1 addition & 1 deletion jest.config.base.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module.exports = {
// remove testMatch once we move to ts-jest
testMatch: ["**/__tests__/**/*.js?(x)", "**/?(*.)+(spec|test).js?(x)"]
testMatch: ["**/__tests__/**/*.js?(x)", "**/build/?(*.)+(spec|test).js?(x)"]
};
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"generate-clients": "node ./scripts/generate-clients",
"bootstrap": "yarn",
"clean": "yarn clear-build-cache && yarn clear-build-info && lerna clean",
"clear-build-cache": "rimraf ./packages/*/build/* ./clients/*/*/build/*",
"clear-build-cache": "rimraf ./packages/*/build ./packages/*/build-es ./clients/*/dist",
"clear-build-info": "rimraf ./packages/*/*.tsbuildinfo ./clients/*/*/*.tsbuildinfo",
"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-dependencies pretest",
"build:protocols": "yarn build:crypto-dependencies && lerna run --scope '@aws-sdk/aws-*' --include-dependencies pretest",
Expand Down
6 changes: 4 additions & 2 deletions packages/abort-controller/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@
"main": "./build/index.js",
"types": "./build/index.d.ts",
"scripts": {
"prepublishOnly": "tsc",
"pretest": "tsc -p tsconfig.test.json",
"prepublishOnly": "yarn build:cjs",
alexforsyth marked this conversation as resolved.
Show resolved Hide resolved
"pretest": "yarn build:cjs && yarn build:es",
alexforsyth marked this conversation as resolved.
Show resolved Hide resolved
"build:cjs": "tsc -p tsconfig.cjs.json",
"build:es": "tsc -p tsconfig.es.json",
"test": "jest"
},
"author": {
Expand Down
12 changes: 7 additions & 5 deletions packages/abort-controller/tsconfig.json → packages/abort-controller/tsconfig.cjs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
{
"compilerOptions": {
"module": "commonjs",
"target": "es5",
"lib": ["es5", "es2015.collection"],
"strict": true,
"sourceMap": true,
"sourceMap": false,
"declaration": true,
"stripInternal": true,
"rootDir": "./src",
"outDir": "./build",
alexforsyth marked this conversation as resolved.
Show resolved Hide resolved
"importHelpers": true,
"noEmitHelpers": true,
"incremental": true
}
"inlineSourceMap": true,
"inlineSources": true,
"baseUrl": "."
},
"extends": "../../tsconfig.cjs.json",
"include": ["src/"]
}
18 changes: 18 additions & 0 deletions packages/abort-controller/tsconfig.es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"compilerOptions": {
"lib": ["es5", "es2015.collection"],
"strict": true,
"sourceMap": false,
"declaration": true,
"stripInternal": true,
"rootDir": "./src",
"outDir": "./build-es",
"importHelpers": true,
"noEmitHelpers": true,
"inlineSourceMap": true,
"inlineSources": true,
"baseUrl": "."
},
"extends": "../../tsconfig.es.json",
"include": ["src/"]
}
11 changes: 0 additions & 11 deletions packages/abort-controller/tsconfig.test.json
View file
Open in desktop

This file was deleted.

6 changes: 4 additions & 2 deletions packages/body-checksum-browser/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@
"name": "@aws-sdk/body-checksum-browser",
"version": "1.0.0-gamma.1",
"scripts": {
"prepublishOnly": "tsc",
"pretest": "tsc -p tsconfig.test.json",
"prepublishOnly": "yarn build:cjs",
"pretest": "yarn build:cjs && yarn build:es",
"build:cjs": "tsc -p tsconfig.cjs.json",
"build:es": "tsc -p tsconfig.es.json",
"test": "jest"
},
"main": "./build/index.js",
Expand Down
12 changes: 7 additions & 5 deletions packages/chunked-blob-reader/tsconfig.json → ...s/body-checksum-browser/tsconfig.cjs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
{
"compilerOptions": {
"target": "es5",
"module": "commonjs",
"declaration": true,
"strict": true,
"sourceMap": true,
"sourceMap": false,
"downlevelIteration": true,
"importHelpers": true,
"noEmitHelpers": true,
Expand All @@ -18,6 +16,10 @@
],
"rootDir": "./src",
"outDir": "./build",
"incremental": true
}
"inlineSourceMap": true,
"inlineSources": true,
"baseUrl": "."
},
"extends": "../../tsconfig.cjs.json",
"include": ["src/"]
}
25 changes: 25 additions & 0 deletions packages/body-checksum-browser/tsconfig.es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"compilerOptions": {
"declaration": true,
"strict": true,
"sourceMap": false,
"downlevelIteration": true,
"importHelpers": true,
"noEmitHelpers": true,
"lib": [
"dom",
"es5",
"es2015.promise",
"es2015.collection",
"es2015.iterable",
"es2015.symbol.wellknown"
],
"rootDir": "./src",
"outDir": "./build-es",
"inlineSourceMap": true,
"inlineSources": true,
"baseUrl": "."
},
"extends": "../../tsconfig.es.json",
"include": ["src/"]
}
11 changes: 0 additions & 11 deletions packages/body-checksum-browser/tsconfig.test.json
View file
Open in desktop

This file was deleted.

6 changes: 4 additions & 2 deletions packages/body-checksum-node/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@
"name": "@aws-sdk/body-checksum-node",
"version": "1.0.0-gamma.1",
"scripts": {
"prepublishOnly": "tsc",
"pretest": "tsc -p tsconfig.test.json",
"prepublishOnly": "yarn build:cjs",
"pretest": "yarn build:cjs && yarn build:es",
"build:cjs": "tsc -p tsconfig.cjs.json",
"build:es": "tsc -p tsconfig.es.json",
"test": "jest"
},
"main": "./build/index.js",
Expand Down
12 changes: 7 additions & 5 deletions packages/body-checksum-node/tsconfig.json → ...ages/body-checksum-node/tsconfig.cjs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
{
"compilerOptions": {
"target": "es5",
"module": "commonjs",
"declaration": true,
"strict": true,
"sourceMap": true,
"sourceMap": false,
"downlevelIteration": true,
"importHelpers": true,
"noEmitHelpers": true,
Expand All @@ -17,6 +15,10 @@
],
"rootDir": "./src",
"outDir": "./build",
"incremental": true
}
"inlineSourceMap": true,
"inlineSources": true,
"baseUrl": "."
},
"extends": "../../tsconfig.cjs.json",
"include": ["src/"]
}
24 changes: 24 additions & 0 deletions packages/body-checksum-node/tsconfig.es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"compilerOptions": {
"declaration": true,
"strict": true,
"sourceMap": false,
"downlevelIteration": true,
"importHelpers": true,
"noEmitHelpers": true,
"lib": [
"es5",
"es2015.promise",
"es2015.collection",
"es2015.iterable",
"es2015.symbol.wellknown"
],
"rootDir": "./src",
"outDir": "./build-es",
"inlineSourceMap": true,
"inlineSources": true,
"baseUrl": "."
},
"extends": "../../tsconfig.es.json",
"include": ["src/"]
}
11 changes: 0 additions & 11 deletions packages/body-checksum-node/tsconfig.test.json
View file
Open in desktop

This file was deleted.

6 changes: 4 additions & 2 deletions packages/chunked-blob-reader-native/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@
"name": "@aws-sdk/chunked-blob-reader-native",
"version": "1.0.0-gamma.1",
"scripts": {
"prepublishOnly": "tsc",
"pretest": "tsc -p tsconfig.test.json",
"prepublishOnly": "yarn build:cjs",
"pretest": "yarn build:cjs && yarn build:es",
"build:cjs": "tsc -p tsconfig.cjs.json",
"build:es": "tsc -p tsconfig.es.json",
"test": "jest"
},
"main": "./build/index.js",
Expand Down
12 changes: 7 additions & 5 deletions packages/hash-blob-browser/tsconfig.json → ...nked-blob-reader-native/tsconfig.cjs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
{
"compilerOptions": {
"target": "es5",
"module": "commonjs",
"declaration": true,
"strict": true,
"sourceMap": true,
"sourceMap": false,
"downlevelIteration": true,
"importHelpers": true,
"noEmitHelpers": true,
Expand All @@ -18,6 +16,10 @@
],
"rootDir": "./src",
"outDir": "./build",
"incremental": true
}
"inlineSourceMap": true,
"inlineSources": true,
"baseUrl": "."
},
"extends": "../../tsconfig.cjs.json",
"include": ["src/"]
}
25 changes: 25 additions & 0 deletions packages/chunked-blob-reader-native/tsconfig.es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"compilerOptions": {
"declaration": true,
"strict": true,
"sourceMap": false,
"downlevelIteration": true,
"importHelpers": true,
"noEmitHelpers": true,
"lib": [
"dom",
"es5",
"es2015.promise",
"es2015.collection",
"es2015.iterable",
"es2015.symbol.wellknown"
],
"rootDir": "./src",
"outDir": "./build-es",
"inlineSourceMap": true,
"inlineSources": true,
"baseUrl": "."
},
"extends": "../../tsconfig.es.json",
"include": ["src/"]
}
11 changes: 0 additions & 11 deletions packages/chunked-blob-reader-native/tsconfig.test.json
View file
Open in desktop

This file was deleted.

6 changes: 4 additions & 2 deletions packages/chunked-blob-reader/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@
"name": "@aws-sdk/chunked-blob-reader",
"version": "1.0.0-gamma.1",
"scripts": {
"prepublishOnly": "tsc",
"pretest": "tsc -p tsconfig.test.json",
"prepublishOnly": "yarn build:cjs",
"pretest": "yarn build:cjs && yarn build:es",
"build:cjs": "tsc -p tsconfig.cjs.json",
"build:es": "tsc -p tsconfig.es.json",
"test": "jest"
},
"main": "./build/index.js",
Expand Down
12 changes: 7 additions & 5 deletions packages/body-checksum-browser/tsconfig.json → ...ges/chunked-blob-reader/tsconfig.cjs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
{
"compilerOptions": {
"target": "es5",
"module": "commonjs",
"declaration": true,
"strict": true,
"sourceMap": true,
"sourceMap": false,
"downlevelIteration": true,
"importHelpers": true,
"noEmitHelpers": true,
Expand All @@ -18,6 +16,10 @@
],
"rootDir": "./src",
"outDir": "./build",
"incremental": true
}
"inlineSourceMap": true,
"inlineSources": true,
"baseUrl": "."
},
"extends": "../../tsconfig.cjs.json",
"include": ["src/"]
}
25 changes: 25 additions & 0 deletions packages/chunked-blob-reader/tsconfig.es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"compilerOptions": {
"declaration": true,
"strict": true,
"sourceMap": false,
"downlevelIteration": true,
"importHelpers": true,
"noEmitHelpers": true,
"lib": [
"dom",
"es5",
"es2015.promise",
"es2015.collection",
"es2015.iterable",
"es2015.symbol.wellknown"
],
"rootDir": "./src",
"outDir": "./build-es",
"inlineSourceMap": true,
"inlineSources": true,
"baseUrl": "."
},
"extends": "../../tsconfig.es.json",
"include": ["src/"]
}
11 changes: 0 additions & 11 deletions packages/chunked-blob-reader/tsconfig.test.json
View file
Open in desktop

This file was deleted.

Loading