fix: update pkg-dir

kshutkin · Nov 7, 2023 · 97df1b6 · 97df1b6
1 parent 0c02fd6
commit 97df1b6
Show file tree

Hide file tree

Showing 13 changed files with 104 additions and 45 deletions.
diff --git a/.changeset/blue-shirts-reply.md b/.changeset/blue-shirts-reply.md
@@ -0,0 +1,5 @@
+---
+"@rollup-extras/plugin-externals": patch
+---
+
+update pkg-dir
diff --git a/plugin-angularjs-template-cache/package.json b/plugin-angularjs-template-cache/package.json
@@ -9,12 +9,13 @@
   "module": "./dist/index.mjs",
   "exports": {
     ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.mjs",
       "require": "./dist/index.cjs",
       "default": "./dist/index.mjs"
     },
     "./package.json": "./package.json"
   },
-  "typings": "./dist/index.d.ts",
   "files": [
     "dist",
     "LICENSE"
@@ -39,7 +40,8 @@
   "scripts": {
     "build": "pkgbld-internal",
     "test": "jest --collectCoverage",
-    "lint": "eslint ./src"
+    "lint": "eslint ./src",
+    "prepack": "pkgbld-internal prune"
   },
   "dependencies": {
     "@niceties/logger": "^1.1.4",
@@ -57,5 +59,6 @@
     "rollup": {
       "optional": true
     }
-  }
-}
+  },
+  "types": "./dist/index.d.ts"
+}
diff --git a/plugin-binify/package.json b/plugin-binify/package.json
@@ -9,12 +9,13 @@
   "module": "./dist/index.mjs",
   "exports": {
     ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.mjs",
       "require": "./dist/index.cjs",
       "default": "./dist/index.mjs"
     },
     "./package.json": "./package.json"
   },
-  "typings": "./dist/index.d.ts",
   "files": [
     "dist",
     "LICENSE"
@@ -38,7 +39,8 @@
   "scripts": {
     "build": "pkgbld-internal",
     "test": "jest --collectCoverage",
-    "lint": "eslint ./src"
+    "lint": "eslint ./src",
+    "prepack": "pkgbld-internal prune"
   },
   "dependencies": {
     "@niceties/logger": "^1.1.4",
@@ -51,5 +53,6 @@
     "rollup": {
       "optional": true
     }
-  }
-}
+  },
+  "types": "./dist/index.d.ts"
+}
diff --git a/plugin-clean/package.json b/plugin-clean/package.json
@@ -9,12 +9,13 @@
   "module": "./dist/index.mjs",
   "exports": {
     ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.mjs",
       "require": "./dist/index.cjs",
       "default": "./dist/index.mjs"
     },
     "./package.json": "./package.json"
   },
-  "typings": "./dist/index.d.ts",
   "files": [
     "dist",
     "LICENSE"
@@ -38,7 +39,8 @@
   "scripts": {
     "build": "pkgbld-internal",
     "test": "jest --collectCoverage",
-    "lint": "eslint ./src"
+    "lint": "eslint ./src",
+    "prepack": "pkgbld-internal prune"
   },
   "dependencies": {
     "@niceties/logger": "^1.1.4",
@@ -51,5 +53,6 @@
     "rollup": {
       "optional": true
     }
-  }
-}
+  },
+  "types": "./dist/index.d.ts"
+}
diff --git a/plugin-copy/package.json b/plugin-copy/package.json
@@ -9,12 +9,13 @@
   "module": "./dist/index.mjs",
   "exports": {
     ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.mjs",
       "require": "./dist/index.cjs",
       "default": "./dist/index.mjs"
     },
     "./package.json": "./package.json"
   },
-  "typings": "./dist/index.d.ts",
   "files": [
     "dist",
     "LICENSE"
@@ -38,7 +39,8 @@
   "scripts": {
     "build": "pkgbld-internal",
     "test": "jest --collectCoverage",
-    "lint": "eslint ./src"
+    "lint": "eslint ./src",
+    "prepack": "pkgbld-internal prune"
   },
   "dependencies": {
     "@niceties/logger": "^1.1.4",
@@ -57,5 +59,6 @@
     "rollup": {
       "optional": true
     }
-  }
-}
+  },
+  "types": "./dist/index.d.ts"
+}
diff --git a/plugin-exec/package.json b/plugin-exec/package.json
@@ -9,12 +9,13 @@
   "module": "./dist/index.mjs",
   "exports": {
     ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.mjs",
       "require": "./dist/index.cjs",
       "default": "./dist/index.mjs"
     },
     "./package.json": "./package.json"
   },
