Merge pull request #780 from wheresrhys/rhys/mts-compat

Fix .mts imports

.circleci/config.yml

@@ -93,14 +93,11 @@ jobs:
       - *workspace
       - run: npm run build
       - run: npm run test:jest
-  import-compat:
+  module-compat:
     <<: *nodelts
     steps:
       - *workspace
-      - run: npm run compat:ts:cjs -w import-compat
-      - run: npm run compat:js:cjs -w import-compat
-      - run: npm run compat:ts:esm -w import-compat
-      - run: npm run compat:js:esm -w import-compat
+      - run: npm run compat:module
   # chrome:
   #   <<: *browsers
   #   steps:
@@ -156,7 +153,7 @@ workflows:
       - jest:
           <<: *triggerable-by-tag
           <<: *run-after-first-jobs
-      - import-compat:
+      - module-compat:
           <<: *triggerable-by-tag
           requires:
             - build
@@ -172,7 +169,7 @@ workflows:
             # - chrome
             # - firefox
             - build
-            # - import-compat
+            - module-compat
             - typelint
             - commonjs
             - jest

import-compat/package.json

@@ -2,9 +2,14 @@
   "name": "fetch-mock-compat-tests",
   "version": "1.0.0",
   "scripts": {
-    "compat:ts:esm": "tsc ts-esm.ts --target esnext --moduleResolution nodenext --module nodenext && node ts-esm.js",
-    "compat:ts:cjs": "tsc ts-cjs.ts  --target esnext --moduleResolution nodenext --module nodenext && node ts-cjs.js",
-    "compat:js:esm": "cp ts-esm.ts js-esm.mjs && node js-esm.mjs",
-    "compat:js:cjs": "cp ts-cjs.ts js-cjs.js && node js-cjs.js"
+    "compat:mts:esm": "tsc ts-esm.mts --target esnext --moduleResolution nodenext --module nodenext && node ts-esm.mjs || echo \"\\033[0;31mfailed mts:esm\\033[0m\"",
+    "compat:ts:esm": "tsc ts-esm.ts --target esnext --moduleResolution nodenext --module nodenext && node ts-esm.js || echo \"\\033[0;31mfailed ts:esm\\033[0m\"",
+    "compat:ts:cjs": "tsc ts-cjs.ts  --target esnext --moduleResolution nodenext --module nodenext && node ts-cjs.js || echo \"\\033[0;31mfailed ts:cjs\\033[0m\"",
+    "compat:js:esm": "cp ts-esm.ts js-esm.mjs && node js-esm.mjs || echo \"\\033[0;31mfailed js:esm\\033[0m\"",
+    "compat:js:cjs": "cp ts-cjs.ts js-cjs.js && node js-cjs.js || echo \"\\033[0;31mfailed js:cjs\\033[0m\"",
+    "compat:module": "npm run compat:mts:esm && npm run compat:ts:esm && npm run compat:ts:cjs && npm run compat:js:esm && npm run compat:js:cjs"
   }
 }
+
+
+

import-compat/ts-esm.mts

@@ -0,0 +1,7 @@
+import fetchMockCore, {FetchMock} from "@fetch-mock/core";
+fetchMockCore.route("http://example.com", 200);
+
+new FetchMock({})
+
+import fetchMock from "fetch-mock";
+fetchMock.mock("http://example.com", 200);

package.json

@@ -37,7 +37,8 @@
     "test": "vitest --ui .",
     "test:coverage": "vitest run --coverage ./packages/**/src/__tests__",
     "test:jest": "jest ./packages/fetch-mock/test/framework-compat/jest.spec.js",
-    "coverage:send": "cat ./coverage/lcov.info | coveralls"
+    "coverage:send": "cat ./coverage/lcov.info | coveralls",
+    "compat:module": "npm run compat:module -w import-compat"
   },
   "devDependencies": {
     "@commitlint/cli": "^19.3.0",
@@ -64,6 +65,7 @@
     "lint-staged": "^15.2.7",
     "prettier": "^3.1.1",
     "rollup": "^4.9.1",
+    "rollup-plugin-copy": "^3.5.0",
     "ts-to-jsdoc": "^2.1.0",
     "typescript": "^5.5.3",
     "v8": "^0.1.0",

packages/core/package.json

@@ -5,11 +5,17 @@
   "main": "./dist/commonjs.js",
   "module": "./src/index.js",
   "exports": {
-    "types": "./types/index.d.ts",
     "browser": "./src/index.js",
-    "import": "./src/index.js",
-    "require": "./dist/commonjs.js"
+    "import": {
+      "default": "./src/index.js",
+      "types": "./types/index.d.ts"
+    },
+    "require": {
+      "types": "./dist/types/index.d.ts",
+      "default": "./dist/commonjs.js"
+    }
   },
+  "type": "module",
   "types": "./types/index.d.ts",
   "scripts": {
     "build": "rollup -c"

packages/fetch-mock/package.json

@@ -5,12 +5,18 @@
   "main": "./dist/commonjs.js",
   "module": "./src/index.js",
   "exports": {
-    "types": "./types/index.d.ts",
     "browser": "./src/index.js",
-    "import": "./src/index.js",
-    "require": "./dist/commonjs.js"
+    "import": {
+      "default": "./src/index.js",
+      "types": "./types/index.d.ts"
+    },
+    "require": {
+      "types": "./dist/types/index.d.ts",
+      "default": "./dist/commonjs.js"
+    }
   },
   "types": "./types/index.d.ts",
+  "type": "module",
   "scripts": {
     "build": "rollup -c"
   },

shared-rollup.config.js

@@ -1,5 +1,20 @@
 import { nodeResolve } from '@rollup/plugin-node-resolve';
 import commonjs from '@rollup/plugin-commonjs';
+import copy from 'rollup-plugin-copy';
+import { writeFile, mkdir } from 'fs/promises';
+
+function createCommonJsPackage() {
+	const pkg = { type: 'commonjs' };
+
+	return {
+		name: 'cjs-package',
+		buildEnd: async () => {
+			await mkdir('./dist', { recursive: true });
+			await writeFile('./dist/package.json', JSON.stringify(pkg, null, 2));
+		},
+	};
+}
+
 export default {
 	input: './src/index.js',
 	output: {
@@ -14,5 +29,14 @@ export default {
 		// sourcemaps(),
 		// builtins(),
 		// globals(),
+		copy({
+			targets: [
+				{
+					src: './types/*.d.ts',
+					dest: 'dist/types',
+				},
+			],
+		}),
+		createCommonJsPackage(),
 	],
 };