From bb6317922f292c7cd0c9b2c8e9f960b59b350570 Mon Sep 17 00:00:00 2001 From: Leo Meyerovich Date: Sat, 29 Oct 2022 15:52:39 -0700 Subject: [PATCH 1/6] fix(build): gulp 3 -> gulp 4 --- packages/falcor-router/gulpfile.js | 6 +++--- packages/falcor-router/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/falcor-router/gulpfile.js b/packages/falcor-router/gulpfile.js index fc41a8a3..265c553d 100644 --- a/packages/falcor-router/gulpfile.js +++ b/packages/falcor-router/gulpfile.js @@ -5,8 +5,6 @@ var mocha = require('gulp-mocha'); var eslint = require('gulp-eslint'); var istanbul = require('gulp-istanbul'); -gulp.task('lint', ['lint-src', 'lint-test', 'lint-root']); - gulp.task('lint-src', function() { return gulp.src('src/**/*.js'). pipe(eslint()). @@ -28,6 +26,8 @@ gulp.task('lint-root', function() { pipe(eslint.failAfterError()); }); +gulp.task('lint', gulp.series('lint-src', 'lint-test', 'lint-root')); + gulp.task('test', function (cb) { gulp.src(['./test/index.js']) .pipe(mocha({ @@ -56,4 +56,4 @@ gulp.task('test-coverage', function (cb) { }); }); -gulp.task('dist', ['lint', 'test-coverage']); +gulp.task('dist', gulp.series('lint', 'test-coverage')); diff --git a/packages/falcor-router/package.json b/packages/falcor-router/package.json index e3762ece..73dc6066 100644 --- a/packages/falcor-router/package.json +++ b/packages/falcor-router/package.json @@ -52,7 +52,7 @@ "chai": "^4.1.2", "coveralls": "~2.13.1", "cross-env": "~5.0.0", - "gulp": "~3.9.1", + "gulp": "~4.0.2", "gulp-eslint": "~3.0.1", "gulp-istanbul": "~1.1.1", "gulp-mocha": "~4.3.1", From 8c4e4bc25dcff6866a3a5772a01c79ab8d592cfb Mon Sep 17 00:00:00 2001 From: Leo Meyerovich Date: Sat, 29 Oct 2022 15:56:31 -0700 Subject: [PATCH 2/6] v2.11.0 --- lerna.json | 2 +- packages/falcor-model-rxjs/package.json | 4 ++-- packages/falcor-query-syntax/package.json | 4 ++-- packages/falcor-react-redux/package.json | 6 +++--- packages/falcor-react-schema/package.json | 10 +++++----- packages/falcor-router-saddle/package.json | 6 +++--- packages/falcor-router/package.json | 4 ++-- packages/falcor-socket-datasource/package.json | 6 +++--- packages/falcor/package.json | 4 ++-- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/lerna.json b/lerna.json index 8b3c8338..93e1f5ff 100644 --- a/lerna.json +++ b/lerna.json @@ -1,4 +1,4 @@ { "lerna": "2.0.0", - "version": "2.10.1" + "version": "2.11.0" } diff --git a/packages/falcor-model-rxjs/package.json b/packages/falcor-model-rxjs/package.json index fe9cb486..20c75a60 100644 --- a/packages/falcor-model-rxjs/package.json +++ b/packages/falcor-model-rxjs/package.json @@ -1,6 +1,6 @@ { "name": "@graphistry/falcor-model-rxjs", - "version": "2.10.1", + "version": "2.11.0", "description": "", "main": "lib/Model.js", "browser": "lib/Model.js", @@ -17,7 +17,7 @@ "lib" ], "dependencies": { - "@graphistry/falcor": "^2.10.1", + "@graphistry/falcor": "^2.11.0", "@graphistry/falcor-path-syntax": "^2.9.10", "babel-runtime": "^6.26.0", "rxjs": "~5.4.2" diff --git a/packages/falcor-query-syntax/package.json b/packages/falcor-query-syntax/package.json index 52af8daa..76dbe12d 100644 --- a/packages/falcor-query-syntax/package.json +++ b/packages/falcor-query-syntax/package.json @@ -1,6 +1,6 @@ { "name": "@graphistry/falcor-query-syntax", - "version": "2.10.1", + "version": "2.11.0", "description": "ES6 Template String and Builder function for Creating Falcor Paths (Experimental)", "main": "index.js", "scripts": { @@ -55,7 +55,7 @@ }, "devDependencies": { "@graphistry/falcor-json-graph": "^2.9.10", - "@graphistry/falcor-router": "^2.10.1", + "@graphistry/falcor-router": "^2.11.0", "babel-plugin-istanbul": "~4.1.4", "babel-plugin-transform-runtime": "~6.23.0", "babel-register": "^6.26.0", diff --git a/packages/falcor-react-redux/package.json b/packages/falcor-react-redux/package.json index c40ca20b..183ff65c 100644 --- a/packages/falcor-react-redux/package.json +++ b/packages/falcor-react-redux/package.json @@ -1,6 +1,6 @@ { "name": "@graphistry/falcor-react-redux", - "version": "2.10.1", + "version": "2.11.0", "description": "", "main": "lib/index.js", "browser": "lib/index.js", @@ -46,11 +46,11 @@ "warning": "^3.0.0" }, "dependencies": { - "@graphistry/falcor": "^2.10.1", + "@graphistry/falcor": "^2.11.0", "@graphistry/falcor-json-graph": "^2.9.10", "@graphistry/falcor-path-syntax": "^2.9.10", "@graphistry/falcor-path-utils": "^2.9.10", - "@graphistry/falcor-query-syntax": "^2.10.1", + "@graphistry/falcor-query-syntax": "^2.11.0", "babel-runtime": "^6.26.0", "hoist-non-react-statics": "^2.3.1", "invariant": "~2.2.2", diff --git a/packages/falcor-react-schema/package.json b/packages/falcor-react-schema/package.json index 61b3a95b..90c2ebc6 100644 --- a/packages/falcor-react-schema/package.json +++ b/packages/falcor-react-schema/package.json @@ -1,6 +1,6 @@ { "name": "@graphistry/falcor-react-schema", - "version": "2.10.1", + "version": "2.11.0", "description": "", "main": "lib/index.js", "browser": "lib/index.js", @@ -31,18 +31,18 @@ "rxjs": "^5.4.2" }, "dependencies": { - "@graphistry/falcor": "^2.10.1", + "@graphistry/falcor": "^2.11.0", "@graphistry/falcor-json-graph": "^2.9.10", "@graphistry/falcor-path-utils": "^2.9.10", - "@graphistry/falcor-query-syntax": "^2.10.1", + "@graphistry/falcor-query-syntax": "^2.11.0", "babel-runtime": "^6.26.0", "create-react-app": "1.5.2", "invariant": "^2.2.2", "pegjs-util": "^1.4.1" }, "devDependencies": { - "@graphistry/falcor-model-rxjs": "^2.10.1", - "@graphistry/falcor-router": "^2.10.1", + "@graphistry/falcor-model-rxjs": "^2.11.0", + "@graphistry/falcor-router": "^2.11.0", "babel-cli": "^6.26.0", "babel-jest": "^21.0.2", "babel-plugin-transform-runtime": "^6.23.0", diff --git a/packages/falcor-router-saddle/package.json b/packages/falcor-router-saddle/package.json index 671de8a0..335650d2 100644 --- a/packages/falcor-router-saddle/package.json +++ b/packages/falcor-router-saddle/package.json @@ -1,6 +1,6 @@ { "name": "@graphistry/falcor-router-saddle", - "version": "2.10.1", + "version": "2.11.0", "description": "", "main": "lib/index.js", "browser": "lib/index.js", @@ -33,8 +33,8 @@ }, "devDependencies": { "@graphistry/falcor-json-graph": "^2.9.10", - "@graphistry/falcor-query-syntax": "^2.10.1", - "@graphistry/falcor-router": "^2.10.1", + "@graphistry/falcor-query-syntax": "^2.11.0", + "@graphistry/falcor-router": "^2.11.0", "babel-cli": "^6.26.0", "babel-plugin-istanbul": "~4.1.4", "babel-plugin-transform-runtime": "~6.23.0", diff --git a/packages/falcor-router/package.json b/packages/falcor-router/package.json index 73dc6066..16f9ce77 100644 --- a/packages/falcor-router/package.json +++ b/packages/falcor-router/package.json @@ -1,6 +1,6 @@ { "name": "@graphistry/falcor-router", - "version": "2.10.1", + "version": "2.11.0", "description": "A router DataSource constructor for falcor that allows you to model all your cloud data sources as a single JSON resource.", "main": "src/Router.js", "homepage": "https://github.com/graphistry/falcor/blob/master/packages/falcor-router/README.md", @@ -43,7 +43,7 @@ "rxjs": "~5.4.2" }, "devDependencies": { - "@graphistry/falcor": "^2.10.1", + "@graphistry/falcor": "^2.11.0", "@graphistry/falcor-json-graph": "^2.9.10", "babel-plugin-transform-runtime": "~6.23.0", "babel-preset-es2016": "~6.24.1", diff --git a/packages/falcor-socket-datasource/package.json b/packages/falcor-socket-datasource/package.json index afc6ef0c..0496b657 100644 --- a/packages/falcor-socket-datasource/package.json +++ b/packages/falcor-socket-datasource/package.json @@ -1,5 +1,5 @@ { - "version": "2.10.1", + "version": "2.11.0", "name": "@graphistry/falcor-socket-datasource", "main": "dist/index.js", "browser": "dist/index.js", @@ -33,8 +33,8 @@ }, "description": "A socket DataSource for Falcor", "devDependencies": { - "@graphistry/falcor": "^2.10.1", - "@graphistry/falcor-router": "^2.10.1", + "@graphistry/falcor": "^2.11.0", + "@graphistry/falcor-router": "^2.11.0", "babel-cli": "^6.26.0", "babel-plugin-istanbul": "~4.1.4", "babel-plugin-transform-runtime": "~6.23.0", diff --git a/packages/falcor/package.json b/packages/falcor/package.json index b9ab685f..5226d6d5 100644 --- a/packages/falcor/package.json +++ b/packages/falcor/package.json @@ -1,6 +1,6 @@ { "name": "@graphistry/falcor", - "version": "2.10.1", + "version": "2.11.0", "description": "A JavaScript library for efficient data fetching.", "main": "./dist/falcor.node.min.js", "browser": "./dist/falcor.all.min.js", @@ -69,7 +69,7 @@ "devDependencies": { "@graphistry/falcor-json-graph": "^2.9.10", "@graphistry/falcor-path-syntax": "^2.9.10", - "@graphistry/falcor-router": "^2.10.1", + "@graphistry/falcor-router": "^2.11.0", "babel-loader": "^7.1.2", "babel-plugin-check-es2015-constants": "~6.22.0", "babel-plugin-istanbul": "~4.1.4", From 9b75bb2d54baaf5e7e23dd374bac258405a33c10 Mon Sep 17 00:00:00 2001 From: Leo Meyerovich Date: Sat, 29 Oct 2022 16:14:20 -0700 Subject: [PATCH 3/6] update(uuid): 8 -> 9 --- .../dist/FalcorPubSubDataSource.js | 8 +++----- packages/falcor-socket-datasource/package.json | 2 +- .../src/FalcorPubSubDataSource.js | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/packages/falcor-socket-datasource/dist/FalcorPubSubDataSource.js b/packages/falcor-socket-datasource/dist/FalcorPubSubDataSource.js index a0da0d07..dccd46f3 100644 --- a/packages/falcor-socket-datasource/dist/FalcorPubSubDataSource.js +++ b/packages/falcor-socket-datasource/dist/FalcorPubSubDataSource.js @@ -17,12 +17,10 @@ var _extends = _assign2.default || function (target) { for (var i = 1; i < argum var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; (0, _defineProperty2.default)(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); -var _v = require('uuid/v4'); - -var _v2 = _interopRequireDefault(_v); - function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } +var _v = require('uuid/v4'); + function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } var FalcorPubSubDataSource = exports.FalcorPubSubDataSource = function () { @@ -128,7 +126,7 @@ function request(method, parameters, observer) { }; var disposed = false; - var id = (0, _v2.default)(); + var id = (0, _v.v4)(); var responseToken = event + '-' + id; var cancellationToken = cancel + '-' + id; diff --git a/packages/falcor-socket-datasource/package.json b/packages/falcor-socket-datasource/package.json index 0496b657..6ae1798b 100644 --- a/packages/falcor-socket-datasource/package.json +++ b/packages/falcor-socket-datasource/package.json @@ -29,7 +29,7 @@ ], "dependencies": { "babel-runtime": "^6.26.0", - "uuid": "^3.1.0" + "uuid": "9.0.0" }, "description": "A socket DataSource for Falcor", "devDependencies": { diff --git a/packages/falcor-socket-datasource/src/FalcorPubSubDataSource.js b/packages/falcor-socket-datasource/src/FalcorPubSubDataSource.js index 31e1d629..47042b0d 100644 --- a/packages/falcor-socket-datasource/src/FalcorPubSubDataSource.js +++ b/packages/falcor-socket-datasource/src/FalcorPubSubDataSource.js @@ -1,4 +1,4 @@ -import uuidV4 from 'uuid/v4'; +import { v4 as uuidv4 } from 'uuid/v4'; export class FalcorPubSubDataSource { constructor(emitter, model, event = 'falcor-operation', cancel = 'cancel-falcor-operation') { @@ -40,7 +40,7 @@ function request(method, parameters, observer, ...rest) { emitter.readyState !== 'closing') { let disposed = false; - const id = uuidV4(); + const id = uuidv4(); const responseToken = `${event}-${id}`; const cancellationToken = `${cancel}-${id}`; From edc8705ec61059172ceaa0cbc76a85b28d1e00c7 Mon Sep 17 00:00:00 2001 From: Leo Meyerovich Date: Sat, 29 Oct 2022 16:14:49 -0700 Subject: [PATCH 4/6] v2.11.1 --- lerna.json | 2 +- packages/falcor-socket-datasource/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lerna.json b/lerna.json index 93e1f5ff..0406dd72 100644 --- a/lerna.json +++ b/lerna.json @@ -1,4 +1,4 @@ { "lerna": "2.0.0", - "version": "2.11.0" + "version": "2.11.1" } diff --git a/packages/falcor-socket-datasource/package.json b/packages/falcor-socket-datasource/package.json index 6ae1798b..812497d4 100644 --- a/packages/falcor-socket-datasource/package.json +++ b/packages/falcor-socket-datasource/package.json @@ -1,5 +1,5 @@ { - "version": "2.11.0", + "version": "2.11.1", "name": "@graphistry/falcor-socket-datasource", "main": "dist/index.js", "browser": "dist/index.js", From ef9d860c14e019eded384465b2b2f82fa8d70d07 Mon Sep 17 00:00:00 2001 From: Leo Meyerovich Date: Sat, 29 Oct 2022 16:31:23 -0700 Subject: [PATCH 5/6] fix(uuid): wrong path --- .../falcor-socket-datasource/dist/FalcorPubSubDataSource.js | 4 ++-- .../falcor-socket-datasource/src/FalcorPubSubDataSource.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/falcor-socket-datasource/dist/FalcorPubSubDataSource.js b/packages/falcor-socket-datasource/dist/FalcorPubSubDataSource.js index dccd46f3..8f856843 100644 --- a/packages/falcor-socket-datasource/dist/FalcorPubSubDataSource.js +++ b/packages/falcor-socket-datasource/dist/FalcorPubSubDataSource.js @@ -19,7 +19,7 @@ var _createClass = function () { function defineProperties(target, props) { for function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -var _v = require('uuid/v4'); +var _uuid = require('uuid'); function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } @@ -126,7 +126,7 @@ function request(method, parameters, observer) { }; var disposed = false; - var id = (0, _v.v4)(); + var id = (0, _uuid.v4)(); var responseToken = event + '-' + id; var cancellationToken = cancel + '-' + id; diff --git a/packages/falcor-socket-datasource/src/FalcorPubSubDataSource.js b/packages/falcor-socket-datasource/src/FalcorPubSubDataSource.js index 47042b0d..56b5ce0a 100644 --- a/packages/falcor-socket-datasource/src/FalcorPubSubDataSource.js +++ b/packages/falcor-socket-datasource/src/FalcorPubSubDataSource.js @@ -1,4 +1,4 @@ -import { v4 as uuidv4 } from 'uuid/v4'; +import { v4 as uuidv4 } from 'uuid'; export class FalcorPubSubDataSource { constructor(emitter, model, event = 'falcor-operation', cancel = 'cancel-falcor-operation') { From 1219041bc8b61c45978e0d68e70ebcc3cafea555 Mon Sep 17 00:00:00 2001 From: Leo Meyerovich Date: Sat, 29 Oct 2022 16:32:07 -0700 Subject: [PATCH 6/6] v2.11.3 --- lerna.json | 2 +- packages/falcor-socket-datasource/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lerna.json b/lerna.json index 0406dd72..3bf9038c 100644 --- a/lerna.json +++ b/lerna.json @@ -1,4 +1,4 @@ { "lerna": "2.0.0", - "version": "2.11.1" + "version": "2.11.3" } diff --git a/packages/falcor-socket-datasource/package.json b/packages/falcor-socket-datasource/package.json index 812497d4..592f11ec 100644 --- a/packages/falcor-socket-datasource/package.json +++ b/packages/falcor-socket-datasource/package.json @@ -1,5 +1,5 @@ { - "version": "2.11.1", + "version": "2.11.3", "name": "@graphistry/falcor-socket-datasource", "main": "dist/index.js", "browser": "dist/index.js",