Skip to content

Commit 7e96709

Browse files
committed
fix(image): prepare for Rollup 3
BREAKING CHANGES: Requires Node 14
1 parent 32aa6d2 commit 7e96709

File tree

9 files changed

+78
-39
lines changed

9 files changed

+78
-39
lines changed

packages/image/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Images are encoded using base64, which means they will be 33% larger than the si
1515

1616
## Requirements
1717

18-
This plugin requires an [LTS](https://github.com/nodejs/Release) Node version (v8.0.0+) and Rollup v1.20.0+.
18+
This plugin requires an [LTS](https://github.com/nodejs/Release) Node version (v14.0.0+) and Rollup v1.20.0+.
1919

2020
## Install
2121

packages/image/package.json

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,14 @@
1313
"author": "Rich Harris",
1414
"homepage": "https://github.com/rollup/plugins/tree/master/packages/image/#readme",
1515
"bugs": "https://github.com/rollup/plugins/issues",
16-
"main": "dist/index.js",
17-
"module": "dist/index.es.js",
16+
"main": "./dist/cjs/index.js",
17+
"module": "./dist/es/index.js",
18+
"exports": {
19+
"require": "./dist/cjs/index.js",
20+
"import": "./dist/es/index.js"
21+
},
1822
"engines": {
19-
"node": ">= 8.0.0"
23+
"node": ">=14.0.0"
2024
},
2125
"scripts": {
2226
"build": "rollup -c",
@@ -32,7 +36,7 @@
3236
"test": "ava"
3337
},
3438
"files": [
35-
"dist",
39+
"dist/**/*.{js,json}",
3640
"types",
3741
"README.md",
3842
"LICENSE"
@@ -44,21 +48,24 @@
4448
"modules"
4549
],
4650
"peerDependencies": {
47-
"rollup": "^1.20.0 || ^2.0.0"
51+
"rollup": "^1.20.0||^2.0.0||^3.0.0"
52+
},
53+
"peerDependenciesMeta": {
54+
"rollup": {
55+
"optional": true
56+
}
4857
},
4958
"dependencies": {
50-
"@rollup/pluginutils": "^3.1.0",
51-
"mini-svg-data-uri": "^1.2.3"
59+
"@rollup/pluginutils": "^4.2.1",
60+
"mini-svg-data-uri": "^1.4.4"
5261
},
5362
"devDependencies": {
5463
"@rollup/plugin-buble": "^0.21.3",
55-
"rollup": "^2.67.3"
64+
"rollup": "^3.0.0-7"
5665
},
5766
"types": "./types/index.d.ts",
5867
"ava": {
59-
"babel": {
60-
"compileEnhancements": false
61-
},
68+
"workerThreads": false,
6269
"files": [
6370
"!**/fixtures/**",
6471
"!**/helpers/**",

packages/image/rollup.config.js

Lines changed: 0 additions & 13 deletions
This file was deleted.

packages/image/rollup.config.mjs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import { readFileSync } from 'fs';
2+
3+
import buble from '@rollup/plugin-buble';
4+
5+
import { createConfig } from '../../shared/rollup.config.mjs';
6+
7+
export default {
8+
...createConfig({
9+
pkg: JSON.parse(readFileSync(new URL('./package.json', import.meta.url), 'utf8'))
10+
}),
11+
input: 'src/index.js',
12+
plugins: [buble()]
13+
};

packages/image/test/snapshots/test.js.md

Lines changed: 5 additions & 5 deletions
Large diffs are not rendered by default.
-48 Bytes
Binary file not shown.

pnpm-lock.yaml

Lines changed: 38 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

shared/rollup.config.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ export function createConfig({ pkg, external = [] }) {
2323
output: [
2424
{
2525
format: 'cjs',
26-
file: pkg.main,
26+
file: pkg.exports.require,
2727
exports: 'named',
2828
footer: 'module.exports = Object.assign(exports.default, exports);',
2929
sourcemap: true
3030
},
3131
{
3232
format: 'es',
33-
file: pkg.module,
33+
file: pkg.exports.import,
3434
plugins: [emitModulePackageFile()],
3535
sourcemap: true
3636
}

tsconfig.base.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"pretty": true,
1313
"sourceMap": true,
1414
"strict": true,
15-
"target": "es2017"
15+
"target": "es2019"
1616
},
1717
"exclude": ["dist", "node_modules", "test/types"]
1818
}

0 commit comments

Comments
 (0)