Skip to content

Commit

Permalink
Update/upgrade of npm dependencies (#1354)
Browse files Browse the repository at this point in the history
Bring dependencies to the latest
  • Loading branch information
fryjordan authored Apr 26, 2022
1 parent 0edfe2c commit ef9a9de
Show file tree
Hide file tree
Showing 9 changed files with 765 additions and 942 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,9 @@ jobs:
COUCHDB_IMAGE: ${{ matrix.COUCHDB_IMAGE }}
NIGHTWATCH_SKIPTAGS: ${{ matrix.NIGHTWATCH_SKIPTAGS }}
run: |
grunt debugDev && DIST=./dist/debug ./bin/fauxton &
sleep 60
grunt debugDev
DIST=./dist/debug ./bin/fauxton &
sleep 10
curl https://localhost:8000
- name: Run e2e tests
env:
Expand Down
3 changes: 2 additions & 1 deletion app/core/__tests__/ajax.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
// License for the specific language governing permissions and limitations under
// the License.
import fetchMock from 'fetch-mock';
import { filter } from 'rxjs/operators';
import {
json,
fetchObserver,
Expand Down Expand Up @@ -77,7 +78,7 @@ describe('Fauxton Ajax', () => {
}
});

unsubscribe = fetchObserver.filter(resp => resp.status === 400).subscribe({
unsubscribe = fetchObserver.pipe(filter(resp => resp.status === 400)).subscribe({
next (resp) {
done();
expect(resp.status).toEqual(400);
Expand Down
3 changes: 1 addition & 2 deletions app/core/ajax.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import 'whatwg-fetch';
import {defaultsDeep} from "lodash";
import {Subject} from 'rxjs/Subject';
import 'rxjs/add/operator/filter';
import {Subject} from 'rxjs';

/* Add a multicast observer so that all fetch requests can be observed
Some usage examples:
Expand Down
4 changes: 4 additions & 0 deletions assets/less/templates.less
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,10 @@
color: black;
}

.Toastify__toast-icon{
display: None;
}

.Toastify__toast--info {
&, .Toastify__close-button--info {
border-left: 6px solid @infoAlertBackground;
Expand Down
1,622 changes: 721 additions & 901 deletions package-lock.json

Large diffs are not rendered by default.

60 changes: 29 additions & 31 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,95 +10,93 @@
"fauxton": "./bin/fauxton"
},
"devDependencies": {
"@babel/cli": "^7.17.3",
"@babel/core": "^7.17.3",
"@babel/cli": "^7.17.6",
"@babel/core": "^7.17.9",
"@babel/eslint-parser": "^7.17.0",
"@babel/plugin-proposal-class-properties": "^7.16.7",
"@babel/plugin-proposal-object-rest-spread": "^7.17.3",
"@babel/plugin-transform-async-to-generator": "^7.16.8",
"@babel/plugin-transform-object-assign": "^7.16.7",
"@babel/preset-env": "^7.16.11",
"@babel/preset-react": "^7.16.7",
"@babel/register": "^7.17.0",
"@babel/register": "^7.17.7",
"babel-jest": "^27.5.1",
"babel-loader": "^8.2.3",
"babel-loader": "^8.2.5",
"babel-plugin-array-includes": "^2.0.3",
"bootstrap": "^3.4.1",
"chromedriver": "^100.0.0",
"css-loader": "^6.7.1",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.6",
"es5-shim": "4.5.4",
"eslint": "^8.9.0",
"eslint-plugin-react": "^7.28.0",
"es5-shim": "^4.6.6",
"eslint": "^8.14.0",
"eslint-plugin-react": "^7.29.4",
"eslint-webpack-plugin": "^3.1.1",
"expose-loader": "^3.1.0",
"fetch-mock": "^9.11.0",
"fs-extra": "^10.0.0",
"fs-extra": "^10.1.0",
"grunt": "^1.5.2",
"grunt-cli": "^1.4.3",
"grunt-contrib-clean": "^2.0.1",
"grunt-contrib-copy": "^1.0.0",
"grunt-exec": "^1.0.1",
"grunt-shell": "^2.1.0",
"grunt-exec": "^3.0.0",
"grunt-shell": "^4.0.0",
"html-webpack-plugin": "^5.5.0",
"jest": "^27.5.1",
"less": "^3.13.1",
"less-loader": "^10.2.0",
"mini-css-extract-plugin": "^2.6.0",
"mock-local-storage": "^1.1.20",
"mock-local-storage": "^1.1.22",
"nightwatch": "^2.1.3",
"node-fetch": "^2.6.7",
"redux-mock-store": "^1.5.4",
"sinon": "^7.5.0",
"sinon": "^13.0.2",
"style-loader": "^3.3.1",
"webpack": "^5.70.0",
"webpack": "^5.72.0",
"webpack-cli": "^4.9.2",
"webpack-dev-server": "^4.8.1"
},
"dependencies": {
"@webcomponents/url": "^0.7.8",
"acorn": "^8.7.0",
"async": "~2.6.4",
"backbone": "^1.4.0",
"acorn": "^8.7.1",
"async": "^3.2.3",
"backbone": "^1.4.1",
"base-64": "^1.0.0",
"bluebird": "^3.7.2",
"brace": "^0.11.0",
"classnames": "^2.2.6",
"clipboard": "^2.0.8",
"cookie": "^0.3.1",
"core-js": "^2.6.11",
"express": "^4.17.2",
"core-js": "^3.22.2",
"http-proxy": "^1.18.1",
"jquery": "^3.5.1",
"jquery-param-fn": "^1.0.0",
"jsondiffpatch": "^0.3.11",
"jsondiffpatch": "^0.4.1",
"lodash": "^4.17.20",
"mkdirp": "^0.5.6",
"mkdirp": "^1.0.4",
"moment": "^2.29.3",
"nano": "^9.0.5",
"nano": "^10.0.0",
"prop-types": "^15.8.1",
"rc-slider": "^9.7.5",
"react": "^16.14.0",
"react-bootstrap": "^0.31.3",
"react-dom": "^16.14.0",
"react-motion": "^0.5.0",
"react-overlays": "^0.7.0",
"react-redux": "^7.2.6",
"react-redux": "^8.0.1",
"react-select": "^1.3.0",
"react-toastify": "^5.5.0",
"redux": "^4.1.2",
"react-toastify": "^8.2.0",
"redux": "^4.2.0",
"redux-thunk": "^2.4.1",
"regenerator-runtime": "^0.11.1",
"regenerator-runtime": "^0.13.9",
"request": "^2.88.2",
"rxjs": "^5.5.12",
"semver": "^5.7.1",
"send": "^0.16.2",
"url": "~0.7.9",
"rxjs": "^7.5.5",
"semver": "^7.3.7",
"send": "^0.18.0",
"url": "^0.11.0",
"urls": "~0.0.3",
"uuid": "^8.3.2",
"whatwg-fetch": "^3.6.2",
"yargs": "^17.3.1"
"yargs": "^17.4.1"
},
"scripts": {
"stylecheck": "eslint --ext=js,jsx .",
Expand Down
6 changes: 3 additions & 3 deletions test/nightwatch_tests/custom-commands/populateDatabase.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
var util = require('util'),
events = require('events'),
helpers = require('../helpers/helpers.js'),
async = require('async'),
whilst = require('async/whilst'),
request = require('request');

function PopulateDatabase () {
Expand All @@ -29,8 +29,8 @@ PopulateDatabase.prototype.command = function (databaseName, count) {
const db_url = this.client.options.db_url;
let i = 0;

async.whilst(
() => { return i < (count ? count : 20); },
whilst(
async () => { return i < (count ? count : 20); },
(cb) => {
i++;
var documentId = 'document_' + i;
Expand Down
2 changes: 1 addition & 1 deletion webpack.config.dev.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ module.exports = {
mode: 'development',

entry: {
bundle: ['core-js/fn/array', 'core-js/fn/string/ends-with', 'core-js/fn/string/starts-with', 'core-js/fn/object', 'core-js/fn/symbol', 'core-js/fn/promise', 'regenerator-runtime/runtime', './app/main.js'] //Our starting point for our development.
bundle: ['core-js/features/array', 'core-js/features/string/ends-with', 'core-js/features/string/starts-with', 'core-js/features/object', 'core-js/features/symbol', 'core-js/features/promise', 'regenerator-runtime/runtime', './app/main.js'] //Our starting point for our development.
},

output: {
Expand Down
2 changes: 1 addition & 1 deletion webpack.config.release.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ module.exports = {

// Entry point for static analyzer:
entry: {
bundle: ['core-js/fn/array', 'core-js/fn/string/ends-with', 'core-js/fn/string/starts-with', 'core-js/fn/object', 'core-js/fn/symbol', 'core-js/fn/promise', 'regenerator-runtime/runtime', './app/main.js']
bundle: ['core-js/features/array', 'core-js/features/string/ends-with', 'core-js/features/string/starts-with', 'core-js/features/object', 'core-js/features/symbol', 'core-js/features/promise', 'regenerator-runtime/runtime', './app/main.js']
},

output: {
Expand Down

0 comments on commit ef9a9de

Please sign in to comment.