Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/core/api-extractor.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"extends": "../../api-extractor.packages.json",
"mainEntryPointFilePath": "./src/api-extractor-type-index.d.ts"
"mainEntryPointFilePath": "./dist-types/api-extractor-type-index.d.ts"
}
24 changes: 12 additions & 12 deletions packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"description": "Core functions & classes shared by multiple AWS SDK clients.",
"scripts": {
"build": "yarn lint && concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'",
"build:cjs": "node ../../scripts/compilation/inline core",
"build:es": "tsc -p tsconfig.es.json",
"build:cjs": "node ../../scripts/compilation/inline core && rimraf ./dist-cjs/api-extractor-type-index.js",
"build:es": "tsc -p tsconfig.es.json && rimraf ./dist-es/api-extractor-type-index.js",
"build:include:deps": "lerna run --scope $npm_package_name --include-dependencies build",
"build:types": "tsc -p tsconfig.types.json",
"build:types:downlevel": "downlevel-dts dist-types dist-types/ts3.4",
Expand All @@ -22,11 +22,11 @@
"types": "./dist-types/index.d.ts",
"exports": {
".": {
"types": "./dist-types/index.d.ts",
"module": "./dist-es/index.js",
"node": "./dist-cjs/index.js",
"import": "./dist-es/index.js",
"require": "./dist-cjs/index.js",
"types": "./dist-types/index.d.ts"
"require": "./dist-cjs/index.js"
},
"./package.json": {
"module": "./package.json",
Expand All @@ -35,32 +35,32 @@
"require": "./package.json"
},
"./client": {
"types": "./dist-types/submodules/client/index.d.ts",
"module": "./dist-es/submodules/client/index.js",
"node": "./dist-cjs/submodules/client/index.js",
"import": "./dist-es/submodules/client/index.js",
"require": "./dist-cjs/submodules/client/index.js",
"types": "./dist-types/submodules/client/index.d.ts"
"require": "./dist-cjs/submodules/client/index.js"
},
"./httpAuthSchemes": {
"types": "./dist-types/submodules/httpAuthSchemes/index.d.ts",
"module": "./dist-es/submodules/httpAuthSchemes/index.js",
"node": "./dist-cjs/submodules/httpAuthSchemes/index.js",
"import": "./dist-es/submodules/httpAuthSchemes/index.js",
"require": "./dist-cjs/submodules/httpAuthSchemes/index.js",
"types": "./dist-types/submodules/httpAuthSchemes/index.d.ts"
"require": "./dist-cjs/submodules/httpAuthSchemes/index.js"
},
"./account-id-endpoint": {
"types": "./dist-types/submodules/account-id-endpoint/index.d.ts",
"module": "./dist-es/submodules/account-id-endpoint/index.js",
"node": "./dist-cjs/submodules/account-id-endpoint/index.js",
"import": "./dist-es/submodules/account-id-endpoint/index.js",
"require": "./dist-cjs/submodules/account-id-endpoint/index.js",
"types": "./dist-types/submodules/account-id-endpoint/index.d.ts"
"require": "./dist-cjs/submodules/account-id-endpoint/index.js"
},
"./protocols": {
"types": "./dist-types/submodules/protocols/index.d.ts",
"module": "./dist-es/submodules/protocols/index.js",
"node": "./dist-cjs/submodules/protocols/index.js",
"import": "./dist-es/submodules/protocols/index.js",
"require": "./dist-cjs/submodules/protocols/index.js",
"types": "./dist-types/submodules/protocols/index.d.ts"
"require": "./dist-cjs/submodules/protocols/index.js"
}
},
"files": [
Expand Down
5 changes: 0 additions & 5 deletions packages/core/src/api-extractor-type-index.d.ts

This file was deleted.

5 changes: 5 additions & 0 deletions packages/core/src/api-extractor-type-index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
export * from "./index";
export * from "./submodules/account-id-endpoint/index";
export * from "./submodules/client/index";
export * from "./submodules/httpAuthSchemes/index";
export * from "./submodules/protocols/index";
8 changes: 4 additions & 4 deletions scripts/validation/submodules-linter.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ for (const submodulePackage of submodulePackages) {
const submodulePath = path.join(root, "src", "submodules", submodule);
if (fs.existsSync(submodulePath) && fs.lstatSync(submodulePath).isDirectory()) {
// api extractor type index
const apiExtractorAggregateTypeIndexPath = path.join(root, "src", "api-extractor-type-index.d.ts");
const apiExtractorAggregateTypeIndexPath = path.join(root, "src", "api-extractor-type-index.ts");
if (fs.existsSync(apiExtractorAggregateTypeIndexPath)) {
const fileContents = fs.readFileSync(apiExtractorAggregateTypeIndexPath, "utf-8");
if (!fileContents.includes(`export * from "../dist-types/submodules/${submodule}";`)) {
if (!fileContents.includes(`export * from "./submodules/${submodule}/index";`)) {
fs.writeFileSync(
apiExtractorAggregateTypeIndexPath,
fileContents + `export * from "../dist-types/submodules/${submodule}";`
fileContents + `export * from "./submodules/${submodule}/index";`
);
errors.push(`${submodule} not exported from src/api-extractor-type-index.d.ts`);
}
Expand All @@ -39,11 +39,11 @@ for (const submodulePackage of submodulePackages) {
if (!pkgJson.exports[`./${submodule}`]) {
errors.push(`${submodule} submodule is missing exports statement in package.json`);
pkgJson.exports[`./${submodule}`] = {
types: `./dist-types/submodules/${submodule}/index.d.ts`,
module: `./dist-es/submodules/${submodule}/index.js`,
node: `./dist-cjs/submodules/${submodule}/index.js`,
import: `./dist-es/submodules/${submodule}/index.js`,
require: `./dist-cjs/submodules/${submodule}/index.js`,
types: `./dist-types/submodules/${submodule}/index.d.ts`,
};
fs.writeFileSync(path.join(root, "package.json"), JSON.stringify(pkgJson, null, 2) + "\n");
}
Expand Down
Loading