Skip to content

Commit d00c11b

Browse files
frederikprijckfrederikprijck
authored
Revert "fix: Properly configure SDK to be distributed as ESM" (#2046)
1 parent c6947e2 commit d00c11b

29 files changed

+92
-96
lines changed

‎package.json

+5-6
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"name": "@auth0/nextjs-auth0",
33
"version": "4.4.1",
44
"description": "Auth0 Next.js SDK",
5-
"type": "module",
65
"scripts": {
76
"build": "tsc",
87
"build:watch": "tsc -w",
@@ -61,19 +60,19 @@
6160
},
6261
"exports": {
6362
".": {
64-
"default": "./dist/client/index.js"
63+
"import": "./dist/client/index.js"
6564
},
6665
"./server": {
67-
"default": "./dist/server/index.js"
66+
"import": "./dist/server/index.js"
6867
},
6968
"./errors": {
70-
"default": "./dist/errors/index.js"
69+
"import": "./dist/errors/index.js"
7170
},
7271
"./types": {
73-
"default": "./dist/types/index.d.ts"
72+
"import": "./dist/types/index.d.ts"
7473
},
7574
"./testing": {
76-
"default": "./dist/testing/index.js"
75+
"import": "./dist/testing/index.js"
7776
}
7877
},
7978
"dependencies": {

‎src/client/helpers/get-access-token.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { AccessTokenError } from "../../errors/index.js";
1+
import { AccessTokenError } from "../../errors";
22

33
export async function getAccessToken() {
44
const tokenRes = await fetch(

‎src/client/hooks/use-user.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import useSWR from "swr";
44

5-
import type { User } from "../../types/index.js";
5+
import type { User } from "../../types";
66

77
export function useUser() {
88
const { data, error, isLoading } = useSWR<User, Error, string>(

‎src/client/index.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
export { useUser } from "./hooks/use-user.js";
2-
export { getAccessToken } from "./helpers/get-access-token.js";
3-
export { Auth0Provider } from "./providers/auth0-provider.js";
1+
export { useUser } from "./hooks/use-user";
2+
export { getAccessToken } from "./helpers/get-access-token";
3+
export { Auth0Provider } from "./providers/auth0-provider";

‎src/client/providers/auth0-provider.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import React from "react";
44
import { SWRConfig } from "swr";
55

6-
import { User } from "../../types/index.js";
6+
import { User } from "../../types";
77

88
export function Auth0Provider({
99
user,

‎src/server/auth-client.test.ts

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
import { NextRequest, NextResponse } from "next/server.js";
1+
import { NextRequest, NextResponse } from "next/server";
22
import * as jose from "jose";
33
import * as oauth from "oauth4webapi";
44
import { describe, expect, it, vi } from "vitest";
55

6-
import { generateSecret } from "../test/utils.js";
7-
import { SessionData } from "../types/index.js";
8-
import { AuthClient } from "./auth-client.js";
9-
import { decrypt, encrypt } from "./cookies.js";
10-
import { StatefulSessionStore } from "./session/stateful-session-store.js";
11-
import { StatelessSessionStore } from "./session/stateless-session-store.js";
12-
import { TransactionState, TransactionStore } from "./transaction-store.js";
6+
import { generateSecret } from "../test/utils";
7+
import { SessionData } from "../types";
8+
import { AuthClient } from "./auth-client";
9+
import { decrypt, encrypt } from "./cookies";
10+
import { StatefulSessionStore } from "./session/stateful-session-store";
11+
import { StatelessSessionStore } from "./session/stateless-session-store";
12+
import { TransactionState, TransactionStore } from "./transaction-store";
1313

1414
describe("Authentication Client", async () => {
1515
const DEFAULT = {

‎src/server/auth-client.ts

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { NextResponse, type NextRequest } from "next/server.js";
1+
import { NextResponse, type NextRequest } from "next/server";
22
import * as jose from "jose";
33
import * as oauth from "oauth4webapi";
44

5-
import packageJson from "../../package.json" with { type: "json" };
5+
import packageJson from "../../package.json";
66
import {
77
AccessTokenError,
88
AccessTokenErrorCode,
@@ -16,7 +16,7 @@ import {
1616
MissingStateError,
1717
OAuth2Error,
1818
SdkError
19-
} from "../errors/index.js";
19+
} from "../errors";
2020
import {
2121
AuthorizationParameters,
2222
ConnectionTokenSet,
@@ -25,16 +25,16 @@ import {
2525
SessionData,
2626
StartInteractiveLoginOptions,
2727
TokenSet
28-
} from "../types/index.js";
28+
} from "../types";
2929
import {
3030
ensureNoLeadingSlash,
3131
ensureTrailingSlash,
3232
removeTrailingSlash
33-
} from "../utils/pathUtils.js";
34-
import { toSafeRedirect } from "../utils/url-helpers.js";
35-
import { AbstractSessionStore } from "./session/abstract-session-store.js";
36-
import { TransactionState, TransactionStore } from "./transaction-store.js";
37-
import { filterClaims } from "./user.js";
33+
} from "../utils/pathUtils";
34+
import { toSafeRedirect } from "../utils/url-helpers";
35+
import { AbstractSessionStore } from "./session/abstract-session-store";
36+
import { TransactionState, TransactionStore } from "./transaction-store";
37+
import { filterClaims } from "./user";
3838

3939
export type BeforeSessionSavedHook = (
4040
session: SessionData,

‎src/server/chunked-cookies.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
RequestCookies,
88
ResponseCookies,
99
setChunkedCookie
10-
} from "./cookies.js";
10+
} from "./cookies";
1111

1212
// Create mock implementation for RequestCookies and ResponseCookies
1313
const createMocks = () => {

‎src/server/client.ts

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { IncomingMessage, ServerResponse } from "node:http";
2-
import { cookies } from "next/headers.js";
3-
import { NextRequest, NextResponse } from "next/server.js";
4-
import { NextApiRequest, NextApiResponse } from "next/types.js";
2+
import { cookies } from "next/headers";
3+
import { NextRequest, NextResponse } from "next/server";
4+
import { NextApiRequest, NextApiResponse } from "next/types";
55

66
import {
77
AccessTokenError,
@@ -10,32 +10,32 @@ import {
1010
AccessTokenForConnectionErrorCode,
1111
ConfigurationError,
1212
ConfigurationErrorCode
13-
} from "../errors/index.js";
13+
} from "../errors";
1414
import {
1515
AccessTokenForConnectionOptions,
1616
AuthorizationParameters,
1717
SessionData,
1818
SessionDataStore,
1919
StartInteractiveLoginOptions
20-
} from "../types/index.js";
20+
} from "../types";
2121
import {
2222
AuthClient,
2323
BeforeSessionSavedHook,
2424
OnCallbackHook,
2525
RoutesOptions
26-
} from "./auth-client.js";
27-
import { RequestCookies, ResponseCookies } from "./cookies.js";
26+
} from "./auth-client";
27+
import { RequestCookies, ResponseCookies } from "./cookies";
2828
import {
2929
AbstractSessionStore,
3030
SessionConfiguration,
3131
SessionCookieOptions
32-
} from "./session/abstract-session-store.js";
33-
import { StatefulSessionStore } from "./session/stateful-session-store.js";
34-
import { StatelessSessionStore } from "./session/stateless-session-store.js";
32+
} from "./session/abstract-session-store";
33+
import { StatefulSessionStore } from "./session/stateful-session-store";
34+
import { StatelessSessionStore } from "./session/stateless-session-store";
3535
import {
3636
TransactionCookieOptions,
3737
TransactionStore
38-
} from "./transaction-store.js";
38+
} from "./transaction-store";
3939

4040
export interface Auth0ClientOptions {
4141
// authorization server configuration

‎src/server/cookies.test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { describe, expect, it } from "vitest";
22

3-
import { generateSecret } from "../test/utils.js";
4-
import { decrypt, encrypt } from "./cookies.js";
3+
import { generateSecret } from "../test/utils";
4+
import { decrypt, encrypt } from "./cookies";
55

66
describe("encrypt/decrypt", async () => {
77
const secret = await generateSecret(32);

‎src/server/cookies.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {
33
RequestCookies,
44
ResponseCookies
55
} from "@edge-runtime/cookies";
6-
import { hkdf } from "@panva/hkdf";
6+
import hkdf from "@panva/hkdf";
77
import * as jose from "jose";
88

99
const ENC = "A256GCM";

‎src/server/index.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
export { Auth0Client } from "./client.js";
1+
export { Auth0Client } from "./client";
22

3-
export { AuthClient } from "./auth-client.js";
3+
export { AuthClient } from "./auth-client";
44

5-
export { TransactionStore } from "./transaction-store.js";
5+
export { TransactionStore } from "./transaction-store";
66

7-
export { AbstractSessionStore } from "./session/abstract-session-store.js";
7+
export { AbstractSessionStore } from "./session/abstract-session-store";

‎src/server/session/abstract-session-store.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import type { SessionData, SessionDataStore } from "../../types/index.js";
1+
import type { SessionData, SessionDataStore } from "../../types";
22
import {
33
CookieOptions,
44
ReadonlyRequestCookies,
55
RequestCookies,
66
ResponseCookies
7-
} from "../cookies.js";
7+
} from "../cookies";
88

99
export interface SessionCookieOptions {
1010
/**

‎src/server/session/normalize-session.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { JWTDecryptResult } from "jose";
22

3-
import { SessionData } from "../../types/index.js";
3+
import { SessionData } from "../../types";
44

55
export const LEGACY_COOKIE_NAME = "appSession";
66

‎src/server/session/stateful-session-store.test.ts

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
22

3-
import { generateSecret } from "../../test/utils.js";
4-
import { SessionData } from "../../types/index.js";
3+
import { generateSecret } from "../../test/utils";
4+
import { SessionData } from "../../types";
55
import {
66
decrypt,
77
encrypt,
88
RequestCookies,
99
ResponseCookies,
1010
sign
11-
} from "../cookies.js";
12-
import { LEGACY_COOKIE_NAME, LegacySessionPayload } from "./normalize-session.js";
13-
import { StatefulSessionStore } from "./stateful-session-store.js";
14-
11+
} from "../cookies";
12+
import { LEGACY_COOKIE_NAME, LegacySessionPayload } from "./normalize-session";
13+
import { StatefulSessionStore } from "./stateful-session-store";
1514

1615
describe("Stateful Session Store", async () => {
1716
describe("get", async () => {

‎src/server/session/stateful-session-store.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import { SessionData, SessionDataStore } from "../../types/index.js";
2-
import * as cookies from "../cookies.js";
1+
import { SessionData, SessionDataStore } from "../../types";
2+
import * as cookies from "../cookies";
33
import {
44
AbstractSessionStore,
55
SessionCookieOptions
6-
} from "./abstract-session-store.js";
6+
} from "./abstract-session-store";
77
import {
88
LEGACY_COOKIE_NAME,
99
normalizeStatefulSession
10-
} from "./normalize-session.js";
10+
} from "./normalize-session";
1111

1212
// the value of the stateful session cookie containing a unique session ID to identify
1313
// the current session

‎src/server/session/stateless-session-store.test.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
22

3-
import { generateSecret } from "../../test/utils.js";
4-
import { SessionData } from "../../types/index.js";
5-
import { decrypt, encrypt, RequestCookies, ResponseCookies } from "../cookies.js";
6-
import { LEGACY_COOKIE_NAME, LegacySession } from "./normalize-session.js";
7-
import { StatelessSessionStore } from "./stateless-session-store.js";
3+
import { generateSecret } from "../../test/utils";
4+
import { SessionData } from "../../types";
5+
import { decrypt, encrypt, RequestCookies, ResponseCookies } from "../cookies";
6+
import { LEGACY_COOKIE_NAME, LegacySession } from "./normalize-session";
7+
import { StatelessSessionStore } from "./stateless-session-store";
88

99
describe("Stateless Session Store", async () => {
1010
describe("get", async () => {

‎src/server/session/stateless-session-store.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
import { CookieOptions, ConnectionTokenSet, SessionData } from "../../types/index.js";
1+
import { CookieOptions, ConnectionTokenSet, SessionData } from "../../types";
22

33
import type { JWTPayload } from "jose";
44

5-
import * as cookies from "../cookies.js";
5+
import * as cookies from "../cookies";
66
import {
77
AbstractSessionStore,
88
SessionCookieOptions
9-
} from "./abstract-session-store.js";
9+
} from "./abstract-session-store";
1010
import {
1111
LEGACY_COOKIE_NAME,
1212
LegacySessionPayload,
1313
normalizeStatelessSession
14-
} from "./normalize-session.js";
14+
} from "./normalize-session";
1515

1616
interface StatelessSessionStoreOptions {
1717
secret: string;

‎src/server/transaction-store.test.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import * as oauth from "oauth4webapi";
22
import { describe, expect, it } from "vitest";
33

4-
import { generateSecret } from "../test/utils.js";
5-
import { decrypt, encrypt, RequestCookies, ResponseCookies } from "./cookies.js";
6-
import { TransactionState, TransactionStore } from "./transaction-store.js";
4+
import { generateSecret } from "../test/utils";
5+
import { decrypt, encrypt, RequestCookies, ResponseCookies } from "./cookies";
6+
import { TransactionState, TransactionStore } from "./transaction-store";
77

88
describe("Transaction Store", async () => {
99
describe("get", async () => {

‎src/server/transaction-store.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type * as jose from "jose";
22

3-
import * as cookies from "./cookies.js";
3+
import * as cookies from "./cookies";
44

55
const TRANSACTION_COOKIE_PREFIX = "__txn_";
66

‎src/server/user.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { describe, expect, it } from "vitest";
22

3-
import { filterClaims } from "./user.js";
3+
import { filterClaims } from "./user";
44

55
describe("filterClaims", async () => {
66
it("should return only the allowed claims", () => {

‎src/server/user.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { User } from "../types/index.js";
1+
import type { User } from "../types";
22

33
const DEFAULT_ALLOWED_CLAIMS = [
44
"sub",

‎src/testing/generate-session-cookie.test.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import { describe, expect, it } from "vitest";
22

3-
import { decrypt } from "../server/cookies.js";
4-
import { generateSecret } from "../test/utils.js";
5-
import { SessionData } from "../types/index.js";
3+
import { decrypt } from "../server/cookies";
4+
import { generateSecret } from "../test/utils";
5+
import { SessionData } from "../types";
66
import {
77
generateSessionCookie,
88
GenerateSessionCookieConfig
9-
} from "./generate-session-cookie.js";
9+
} from "./generate-session-cookie";
1010

1111
describe("generateSessionCookie", async () => {
1212
it("should use the session data provided", async () => {

‎src/testing/generate-session-cookie.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { encrypt } from "../server/cookies.js";
2-
import { SessionData } from "../types/index.js";
1+
import { encrypt } from "../server/cookies";
2+
import { SessionData } from "../types";
33

44
export type GenerateSessionCookieConfig = {
55
/**

‎src/testing/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
export {
22
GenerateSessionCookieConfig,
33
generateSessionCookie
4-
} from "./generate-session-cookie.js";
4+
} from "./generate-session-cookie";

0 commit comments

Comments
 (0)