You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flagon.apache.org by po...@apache.org on 2021/02/09 15:27:28 UTC
[incubator-flagon-useralejs] branch flagon-userale-16 updated:
[flagon-userale-16] updated plugin-node-resolve to latest
This is an automated email from the ASF dual-hosted git repository.
poorejc pushed a commit to branch flagon-userale-16
in repository https://gitbox.apache.org/repos/asf/incubator-flagon-useralejs.git
The following commit(s) were added to refs/heads/flagon-userale-16 by this push:
new 6496607 [flagon-userale-16] updated plugin-node-resolve to latest
6496607 is described below
commit 649660709ff7a30fe6cc78801d672e314ad64b67
Author: poorejc <po...@apache.org>
AuthorDate: Tue Feb 9 10:27:16 2021 -0500
[flagon-userale-16] updated plugin-node-resolve to latest
---
gulpfile.js | 10 +++++-----
package-lock.json | 57 ++++++++++++++++++++++++++++++++++++-------------------
package.json | 2 +-
3 files changed, 43 insertions(+), 26 deletions(-)
diff --git a/gulpfile.js b/gulpfile.js
index 8a9188a..10c2f99 100755
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -21,7 +21,7 @@ var eslint = require('gulp-eslint');
var log = require('gulplog');
var rollup = require('rollup').rollup;
var json = require('@rollup/plugin-json');
-var resolve = require('@rollup/plugin-node-resolve');
+const {nodeResolve} = require('@rollup/plugin-node-resolve');
var commonjs = require('@rollup/plugin-commonjs');
var uglify = require('gulp-uglify');
var rename = require('gulp-rename');
@@ -65,7 +65,7 @@ gulp.task('rollup', function() {
'\n@preserved'
}),
json(),
- resolve(),
+ nodeResolve(),
commonjs()
]
})
@@ -85,7 +85,7 @@ gulp.task('rollup-web-ext-content', function() {
input : 'src/' + userAleWebExtDirName + '/content.js',
plugins : [
json(),
- resolve(),
+ nodeResolve(),
commonjs()
]
})
@@ -104,7 +104,7 @@ gulp.task('rollup-web-ext-background', function() {
input : 'src/' + userAleWebExtDirName + '/background.js',
plugins : [
json(),
- resolve(),
+ nodeResolve(),
commonjs()
]
})
@@ -123,7 +123,7 @@ gulp.task('rollup-web-ext-options', function() {
input : 'src/' + userAleWebExtDirName + '/options.js',
plugins : [
json(),
- resolve(),
+ nodeResolve(),
commonjs()
]
})
diff --git a/package-lock.json b/package-lock.json
index 6711f92..d974973 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,7 +14,7 @@
"@babel/register": "^7.12.1",
"@rollup/plugin-commonjs": "^11.1.0",
"@rollup/plugin-json": "^4.1.0",
- "@rollup/plugin-node-resolve": "^7.0.0",
+ "@rollup/plugin-node-resolve": "^11.1.1",
"body-parser": "^1.15.0",
"chai": "^3.5.0",
"composer": "^4.1.0",
@@ -1278,19 +1278,20 @@
}
},
"node_modules/@rollup/plugin-node-resolve": {
- "version": "7.1.3",
- "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-7.1.3.tgz",
- "integrity": "sha512-RxtSL3XmdTAE2byxekYLnx+98kEUOrPHF/KRVjLH+DEIHy6kjIw7YINQzn+NXiH/NTrQLAwYs0GWB+csWygA9Q==",
+ "version": "11.1.1",
+ "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.1.1.tgz",
+ "integrity": "sha512-zlBXR4eRS+2m79TsUZWhsd0slrHUYdRx4JF+aVQm+MI0wsKdlpC2vlDVjmlGvtZY1vsefOT9w3JxvmWSBei+Lg==",
"dev": true,
"dependencies": {
- "@rollup/pluginutils": "^3.0.8",
- "@types/resolve": "0.0.8",
+ "@rollup/pluginutils": "^3.1.0",
+ "@types/resolve": "1.17.1",
"builtin-modules": "^3.1.0",
+ "deepmerge": "^4.2.2",
"is-module": "^1.0.0",
- "resolve": "^1.14.2"
+ "resolve": "^1.19.0"
},
"engines": {
- "node": ">= 8.0.0"
+ "node": ">= 10.0.0"
},
"peerDependencies": {
"rollup": "^1.20.0||^2.0.0"
@@ -1371,9 +1372,9 @@
"dev": true
},
"node_modules/@types/resolve": {
- "version": "0.0.8",
- "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-0.0.8.tgz",
- "integrity": "sha512-auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ==",
+ "version": "1.17.1",
+ "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz",
+ "integrity": "sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==",
"dev": true,
"dependencies": {
"@types/node": "*"
@@ -3085,6 +3086,15 @@
"integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
"dev": true
},
+ "node_modules/deepmerge": {
+ "version": "4.2.2",
+ "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
+ "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
"node_modules/default-compare": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz",
@@ -12325,16 +12335,17 @@
}
},
"@rollup/plugin-node-resolve": {
- "version": "7.1.3",
- "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-7.1.3.tgz",
- "integrity": "sha512-RxtSL3XmdTAE2byxekYLnx+98kEUOrPHF/KRVjLH+DEIHy6kjIw7YINQzn+NXiH/NTrQLAwYs0GWB+csWygA9Q==",
+ "version": "11.1.1",
+ "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.1.1.tgz",
+ "integrity": "sha512-zlBXR4eRS+2m79TsUZWhsd0slrHUYdRx4JF+aVQm+MI0wsKdlpC2vlDVjmlGvtZY1vsefOT9w3JxvmWSBei+Lg==",
"dev": true,
"requires": {
- "@rollup/pluginutils": "^3.0.8",
- "@types/resolve": "0.0.8",
+ "@rollup/pluginutils": "^3.1.0",
+ "@types/resolve": "1.17.1",
"builtin-modules": "^3.1.0",
+ "deepmerge": "^4.2.2",
"is-module": "^1.0.0",
- "resolve": "^1.14.2"
+ "resolve": "^1.19.0"
}
},
"@rollup/pluginutils": {
@@ -12405,9 +12416,9 @@
"dev": true
},
"@types/resolve": {
- "version": "0.0.8",
- "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-0.0.8.tgz",
- "integrity": "sha512-auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ==",
+ "version": "1.17.1",
+ "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz",
+ "integrity": "sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==",
"dev": true,
"requires": {
"@types/node": "*"
@@ -13772,6 +13783,12 @@
"integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
"dev": true
},
+ "deepmerge": {
+ "version": "4.2.2",
+ "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
+ "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
+ "dev": true
+ },
"default-compare": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz",
diff --git a/package.json b/package.json
index 9c50bdc..66ecbfb 100755
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
"@babel/register": "^7.12.1",
"@rollup/plugin-commonjs": "^11.1.0",
"@rollup/plugin-json": "^4.1.0",
- "@rollup/plugin-node-resolve": "^7.0.0",
+ "@rollup/plugin-node-resolve": "^11.1.1",
"body-parser": "^1.15.0",
"chai": "^3.5.0",
"composer": "^4.1.0",