diff --git a/package.json b/package.json index 57afa48..cf99ab3 100644 --- a/package.json +++ b/package.json @@ -3,13 +3,18 @@ "version": "1.0.0", "description": "Authentication library for use with SvelteKit featuring built-in OAuth providers and zero restriction customization!", "main": "dist/index.js", + "types": "dist/index.d.ts", + "exports": { + ".": "./dist/index.js", + "./client": "./dist/client/index.js", + "./providers": "./dist/providers/index.js" + }, "files": [ "dist", "client", "providers", "README.md" ], - "types": "dist/index.d.ts", "scripts": { "build": "rollup --config", "dev": "rollup --watch", @@ -50,7 +55,6 @@ "eslint-config-prettier": "^8.3.0", "prettier": "^2.3.0", "rollup": "^2.48.0", - "rollup-plugin-dts": "^3.0.2", "rollup-plugin-multi-input": "^1.3.0", "rollup-plugin-peer-deps-external": "^2.2.4", "svelte": "^3.38.2", diff --git a/rollup.config.js b/rollup.config.js index 1c53cef..e7f2034 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -3,7 +3,6 @@ import resolve from "@rollup/plugin-node-resolve"; import commonjs from "@rollup/plugin-commonjs"; import typescript from "@rollup/plugin-typescript"; import multiInput from "rollup-plugin-multi-input"; -import dts from "rollup-plugin-dts"; // this override is needed because Module format cjs does not support top-level await // eslint-disable-next-line @typescript-eslint/no-var-requires @@ -34,19 +33,4 @@ export default [ ], external: Object.keys(globals), }, - { - input: "dist/types/index.d.ts", - output: [{ file: "dist/index.d.ts", format: "es" }], - plugins: [dts()], - }, - { - input: "dist/types/client/index.d.ts", - output: [{ file: "dist/client/index.d.ts", format: "es" }], - plugins: [dts()], - }, - { - input: "dist/types/providers/index.d.ts", - output: [{ file: "dist/providers/index.d.ts", format: "es" }], - plugins: [dts()], - }, ]; diff --git a/tsconfig.json b/tsconfig.json index 688fec2..444fb27 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -6,7 +6,6 @@ "moduleResolution": "node", "noImplicitAny": false, "declaration": true, - "declarationDir": "./dist/types", "removeComments": true, "emitDecoratorMetadata": true, "experimentalDecorators": true, @@ -14,7 +13,8 @@ "esModuleInterop": true, "allowSyntheticDefaultImports": true, "sourceMap": true, - "baseUrl": "./" + "baseUrl": "./", + "outDir": "./dist" }, "include": ["src/**/*"], "exclude": ["**/node_modules", "**/dist", "./app", "**/*.md", "**/rollup.config.js"] diff --git a/yarn.lock b/yarn.lock index 1b2193c..02984d8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9,19 +9,12 @@ dependencies: "@babel/highlight" "^7.10.4" -"@babel/code-frame@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658" - integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g== - dependencies: - "@babel/highlight" "^7.12.13" - "@babel/helper-validator-identifier@^7.14.0": version "7.14.0" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz#d26cad8a47c65286b15df1547319a5d0bcf27288" integrity sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A== -"@babel/highlight@^7.10.4", "@babel/highlight@^7.12.13": +"@babel/highlight@^7.10.4": version "7.14.0" resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.0.tgz#3197e375711ef6bf834e67d0daec88e4f46113cf" integrity sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg== @@ -1156,15 +1149,6 @@ rimraf@^3.0.2: dependencies: glob "^7.1.3" -rollup-plugin-dts@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/rollup-plugin-dts/-/rollup-plugin-dts-3.0.2.tgz#2b628d88f864d271d6eaec2e4c2a60ae4e944c5c" - integrity sha512-hswlsdWu/x7k5pXzaLP6OvKRKcx8Bzprksz9i9mUe72zvt8LvqAb/AZpzs6FkLgmyRaN8B6rUQOVtzA3yEt9Yw== - dependencies: - magic-string "^0.25.7" - optionalDependencies: - "@babel/code-frame" "^7.12.13" - rollup-plugin-multi-input@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/rollup-plugin-multi-input/-/rollup-plugin-multi-input-1.3.0.tgz#b4e765486281584caad6210d8ac662b94f1ecfd7"