fix(pluginutils): prepare for Rollup 3

BREAKING CHANGES: Requires Node 14
rollup · Sep 30, 2022 · a377700 · a377700
1 parent 32aa6d2
commit a377700
Show file tree

Hide file tree

Showing 15 changed files with 113 additions and 64 deletions.
diff --git a/packages/pluginutils/README.md b/packages/pluginutils/README.md
@@ -13,7 +13,7 @@ A set of utility functions commonly used by 🍣 Rollup plugins.
 
 ## Requirements
 
-This plugin requires an [LTS](https://github.com/nodejs/Release) Node version (v8.0.0+) and Rollup v1.20.0+.
+The plugin utils require an [LTS](https://github.com/nodejs/Release) Node version (v14.0.0+) and Rollup v1.20.0+.
 
 ## Install
 

diff --git a/packages/pluginutils/package.json b/packages/pluginutils/package.json
@@ -23,7 +23,7 @@
     "import": "./dist/es/index.js"
   },
   "engines": {
-    "node": ">= 8.0.0"
+    "node": ">=14.0.0"
   },
   "scripts": {
     "build": "rollup -c",
@@ -40,7 +40,7 @@
     "test:ts": "tsc --noEmit"
   },
   "files": [
-    "dist",
+    "dist/**/*.{js,json}",
     "types",
     "README.md",
     "LICENSE"
@@ -50,20 +50,28 @@
     "plugin",
     "utils"
   ],
+  "peerDependencies": {
+    "rollup": "^1.20.0||^2.0.0||^3.0.0"
+  },
+  "peerDependenciesMeta": {
+    "rollup": {
+      "optional": true
+    }
+  },
   "dependencies": {
-    "estree-walker": "^2.0.1",
-    "picomatch": "^2.2.2"
+    "estree-walker": "^2.0.2",
+    "picomatch": "^2.3.1"
   },
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^14.0.0",
-    "@rollup/plugin-node-resolve": "^8.4.0",
-    "@rollup/plugin-typescript": "^5.0.2",
-    "@types/estree": "0.0.45",
-    "@types/node": "^14.0.26",
-    "@types/picomatch": "^2.2.1",
-    "acorn": "^8.0.4",
-    "rollup": "^2.67.3",
-    "typescript": "^4.1.2"
+    "@rollup/plugin-commonjs": "^22.0.2",
+    "@rollup/plugin-node-resolve": "^14.1.0",
+    "@rollup/plugin-typescript": "^8.5.0",
+    "@types/estree": "1.0.0",
+    "@types/node": "^14.18.30",
+    "@types/picomatch": "^2.3.0",
+    "acorn": "^8.8.0",
+    "rollup": "^3.0.0-7",
+    "typescript": "^4.8.3"
   },
   "types": "types/index.d.ts",
   "ava": {

diff --git a/packages/pluginutils/rollup.config.js → packages/pluginutils/rollup.config.mjs b/packages/pluginutils/rollup.config.js → packages/pluginutils/rollup.config.mjs
@@ -1,23 +1,19 @@
-import { builtinModules } from 'module';
+import { readFileSync } from 'fs';
 
 import commonjs from '@rollup/plugin-commonjs';
 import resolve from '@rollup/plugin-node-resolve';
 import typescript from '@rollup/plugin-typescript';
 
-import { emitModulePackageFile } from '../../shared/rollup.config';
-
-import pkg from './package.json';
+import { createConfig } from '../../shared/rollup.config.mjs';
 
 export default {
+  ...createConfig({
+    pkg: JSON.parse(readFileSync(new URL('./package.json', import.meta.url), 'utf8'))
+  }),
   input: 'src/index.ts',
   plugins: [
     resolve(),
     commonjs({ include: '../../node_modules/.pnpm/registry.npmjs.org/**' }),
     typescript({ include: '**/*.{ts,js}', module: 'esnext' })
-  ],
-  external: [...builtinModules, 'picomatch'],
-  output: [
-    { file: pkg.main, format: 'cjs', exports: 'named' },
-    { file: pkg.module, format: 'es', plugins: [emitModulePackageFile()] }
   ]
 };
diff --git a/packages/pluginutils/src/addExtension.ts b/packages/pluginutils/src/addExtension.ts
@@ -1,6 +1,6 @@
 import { extname } from 'path';
 
-import { AddExtension } from '../types';
+import type { AddExtension } from '../types';
 
 const addExtension: AddExtension = function addExtension(filename, ext = '.js') {
   let result = `${filename}`;

diff --git a/packages/pluginutils/src/attachScopes.ts b/packages/pluginutils/src/attachScopes.ts
@@ -1,9 +1,8 @@
-// eslint-disable-next-line import/no-unresolved
 import * as estree from 'estree';
 
 import { walk } from 'estree-walker';
 
-import { AttachedScope, AttachScopes } from '../types';
+import type { AttachedScope, AttachScopes } from '../types';
 
 import extractAssignedNames from './extractAssignedNames';
 

diff --git a/packages/pluginutils/src/createFilter.ts b/packages/pluginutils/src/createFilter.ts
@@ -2,7 +2,7 @@ import { resolve, posix, isAbsolute } from 'path';
 
 import pm from 'picomatch';
 
-import { CreateFilter } from '../types';
+import type { CreateFilter } from '../types';
 
 import ensureArray from './utils/ensureArray';
 import normalizePath from './normalizePath';

diff --git a/packages/pluginutils/src/dataToEsm.ts b/packages/pluginutils/src/dataToEsm.ts
@@ -1,4 +1,4 @@
-import { DataToEsm } from '../types';
+import type { DataToEsm } from '../types';
 
 import makeLegalIdentifier from './makeLegalIdentifier';
 

diff --git a/packages/pluginutils/src/extractAssignedNames.ts b/packages/pluginutils/src/extractAssignedNames.ts
@@ -1,4 +1,4 @@
-import { ExtractAssignedNames } from '../types';
+import type { ExtractAssignedNames } from '../types';
 
 interface Extractors {
   [key: string]: (names: string[], param: any) => void;

diff --git a/packages/pluginutils/src/makeLegalIdentifier.ts b/packages/pluginutils/src/makeLegalIdentifier.ts
@@ -1,4 +1,4 @@
-import { MakeLegalIdentifier } from '../types';
+import type { MakeLegalIdentifier } from '../types';
 
 const reservedWords =
   'break case class catch const continue debugger default delete do else export extends finally for function if import in instanceof let new return super switch this throw try typeof var void while with yield enum await implements package protected static interface private public';

diff --git a/packages/pluginutils/src/normalizePath.ts b/packages/pluginutils/src/normalizePath.ts
@@ -1,6 +1,6 @@
 import { win32, posix } from 'path';
 
-import { NormalizePath } from '../types';
+import type { NormalizePath } from '../types';
 
 const normalizePath: NormalizePath = function normalizePath(filename: string) {
   return filename.split(win32.sep).join(posix.sep);

diff --git a/packages/pluginutils/test/attachScopes.ts b/packages/pluginutils/test/attachScopes.ts
@@ -1,4 +1,3 @@
-// eslint-disable-next-line import/no-unresolved
 import * as estree from 'estree';
 
 import test from 'ava';

diff --git a/packages/pluginutils/types/index.d.ts b/packages/pluginutils/types/index.d.ts
@@ -1,4 +1,3 @@
-// eslint-disable-next-line import/no-unresolved
 import { BaseNode } from 'estree';
 
 export interface AttachedScope {

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/shared/rollup.config.mjs b/shared/rollup.config.mjs
@@ -23,14 +23,14 @@ export function createConfig({ pkg, external = [] }) {
     output: [
       {
         format: 'cjs',
-        file: pkg.main,
+        file: pkg.exports.require,
         exports: 'named',
         footer: 'module.exports = Object.assign(exports.default, exports);',
         sourcemap: true
       },
       {
         format: 'es',
-        file: pkg.module,
+        file: pkg.exports.import,
         plugins: [emitModulePackageFile()],
         sourcemap: true
       }

diff --git a/tsconfig.base.json b/tsconfig.base.json
@@ -12,7 +12,7 @@
     "pretty": true,
     "sourceMap": true,
     "strict": true,
-    "target": "es2017"
+    "target": "es2019"
   },
   "exclude": ["dist", "node_modules", "test/types"]
 }