Skip to content

Commit 8f0ff65

Browse files
authored
Merge pull request #7 from WTW-IM/correct-useScriptLoader-type-export
Fix: exporting correct type for useScriptLoader
2 parents 655ad74 + dbd49b6 commit 8f0ff65

File tree

7 files changed

+36
-8
lines changed

7 files changed

+36
-8
lines changed

.eslintrc.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,12 @@ module.exports = {
2929
},
3030
},
3131
extends: baseExtends,
32-
ignorePatterns: ["dist/**/*", "jest.config*"],
32+
ignorePatterns: [
33+
"dist/**/*",
34+
"jest.config*",
35+
"useScriptLoader/index.d.ts",
36+
"scriptloader-support/index.d.ts",
37+
],
3338
env: { es6: true },
3439
parserOptions: { ecmaVersion: 2021, sourceType: "module" },
3540
overrides: [

package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@
1212
],
1313
"scripts": {
1414
"test": "eslint --quiet . && tsc --noEmit --project ./tsconfig.json && jest",
15-
"build": "tsc --project ./tsconfig.json",
15+
"build": "npm run build:base && npm run build:useScriptLoader && npm run build:scriptloader-support",
16+
"build:base": "tsc --project ./tsconfig.json",
17+
"build:useScriptLoader": "tsc --project ./useScriptLoader/tsconfig.json",
18+
"build:scriptloader-support": "tsc --project ./scriptloader-support/tsconfig.json",
1619
"prepack": "npm run build"
1720
},
1821
"repository": {

scriptloader-support/index.d.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
export * from "../src/scriptloader-support";
1+
export = supportExports;
2+
import supportExports = require("../dist/scriptloader-support");

scriptloader-support/tsconfig.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"extends": "../tsconfig.json",
3+
"include": ["./index.js"],
4+
"exclude": [],
5+
"compilerOptions": {
6+
"emitDeclarationOnly": true,
7+
"rootDir": "./",
8+
"outDir": "./"
9+
}
10+
}

src/hooks/useScriptLoader.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export interface ScriptLoader {
1111
(config: ScriptLoaderConfiguration): void;
1212
}
1313

14-
const useScriptLoader: ScriptLoader = (config) => {
14+
export default (function useScriptLoader(config) {
1515
const {
1616
source,
1717
onSuccess,
@@ -40,6 +40,4 @@ const useScriptLoader: ScriptLoader = (config) => {
4040
};
4141
void waitForSource();
4242
}, [source, successFunc, errorFunc]);
43-
};
44-
45-
export default useScriptLoader;
43+
} as ScriptLoader);

useScriptLoader/index.d.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
export * from "../src/hooks/useScriptLoader";
1+
export = useScriptLoaderExports;
2+
import useScriptLoaderExports = require("../dist/hooks/useScriptLoader");

useScriptLoader/tsconfig.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"extends": "../tsconfig.json",
3+
"include": ["./index.js"],
4+
"exclude": [],
5+
"compilerOptions": {
6+
"emitDeclarationOnly": true,
7+
"rootDir": "./",
8+
"outDir": "./"
9+
}
10+
}

0 commit comments

Comments
 (0)