Skip to content

Commit

Permalink
Merge pull request #929 from singnet/package-updating
Browse files Browse the repository at this point in the history
Package versions have been updated
  • Loading branch information
MarinaFedy authored Aug 12, 2024
2 parents df514c5 + 8e9e0b1 commit 40bd664
Show file tree
Hide file tree
Showing 265 changed files with 4,488 additions and 4,613 deletions.
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,6 @@ src/assets/images/GetStarted/*
#ThirdPartyServices Images
src/assets/images/ThirdPartyServices/*

#storybook
storybook-static/

# macbook files
.DS_Store

Expand Down
4 changes: 4 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

npx lint-staged
11 changes: 11 additions & 0 deletions .lintstagedrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@

{
"*.js": [
"prettier --write",
"eslint"
],
"*.html": [
"eslint",
"prettier --write"
]
}
4 changes: 0 additions & 4 deletions .storybook/addons.js

This file was deleted.

18 changes: 0 additions & 18 deletions .storybook/config.js

This file was deleted.

5 changes: 0 additions & 5 deletions .storybook/preview-head.html

This file was deleted.

10 changes: 9 additions & 1 deletion config-overrides.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
const webpack = require("webpack");
const { aliasWebpack, configPaths } = require("react-app-alias");

const aliasMap = configPaths("./jsconfig.json");

const options = {
alias: aliasMap,
};

module.exports = function override(config) {
const modifiedConfig = aliasWebpack(options)(config);
const fallback = config.resolve.fallback || {};
Object.assign(fallback, {
os: require.resolve("os-browserify"),
Expand All @@ -23,5 +31,5 @@ module.exports = function override(config) {
fullySpecified: false,
},
});
return config;
return modifiedConfig;
};
10 changes: 10 additions & 0 deletions jsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"compilerOptions": {
"baseUrl": "node_modules",
"paths": {
"@material-ui/core/*": ["@mui/material/*"],
"@material-ui/icons/*": ["@mui/icons-material/*"],
"@material-ui/styles/*": ["@mui/styles/*"]
}
}
}
117 changes: 53 additions & 64 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,50 +3,38 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"@improbable-eng/grpc-web": "^0.9.6",
"@material-ui/core": "^4.11.2",
"@material-ui/icons": "^4.11.2",
"@material-ui/lab": "^3.0.0-alpha.30",
"@material-ui/styles": "^4.11.2",
"@sentry/browser": "^5.29.0",
"aws-amplify": "^4.3.46",
"clsx": "^1.1.1",
"color": "^3.1.3",
"css-loader": "^5.0.1",
"cytoscape": "^3.17.1",
"cytoscape-cola": "^2.4.0",
"cytoscape-context-menus": "^3.1.0",
"date-fns": "^2.16.1",
"get-video-id": "^3.2.0",
"google-protobuf": "^3.14.0",
"history": "^4.9.0",
"html-react-parser": "^0.9.1",
"html2canvas": "^1.0.0-rc.7",
"jquery": "^3.5.1",
"@emotion/react": "^11.13.0",
"@emotion/styled": "^11.13.0",
"@improbable-eng/grpc-web": "^0.15.0",
"@mui/icons-material": "^5.16.6",
"@mui/material": "^5.16.6",
"@mui/styles": "^5.16.6",
"@sentry/browser": "^8.23.0",
"aws-amplify": "^6.4.4",
"axios": "^1.7.3",
"clsx": "^2.1.1",
"get-video-id": "^4.1.7",
"google-protobuf": "^3.21.4",
"history": "^5.3.0",
"html-react-parser": "^5.1.12",
"html2canvas": "^1.4.1",
"jquery": "^3.7.1",
"lodash": "latest",
"material-design-icons": "^3.0.1",
"material-ui": "^1.0.0-beta.47",
"material-ui-flat-pagination": "^3.2.0",
"material-ui-rating": "^3.1.1",
"moment": "^2.30.1",
"notistack": "^0.8.9",
"papaparse": "^5.3.0",
"path": "^0.12.7",
"query-string": "^6.13.7",
"react": "^18.2.0",
"query-string": "^9.1.0",
"react": "^18.3.1",
"react-app-rewired": "^2.2.1",
"react-async-script-loader": "^0.3.0",
"react-copy-to-clipboard": "^5.0.1",
"react-dom": "^18.2.0",
"react-dropzone": "^10.2.1",
"react-file-drop": "^0.2.8",
"react-ga": "^2.6.0",
"react-copy-to-clipboard": "^5.1.0",
"react-dom": "^18.3.1",
"react-dropzone": "^14.2.3",
"react-file-drop": "^3.1.6",
"react-ga": "^3.3.1",
"react-google-charts": "^4.0.1",
"react-helmet": "^6.1.0",
"react-image-gallery": "^1.3.0",
"react-json-view": "^1.21.3",
"react-redux": "^9.1.0",
"react-router-dom": "^5.2.0",
"react-redux": "^9.1.2",
"react-router-dom": "^6.26.0",
"react-router-sitemap": "^1.2.0",
"react-scripts": "^5.0.1",
"react-slick": "^0.30.2",
Expand All @@ -55,28 +43,31 @@
"redux": "^5.0.1",
"redux-thunk": "^3.1.0",
"scrypt": "github:barrysteyn/node-scrypt#fb60a8d3c158fe115a624b5ffa7480f3a24b03fb",
"singularitynet-platform-contracts": "1.0.4",
"singularitynet-platform-contracts": "^0.3.4",
"slick-carousel": "^1.8.1",
"snet-sdk-web": "^4.0.0",
"utf8": "^3.0.0",
"validate.js": "^0.13.1",
"web3": "^4.5.0"
"web3": "^4.11.1"
},
"resolutions": {
"concat-stream": "github:singnet/concat-stream"
},
"overrides": {
"rimraf": "^4.0.0",
"glob": "^10.4.5"
},
"scripts": {
"start": "react-app-rewired --openssl-legacy-provider start",
"build": "npm run sitemap && react-app-rewired --max_old_space_size=8192 build",
"test": "react-app-rewired test",
"eject": "react-app-rewired eject",
"lint": "eslint .",
"lint:fix": "eslint . --fix",
"storybook": "start-storybook -p 6006",
"build-storybook": "build-storybook",
"sitemap": "babel-node scripts/sitemap-generator.js",
"zip-components": "babel-node scripts/zip-components.js",
"generate-stubs": "babel-node scripts/generate-stubs.js"
"generate-stubs": "babel-node scripts/generate-stubs.js",
"prepare": "husky install"
},
"lint-staged": {
"*.{js,jsx}": [
Expand All @@ -100,20 +91,17 @@
]
},
"devDependencies": {
"@babel/node": "^7.23.9",
"@babel/preset-env": "^7.24.0",
"@storybook/addon-actions": "^5.3.21",
"@storybook/addon-links": "^5.3.21",
"@storybook/addons": "^5.3.21",
"@storybook/react": "^5.3.21",
"adm-zip": "0.5.5",
"archiver": "5.3.0",
"babel-preset-es2015": "^6.24.1",
"babel-preset-react": "^6.24.1",
"babel-register": "^6.26.0",
"chalk": "4.1.1",
"dotenv": "8.2.0",
"eslint": "^8.57.0",
"@babel/core": "^7.25.2",
"@babel/node": "^7.25.0",
"@babel/plugin-transform-private-property-in-object": "^7.24.7",
"@babel/preset-env": "^7.25.3",
"@babel/preset-react": "^7.24.7",
"@babel/register": "^7.24.6",
"adm-zip": "0.5.15",
"ajv": "^8.17.1",
"archiver": "7.0.1",
"chalk": "5.3.0",
"dotenv": "16.4.5",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-prettier": "^9.1.0",
"eslint-config-react-app": "^7.0.1",
Expand All @@ -123,14 +111,15 @@
"eslint-plugin-promise": "^6.1.1",
"eslint-plugin-react": "^7.34.0",
"eslint-plugin-react-hooks": "^4.6.0",
"husky": "^2.7.0",
"lint-staged": "^8.2.0",
"husky": "^8.0.0",
"lint-staged": "^15.2.8",
"os-browserify": "^0.3.0",
"path-browserify": "^1.0.1",
"prettier": "^3.2.5",
"prompts": "^2.4.1",
"rimraf": "^3.0.2",
"storybook-addon-react-docgen": "^1.2.42",
"storybook-addon-react-live-edit": "^2.0.4",
"ts-protoc-gen": "^0.12.0"
"prettier": "^3.3.3",
"prompts": "^2.4.2",
"react-app-alias": "^2.2.2",
"source-map-loader": "^5.0.0",
"ts-protoc-gen": "^0.15.0",
"url": "^0.11.4"
}
}
3 changes: 3 additions & 0 deletions public/robot.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
User - agent: *
Allow: /
Sitemap: https://www.beta.singularitynet.io/sitemap.xml
7 changes: 3 additions & 4 deletions scripts/sitemap-generator.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
require("dotenv").config();
require("babel-register")({
presets: ["babel-preset-es2015", "babel-preset-react"],
});

const axios = require("axios");
require("@babel/register")({
presets: ["@babel/preset-env", "@babel/preset-react"],
});

const defaultPagination = {
q: "",
Expand Down
6 changes: 3 additions & 3 deletions scripts/sitemap-routes.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import React from "react";
import { Route } from "react-router-dom";
import { Route, Routes as Switch } from "react-router-dom";
import Routes from "../src/utility/constants/Routes";

export default (
<Route>
<Switch>
<Route path={`/${Routes.SIGNUP}`} />
<Route path={`/${Routes.LOGIN}`} />
<Route path={`/${Routes.FORGOT_PASSWORD}`} />
Expand All @@ -17,5 +17,5 @@ export default (
<Route path="/" exact />
<Route path={`/${Routes.GET_STARTED}`} />
<Route path={`/${Routes.AI_REQUEST_FORM}`} />
</Route>
</Switch>
);
Loading

0 comments on commit 40bd664

Please sign in to comment.