Skip to content

Commit 0b7732c

Browse files
committed
fixed outdated dependency references
this was likely a silent merge conflict in the previous commit (d5c2d20) which went undetected locally because those outdated Rollup plugins were still present in `node_modules`
1 parent d5c2d20 commit 0b7732c

File tree

7 files changed

+18
-10
lines changed

7 files changed

+18
-10
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@ faucet-pipeline-js version history
22
==================================
33

44

5+
v2.1.1
6+
------
7+
8+
_2020-03-17_
9+
10+
fixed outdated dependency references (regression in v2.1.0)
11+
12+
513
v2.1.0
614
------
715

lib/bundle/config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
let generateTranspiler = require("./babel");
55
let { loadExtension, abort, repr } = require("faucet-pipeline-core/lib/util");
6-
let commonjs = require("rollup-plugin-commonjs");
7-
let nodeResolve = require("rollup-plugin-node-resolve");
6+
let commonjs = require("@rollup/plugin-commonjs");
7+
let nodeResolve = require("@rollup/plugin-node-resolve");
88

99
let MODULE_FORMATS = { // maps faucet identifiers to Rollup identifiers
1010
esm: true,

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "faucet-pipeline-js",
3-
"version": "2.1.0",
3+
"version": "2.1.1",
44
"description": "JavaScript module bundling for faucet-pipeline",
55
"author": "FND",
66
"contributors": [

pkg/faucet-pipeline-esnext/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "faucet-pipeline-esnext",
3-
"version": "2.1.0",
3+
"version": "2.1.1",
44
"description": "ES6 and beyond for faucet-pipeline",
55
"author": "FND",
66
"license": "Apache-2.0",
@@ -15,7 +15,7 @@
1515
"dependencies": {
1616
"@babel/core": "~7.8.7",
1717
"@babel/preset-env": "~7.8.7",
18-
"faucet-pipeline-js": "2.1.0",
18+
"faucet-pipeline-js": "2.1.1",
1919
"rollup-plugin-babel": "~4.3.3"
2020
}
2121
}

pkg/faucet-pipeline-jsmin/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "faucet-pipeline-jsmin",
3-
"version": "2.1.0",
3+
"version": "2.1.1",
44
"description": "JavaScript minification for faucet-pipeline",
55
"author": "FND",
66
"license": "Apache-2.0",

pkg/faucet-pipeline-jsx/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "faucet-pipeline-jsx",
3-
"version": "2.1.0",
3+
"version": "2.1.1",
44
"description": "JSX for faucet-pipeline",
55
"author": "FND",
66
"license": "Apache-2.0",
@@ -14,6 +14,6 @@
1414
},
1515
"dependencies": {
1616
"@babel/plugin-transform-react-jsx": "~7.8.3",
17-
"faucet-pipeline-esnext": "2.1.0"
17+
"faucet-pipeline-esnext": "2.1.1"
1818
}
1919
}

pkg/faucet-pipeline-typescript/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "faucet-pipeline-typescript",
3-
"version": "2.1.0",
3+
"version": "2.1.1",
44
"description": "TypeScript for faucet-pipeline",
55
"author": "FND",
66
"contributors": [
@@ -16,7 +16,7 @@
1616
"url": "https://github.com/faucet-pipeline/faucet-pipeline-js/issues"
1717
},
1818
"dependencies": {
19-
"faucet-pipeline-js": "2.1.0",
19+
"faucet-pipeline-js": "2.1.1",
2020
"rollup-plugin-typescript2": "~0.26.0",
2121
"typescript": "~3.8.3"
2222
}

0 commit comments

Comments
 (0)