diff --git a/.eslintrc b/.eslintrc
index b66654e..3d62cbc 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,12 +1,7 @@
{
- "parser": "babel-eslint",
"extends": [
"react-app"
],
- "env": {
- "browser" : true
- },
- "globals": {},
"rules": {
"key-spacing" : "off",
"jsx-quotes" : [2, "prefer-single"],
diff --git a/package.json b/package.json
index c13632a..03ac6f1 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,6 @@
"@material-ui/core": "^3.1.0",
"@material-ui/icons": "^3.0.0",
"axios": "^0.18.0",
- "babel-polyfill": "^6.26.0",
"chlu-api-client": "ChluNetwork/chlu-api-client-js#semver:~0.3.0",
"chlu-ipfs-support": "ChluNetwork/chlu-ipfs-support#semver:~0.2.5",
"chlu-marketplace-js": "ChluNetwork/chlu-marketplace-js#semver:~0.4.0",
@@ -33,7 +32,7 @@
"react-router": "^4.2.0",
"react-router-dom": "^4.2.2",
"react-router-redux": "^5.0.0-alpha.9",
- "react-scripts": "1.1.1",
+ "react-scripts": "2.0.5",
"react-select": "2.0.0",
"react-star-rating-component": "^1.3.0",
"react-swipeable-views": "^0.12.13",
@@ -48,36 +47,30 @@
"node-forge": "0.7.5"
},
"scripts": {
- "start": "react-scripts start",
- "xstart": "cross-env NODE_PATH=./src react-scripts start",
- "build": "react-scripts build",
- "prebuild": "cp webpack.config.prod.js node_modules/react-scripts/config",
- "postbuild": "npx uglify-es build/static/js/main.*.js -o build/static/js/$(ls build/static/js | head -n 1)",
+ "start": "cross-env NODE_PATH=./src react-scripts start",
+ "build": "react-scripts --max_old_space_size=4092 build",
"deploy-s3": "npm run delete-source-maps && aws s3 sync build/ s3://demo.chlu.io --delete --exclude index.html --acl public-read && aws s3 sync build/ s3://demo.chlu.io --exclude '*' --include index.html --acl public-read --cache-control 'max-age=0'",
"deploy-ipfs": "npm run delete-source-maps && node ./deploy.js",
"delete-source-maps": "find ./build -name *.map -type f -delete",
- "test": "react-scripts test --env=jsdom",
+ "analyze": "source-map-explorer",
+ "test": "react-scripts test",
"eject": "react-scripts eject",
- "lint": "eslint ."
+ "lint": "eslint ./src"
},
"eslintConfig": {
"extends": "react-app"
},
- "devDependencies": {
- "babel-eslint": "^7.2.3",
- "enzyme": "^2.9.1",
- "enzyme-to-json": "^1.5.1",
- "eslint": "^3.19.0",
- "eslint-config-react-app": "^2.0.0",
- "eslint-plugin-flowtype": "^2.33.0",
- "eslint-plugin-import": "^2.2.0",
- "eslint-plugin-jsx-a11y": "^5.0.1",
- "eslint-plugin-react": "^7.0.1",
- "immutability-helper": "^2.3.1",
- "jest-enzyme": "^3.8.2",
- "redux-mock-store": "^1.3.0"
- },
"engines": {
"node": "^8.9.4"
+ },
+ "browserslist": [
+ ">0.2%",
+ "not dead",
+ "not ie <= 11",
+ "not op_mini all"
+ ],
+ "devDependencies": {
+ "cross-env": "^5.2.0",
+ "source-map-explorer": "^1.6.0"
}
}
diff --git a/src/helpers/chlu.js b/src/helpers/chlu.js
index ed6a95b..4da3d8d 100644
--- a/src/helpers/chlu.js
+++ b/src/helpers/chlu.js
@@ -1,9 +1,6 @@
-import ChluIPFS from 'chlu-ipfs-support'
-import ChluAPIClient from 'chlu-api-client'
-
function getChluNetwork() {
const isProduction = process.env.NODE_ENV === 'production'
- const defaultNetwork = isProduction ? ChluIPFS.networks.staging : ChluIPFS.networks.experimental
+ const defaultNetwork = isProduction ? 'staging' : 'experimental'
return process.env.REACT_APP_CHLU_NETWORK || defaultNetwork
}
@@ -18,6 +15,7 @@ export async function getChluIPFS() {
OrbitDBIndexName: 'NOOP'
}
if (!window.chluIpfs) {
+ const ChluIPFS = (await import('chlu-ipfs-support')).default
window.chluIpfs = new ChluIPFS(options)
// Resolve DIDs through the API Client. Needed for review publishing
window.chluIpfs.didIpfsHelper.getDID = (...args) => chluApiClient.didIpfsHelper.getDID(...args)
@@ -32,12 +30,13 @@ export async function getChluIPFS() {
}
export async function getChluAPIClient() {
- const options = {
- network: getChluNetwork(),
- publishApiUrl: process.env.REACT_APP_CHLU_PUBLISH_URL || 'https://publish.chlu.io',
- queryApiUrl: process.env.REACT_APP_CHLU_QUERY_URL || 'https://query.chlu.io'
- }
if (!window.chluApiClient) {
+ const ChluAPIClient = (await import('chlu-api-client')).default
+ const options = {
+ network: getChluNetwork(),
+ publishApiUrl: process.env.REACT_APP_CHLU_PUBLISH_URL || 'https://publish.chlu.io',
+ queryApiUrl: process.env.REACT_APP_CHLU_QUERY_URL || 'https://query.chlu.io'
+ }
window.chluApiClient = new ChluAPIClient(options)
await window.chluApiClient.start()
}
diff --git a/src/index.js b/src/index.js
index e893d3a..c874b2e 100644
--- a/src/index.js
+++ b/src/index.js
@@ -6,10 +6,6 @@ import App from './containers/App';
// others
//import registerServiceWorker from './registerServiceWorker';
-import { getChluAPIClient } from 'helpers/chlu';
ReactDOM.render(, document.getElementById('root'));
-//registerServiceWorker();
-
-console.log('Chlu API Client Starting...')
-getChluAPIClient().then(() => console.log('Chlu API Client READY'))
+//registerServiceWorker();
\ No newline at end of file
diff --git a/webpack.config.prod.js b/webpack.config.prod.js
deleted file mode 100644
index e24f200..0000000
--- a/webpack.config.prod.js
+++ /dev/null
@@ -1,371 +0,0 @@
-// @remove-on-eject-begin
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-// @remove-on-eject-end
-'use strict';
-
-const autoprefixer = require('autoprefixer');
-const path = require('path');
-const webpack = require('webpack');
-const HtmlWebpackPlugin = require('html-webpack-plugin');
-const ExtractTextPlugin = require('extract-text-webpack-plugin');
-const ManifestPlugin = require('webpack-manifest-plugin');
-const InterpolateHtmlPlugin = require('react-dev-utils/InterpolateHtmlPlugin');
-const SWPrecacheWebpackPlugin = require('sw-precache-webpack-plugin');
-const eslintFormatter = require('react-dev-utils/eslintFormatter');
-const ModuleScopePlugin = require('react-dev-utils/ModuleScopePlugin');
-const paths = require('./paths');
-const getClientEnvironment = require('./env');
-
-// Webpack uses `publicPath` to determine where the app is being served from.
-// It requires a trailing slash, or the file assets will get an incorrect path.
-const publicPath = paths.servedPath;
-// Some apps do not use client-side routing with pushState.
-// For these, "homepage" can be set to "." to enable relative asset paths.
-const shouldUseRelativeAssetPaths = publicPath === './';
-// Source maps are resource heavy and can cause out of memory issue for large source files.
-const shouldUseSourceMap = process.env.GENERATE_SOURCEMAP !== 'false';
-// `publicUrl` is just like `publicPath`, but we will provide it to our app
-// as %PUBLIC_URL% in `index.html` and `process.env.PUBLIC_URL` in JavaScript.
-// Omit trailing slash as %PUBLIC_URL%/xyz looks better than %PUBLIC_URL%xyz.
-const publicUrl = publicPath.slice(0, -1);
-// Get environment variables to inject into our app.
-const env = getClientEnvironment(publicUrl);
-
-// Assert this just to be safe.
-// Development builds of React are slow and not intended for production.
-if (env.stringified['process.env'].NODE_ENV !== '"production"') {
- throw new Error('Production builds must have NODE_ENV=production.');
-}
-
-// Note: defined here because it will be used more than once.
-const cssFilename = 'static/css/[name].[contenthash:8].css';
-
-// ExtractTextPlugin expects the build output to be flat.
-// (See https://github.com/webpack-contrib/extract-text-webpack-plugin/issues/27)
-// However, our output is structured with css, js and media folders.
-// To have this structure working with relative paths, we have to use custom options.
-const extractTextPluginOptions = shouldUseRelativeAssetPaths
- ? // Making sure that the publicPath goes back to to build folder.
- { publicPath: Array(cssFilename.split('/').length).join('../') }
- : {};
-
-// This is the production configuration.
-// It compiles slowly and is focused on producing a fast and minimal bundle.
-// The development configuration is different and lives in a separate file.
-module.exports = {
- // Don't attempt to continue if there are any errors.
- bail: true,
- // We generate sourcemaps in production. This is slow but gives good results.
- // You can exclude the *.map files from the build during deployment.
- devtool: shouldUseSourceMap ? 'source-map' : false,
- // In production, we only want to load the polyfills and the app code.
- entry: [require.resolve('./polyfills'), paths.appIndexJs],
- output: {
- // The build folder.
- path: paths.appBuild,
- // Generated JS file names (with nested folders).
- // There will be one main bundle, and one file per asynchronous chunk.
- // We don't currently advertise code splitting but Webpack supports it.
- filename: 'static/js/[name].[chunkhash:8].js',
- chunkFilename: 'static/js/[name].[chunkhash:8].chunk.js',
- // We inferred the "public path" (such as / or /my-project) from homepage.
- publicPath: publicPath,
- // Point sourcemap entries to original disk location (format as URL on Windows)
- devtoolModuleFilenameTemplate: info =>
- path
- .relative(paths.appSrc, info.absoluteResourcePath)
- .replace(/\\/g, '/'),
- },
- resolve: {
- // This allows you to set a fallback for where Webpack should look for modules.
- // We placed these paths second because we want `node_modules` to "win"
- // if there are any conflicts. This matches Node resolution mechanism.
- // https://github.com/facebookincubator/create-react-app/issues/253
- modules: ['node_modules', paths.appNodeModules].concat(
- // It is guaranteed to exist because we tweak it in `env.js`
- process.env.NODE_PATH.split(path.delimiter).filter(Boolean)
- ),
- // These are the reasonable defaults supported by the Node ecosystem.
- // We also include JSX as a common component filename extension to support
- // some tools, although we do not recommend using it, see:
- // https://github.com/facebookincubator/create-react-app/issues/290
- // `web` extension prefixes have been added for better support
- // for React Native Web.
- extensions: ['.web.js', '.mjs', '.js', '.json', '.web.jsx', '.jsx'],
- alias: {
- // @remove-on-eject-begin
- // Resolve Babel runtime relative to react-scripts.
- // It usually still works on npm 3 without this but it would be
- // unfortunate to rely on, as react-scripts could be symlinked,
- // and thus babel-runtime might not be resolvable from the source.
- 'babel-runtime': path.dirname(
- require.resolve('babel-runtime/package.json')
- ),
- // @remove-on-eject-end
- // Support React Native Web
- // https://www.smashingmagazine.com/2016/08/a-glimpse-into-the-future-with-react-native-for-web/
- 'react-native': 'react-native-web',
- },
- plugins: [
- // Prevents users from importing files from outside of src/ (or node_modules/).
- // This often causes confusion because we only process files within src/ with babel.
- // To fix this, we prevent you from importing files out of src/ -- if you'd like to,
- // please link the files into your node_modules/ and let module-resolution kick in.
- // Make sure your source files are compiled, as they will not be processed in any way.
- new ModuleScopePlugin(paths.appSrc, [paths.appPackageJson]),
- ],
- },
- module: {
- strictExportPresence: true,
- rules: [
- // TODO: Disable require.ensure as it's not a standard language feature.
- // We are waiting for https://github.com/facebookincubator/create-react-app/issues/2176.
- // { parser: { requireEnsure: false } },
-
- // First, run the linter.
- // It's important to do this before Babel processes the JS.
- {
- test: /\.(js|jsx|mjs)$/,
- enforce: 'pre',
- use: [
- {
- options: {
- formatter: eslintFormatter,
- eslintPath: require.resolve('eslint'),
- // @remove-on-eject-begin
- // TODO: consider separate config for production,
- // e.g. to enable no-console and no-debugger only in production.
- baseConfig: {
- extends: [require.resolve('eslint-config-react-app')],
- },
- ignore: false,
- useEslintrc: false,
- // @remove-on-eject-end
- },
- loader: require.resolve('eslint-loader'),
- },
- ],
- include: paths.appSrc,
- },
- {
- // "oneOf" will traverse all following loaders until one will
- // match the requirements. When no loader matches it will fall
- // back to the "file" loader at the end of the loader list.
- oneOf: [
- // "url" loader works just like "file" loader but it also embeds
- // assets smaller than specified size as data URLs to avoid requests.
- {
- test: [/\.bmp$/, /\.gif$/, /\.jpe?g$/, /\.png$/],
- loader: require.resolve('url-loader'),
- options: {
- limit: 10000,
- name: 'static/media/[name].[hash:8].[ext]',
- },
- },
- // Process JS with Babel.
- {
- test: /\.(js|jsx|mjs)$/,
- include: paths.appSrc,
- loader: require.resolve('babel-loader'),
- options: {
- // @remove-on-eject-begin
- babelrc: false,
- presets: [require.resolve('babel-preset-react-app')],
- // @remove-on-eject-end
- compact: true,
- },
- },
- // The notation here is somewhat confusing.
- // "postcss" loader applies autoprefixer to our CSS.
- // "css" loader resolves paths in CSS and adds assets as dependencies.
- // "style" loader normally turns CSS into JS modules injecting