-  "typings": "./dist/index.d.ts",
   "files": [
     "dist",
     "LICENSE"
@@ -37,7 +38,8 @@
   "scripts": {
     "build": "pkgbld-internal",
     "test": "jest --collectCoverage",
-    "lint": "eslint ./src"
+    "lint": "eslint ./src",
+    "prepack": "pkgbld-internal prune"
   },
   "dependencies": {
     "@niceties/logger": "^1.1.4",
@@ -50,5 +52,6 @@
     "rollup": {
       "optional": true
     }
-  }
-}
+  },
+  "types": "./dist/index.d.ts"
+}
diff --git a/plugin-externals/package.json b/plugin-externals/package.json
@@ -9,12 +9,13 @@
   "module": "./dist/index.mjs",
   "exports": {
     ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.mjs",
       "require": "./dist/index.cjs",
       "default": "./dist/index.mjs"
     },
     "./package.json": "./package.json"
   },
-  "typings": "./dist/index.d.ts",
   "files": [
     "dist",
     "LICENSE"
@@ -38,12 +39,13 @@
   "scripts": {
     "build": "pkgbld-internal",
     "test": "jest --collectCoverage",
-    "lint": "eslint ./src"
+    "lint": "eslint ./src",
+    "prepack": "pkgbld-internal prune"
   },
   "dependencies": {
     "@niceties/logger": "^1.1.4",
     "is-builtin-module": "^3.2.0",
-    "pkg-dir": "5.0.0",
+    "pkg-dir": "8.0.0",
     "@rollup-extras/utils": "^1.4.5"
   },
   "peerDependencies": {
@@ -53,5 +55,6 @@
     "rollup": {
       "optional": true
     }
-  }
-}
+  },
+  "types": "./dist/index.d.ts"
+}
diff --git a/plugin-externals/src/index.ts b/plugin-externals/src/index.ts
@@ -5,7 +5,7 @@ import { getOptionsObject } from '@rollup-extras/utils/options';
 import { LogLevel } from '@niceties/logger';
 import logger from '@rollup-extras/utils/logger';
 import { ExternalsPluginOptions } from './types';
-import packageDirectory from 'pkg-dir';
+import { packageDirectory } from 'pkg-dir';
 
 const factories = { logger };
 

diff --git a/plugin-externals/tests/index.spec.ts b/plugin-externals/tests/index.spec.ts
@@ -1,6 +1,5 @@
 import { createLogger, LogLevel } from '@niceties/logger';
-import packageDirectory from 'pkg-dir';
-// import path from 'path';
+import { packageDirectory } from 'pkg-dir';
 import plugin from '../src';
 
 let log: jest.Mock;
@@ -11,9 +10,8 @@ jest.mock('@niceties/logger', () => ({
 }));
 
 jest.mock('pkg-dir', () => ({
-    ...jest.requireActual('pkg-dir'),
-    __esModule: true,
-    default: jest.fn(() => Promise.resolve(''))
+    packageDirectory: jest.fn(() => Promise.resolve('')),
+    __esModule: true
 }));
 
 describe('@rollup-extras/plugin-externals', () => {

diff --git a/plugin-html/package.json b/plugin-html/package.json
@@ -9,16 +9,19 @@
   "module": "./dist/index.mjs",
   "exports": {
     ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.mjs",
       "require": "./dist/index.cjs",
       "default": "./dist/index.mjs"
     },
     "./asset-factories": {
+      "types": "./dist/asset-factories.d.ts",
+      "import": "./dist/asset-factories.mjs",
       "require": "./dist/asset-factories.cjs",
       "default": "./dist/asset-factories.mjs"
     },
     "./package.json": "./package.json"
   },
-  "typings": "./dist/index.d.ts",
   "files": [
     "dist",
     "LICENSE",
@@ -43,7 +46,8 @@
   "scripts": {
     "build": "pkgbld-internal",
     "test": "jest --collectCoverage",
-    "lint": "eslint ./src"
+    "lint": "eslint ./src",
+    "prepack": "pkgbld-internal prune"
   },
   "dependencies": {
     "@niceties/logger": "^1.1.4",
@@ -56,5 +60,6 @@
     "rollup": {
       "optional": true
     }
-  }
-}
+  },
+  "types": "./dist/index.d.ts"
+}
diff --git a/plugin-serve/package.json b/plugin-serve/package.json
@@ -9,12 +9,13 @@
   "module": "./dist/index.mjs",
   "exports": {
     ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.mjs",
       "require": "./dist/index.cjs",
       "default": "./dist/index.mjs"
     },
     "./package.json": "./package.json"
   },
-  "typings": "./dist/index.d.ts",
   "files": [
     "dist",
     "LICENSE"
@@ -38,7 +39,8 @@
   "scripts": {
     "build": "pkgbld-internal",
     "test": "jest --collectCoverage",
-    "lint": "eslint ./src"
+    "lint": "eslint ./src",
+    "prepack": "pkgbld-internal prune"
   },
   "dependencies": {
     "koa": "^2.14.1",
@@ -59,5 +61,6 @@
     "rollup": {
       "optional": true
     }
-  }
-}
+  },
+  "types": "./dist/index.d.ts"
+}