Skip to content
This repository has been archived by the owner on Nov 12, 2024. It is now read-only.

Commit

Permalink
Revert to ESM-only
Browse files Browse the repository at this point in the history
  • Loading branch information
htunnicliff committed Sep 10, 2024
1 parent a069e0f commit 3495eef
Show file tree
Hide file tree
Showing 12 changed files with 42 additions and 97 deletions.
61 changes: 12 additions & 49 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "swr-openapi",
"type": "commonjs",
"type": "module",
"version": "5.0.0-rc.7",
"description": "Generate SWR hooks from OpenAPI schemas",
"license": "MIT",
Expand All @@ -15,63 +15,26 @@
"engines": {
"node": ">=18"
},
"main": "dist/index.js",
"module": "dist/esm/index.mjs",
"exports": {
".": {
"import": {
"types": "./dist/esm/index.d.mts",
"default": "./dist/esm/index.mjs"
},
"module": "./dist/esm/index.mjs",
"require": {
"types": "./dist/index.d.ts",
"default": "./dist/index.js"
}
"types": "./dist/index.d.ts",
"import": "./dist/index.js"
},
"./immutable": {
"import": {
"types": "./dist/esm/immutable.d.mts",
"default": "./dist/esm/immutable.mjs"
},
"module": "./dist/esm/immutable.mjs",
"require": {
"types": "./dist/immutable.d.ts",
"default": "./dist/immutable.js"
}
"types": "./dist/immutable.d.ts",
"import": "./dist/immutable.js"
},
"./infinite": {
"import": {
"types": "./dist/esm/infinite.d.mts",
"default": "./dist/esm/infinite.mjs"
},
"module": "./dist/esm/infinite.mjs",
"require": {
"types": "./dist/infinite.d.ts",
"default": "./dist/infinite.js"
}
"types": "./dist/infinite.d.ts",
"import": "./dist/infinite.js"
},
"./mutate": {
"import": {
"types": "./dist/esm/mutate.d.mts",
"default": "./dist/esm/mutate.mjs"
},
"module": "./dist/esm/mutate.mjs",
"require": {
"types": "./dist/mutate.d.ts",
"default": "./dist/mutate.js"
}
"types": "./dist/mutate.d.ts",
"import": "./dist/mutate.js"
},
"./query": {
"import": {
"types": "./dist/esm/query.d.mts",
"default": "./dist/esm/query.mjs"
},
"module": "./dist/esm/query.mjs",
"require": {
"types": "./dist/query.d.ts",
"default": "./dist/query.js"
}
"types": "./dist/query.d.ts",
"import": "./dist/query.js"
}
},
"sideEffects": false,
Expand Down Expand Up @@ -99,7 +62,7 @@
"types:check": "tsc --noEmit",
"format": "prettier --write .",
"format:check": "prettier --check .",
"exports:check": "attw --pack . --ignore-rules=no-resolution"
"exports:check": "attw --pack . --ignore-rules no-resolution --ignore-rules cjs-resolves-to-esm"
},
"dependencies": {
"openapi-typescript-helpers": "0.0.13",
Expand Down
2 changes: 1 addition & 1 deletion src/__test__/immutable.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import useSWRImmutable from "swr/immutable";
import { describe, expect, it, vi } from "vitest";
import * as QueryBase from "../query-base";
import * as QueryBase from "../query-base.js";

vi.mock("../query-base.js");
const { configureBaseQueryHook } = vi.mocked(QueryBase);
Expand Down
4 changes: 2 additions & 2 deletions src/__test__/infinite.test.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import createClient from "openapi-fetch";
import * as SWRInfinite from "swr/infinite";
import { afterEach, describe, expect, it, vi } from "vitest";
import type { paths } from "./fixtures/petstore";
import { createInfiniteHook } from "../infinite";
import type { paths } from "./fixtures/petstore.js";
import { createInfiniteHook } from "../infinite.js";

// Mock `useSWRInfinite`
vi.mock("swr/infinite");
Expand Down
4 changes: 2 additions & 2 deletions src/__test__/mutate.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import * as React from "react";
import * as SWR from "swr";
import type { ScopedMutator } from "swr/_internal";
import { afterEach, describe, expect, it, vi } from "vitest";
import { createMutateHook } from "../mutate";
import type { paths } from "./fixtures/petstore";
import { createMutateHook } from "../mutate.js";
import type { paths } from "./fixtures/petstore.js";
import { isMatch } from "lodash";

// Mock `useCallback` (return given function as-is)
Expand Down
4 changes: 2 additions & 2 deletions src/__test__/query-base.test.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import createClient from "openapi-fetch";
import * as SWR from "swr";
import { afterEach, describe, expect, it, vi } from "vitest";
import type { paths } from "./fixtures/petstore";
import { configureBaseQueryHook } from "../query-base";
import type { paths } from "./fixtures/petstore.js";
import { configureBaseQueryHook } from "../query-base.js";

// Mock `useSWR`
vi.mock("swr");
Expand Down
2 changes: 1 addition & 1 deletion src/__test__/query.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { describe, expect, it, vi } from "vitest";
import * as QueryBase from "../query-base";
import * as QueryBase from "../query-base.js";
import useSWR from "swr";

vi.mock("../query-base.js");
Expand Down
2 changes: 1 addition & 1 deletion src/immutable.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import useSWRImmutable from "swr/immutable";
import { configureBaseQueryHook } from "./query-base";
import { configureBaseQueryHook } from "./query-base.js";

/**
* ```ts
Expand Down
5 changes: 0 additions & 5 deletions src/index.mts

This file was deleted.

7 changes: 5 additions & 2 deletions src/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
export * from "./query";
export * from "./types";
export * from "./immutable.js";
export * from "./infinite.js";
export * from "./mutate.js";
export * from "./query.js";
export * from "./types.js";
2 changes: 1 addition & 1 deletion src/query.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import useSWR from "swr";
import { configureBaseQueryHook } from "./query-base";
import { configureBaseQueryHook } from "./query-base.js";

/**
* ```ts
Expand Down
3 changes: 2 additions & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
"strict": true,
"noUncheckedIndexedAccess": true,
"noImplicitOverride": true,
"module": "Preserve",
"module": "Node16",
"moduleResolution": "Node16",
"noEmit": true
},
"exclude": ["dist/"]
Expand Down
43 changes: 13 additions & 30 deletions tsup.config.ts
Original file line number Diff line number Diff line change
@@ -1,33 +1,16 @@
import { defineConfig, type Options } from "tsup";
import { defineConfig } from "tsup";

const shared: Options = {
export default defineConfig({
entryPoints: [
"src/index.ts",
"src/immutable.ts",
"src/infinite.ts",
"src/mutate.ts",
"src/query.ts",
],
format: "esm",
outDir: "dist",
dts: true,
clean: true,
};

export default defineConfig([
{
entryPoints: [
"src/index.ts",
"src/immutable.ts",
"src/infinite.ts",
"src/mutate.ts",
"src/query.ts",
],
format: "cjs",
outDir: "dist",
...shared,
},
{
entryPoints: [
"src/index.ts",
"src/immutable.ts",
"src/infinite.ts",
"src/mutate.ts",
"src/query.ts",
],
format: "esm",
outDir: "dist/esm",
...shared,
},
]);
sourcemap: true,
});

0 comments on commit 3495eef

Please sign in to comment.