Update babel packages to match major, fix dependency issues

This commit is contained in:
Shawn 2018-09-02 18:48:35 -05:00
parent 9eccd51f42
commit 4c81ed7b7c
13 changed files with 9946 additions and 3255 deletions

1
.gitignore vendored
View file

@ -22,3 +22,4 @@ public/bundle/bundle.js.map
public/bundle/Lekton-*
public/bundle/style.css
uploads

View file

@ -1,19 +1,16 @@
import React from 'react';
import PageLayout from '@components/PageLayout';
import { connect } from 'react-redux';
import { onHandleShowPageUri } from '../../actions/show';
import View from './view';
import PublishTool from '@containers/PublishTool';
class HomePage extends React.Component {
render () {
return (
<PageLayout
pageTitle={'Speech'}
pageUri={''}
>
<PublishTool />
</PageLayout>
);
}
const mapStateToProps = ({ show }) => {
return {
error : show.request.error,
requestType: show.request.type,
};
};
export default HomePage;
const mapDispatchToProps = {
onHandleShowPageUri,
};
export default connect(mapStateToProps, mapDispatchToProps)(View);

View file

@ -0,0 +1,19 @@
import React from 'react';
import PageLayout from '@components/PageLayout';
import PublishTool from '@containers/PublishTool';
class HomePage extends React.Component {
render () {
return (
<PageLayout
pageTitle={'Speech'}
pageUri={''}
>
<PublishTool />
</PageLayout>
);
}
};
export default HomePage;

View file

@ -11,7 +11,7 @@ server {
ssl_session_cache shared:SSL:20m;
ssl_session_timeout 1440m;
ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
ssl_protocols TLSv1.1 TLSv1.2;
ssl_prefer_server_ciphers on;
# Using list of ciphers from https://github.com/cloudflare/sslconfig
ssl_ciphers EECDH+CHACHA20:EECDH+AES128:RSA+AES128:EECDH+AES256:RSA+AES256:EECDH+3DES:RSA+3DES:!MD5;

5224
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -81,19 +81,16 @@
"winston-slack-webhook": "github:billbitt/winston-slack-webhook"
},
"devDependencies": {
"@babel/cli": "^7.0.0-beta.51",
"@babel/core": "^7.0.0-beta.51",
"@babel/plugin-proposal-object-rest-spread": "^7.0.0-beta.51",
"@babel/preset-env": "^7.0.0-beta.51",
"@babel/preset-react": "^7.0.0-beta.51",
"@babel/cli": "^7.0.0",
"@babel/core": "^7.0.0",
"@babel/plugin-proposal-object-rest-spread": "^7.0.0",
"@babel/polyfill": "^7.0.0",
"@babel/preset-env": "^7.0.0",
"@babel/preset-react": "^7.0.0",
"@babel/preset-stage-2": "^7.0.0",
"@babel/register": "^7.0.0",
"babel-loader": "^7.1.2",
"babel-plugin-module-resolver": "^3.1.1",
"babel-plugin-transform-object-rest-spread": "^6.26.0",
"babel-polyfill": "^6.26.0",
"babel-preset-es2015": "^6.24.1",
"babel-preset-react": "^6.24.1",
"babel-preset-stage-2": "^6.24.1",
"babel-register": "^6.26.0",
"builder": "^4.0.0",
"chai": "^4.1.2",
"chai-http": "^4.0.0",

View file

@ -1,6 +1,6 @@
// module imports
const moduleAlias = require('module-alias');
require('babel-polyfill');
require('@babel/polyfill');
// local imports
const createModuleAliases = require('./utils/createModuleAliases.js');

View file

@ -1,5 +1,5 @@
const logger = require('winston');
const db = require('../../../../models/index');
const db = require('../../../../models');
const authenticateChannelCredentials = (channelName, channelId, userPassword) => {
return new Promise((resolve, reject) => {

View file

@ -1,6 +1,6 @@
const logger = require('winston');
const db = require('../../models/index');
const db = require('../../models');
const getClaimIdByChannel = (channelName, channelClaimId, claimName) => {
logger.debug(`getClaimIdByChannel(${channelName}, ${channelClaimId}, ${claimName})`);

View file

@ -9,7 +9,7 @@ const logger = require('winston');
const Path = require('path');
// load local modules
const db = require('./models/index');
const db = require('./models');
const requestLogger = require('./middleware/requestLogger.js');
const createDatabaseIfNotExists = require('./models/utils/createDatabaseIfNotExists.js');
const { getWalletBalance } = require('./lbrynet/index');

View file

@ -9,7 +9,12 @@ const User = require('./user.js');
const Blocked = require('./blocked.js');
const Tor = require('./tor.js');
const {database, username, password} = require('@config/mysqlConfig');
const {
database,
username,
password,
} = require('@config/mysqlConfig');
if (!database || !username || !password) {
logger.warn('missing database, user, or password from mysqlConfig');
}

View file

@ -7,7 +7,7 @@ const customAliases = createModuleAliases();
module.exports = {
target: 'web',
entry : ['babel-polyfill', 'whatwg-fetch', './client/build/index.js'],
entry : ['@babel/polyfill', 'whatwg-fetch', './client/build/index.js'],
output: {
path : Path.join(__dirname, 'public/bundle'),
publicPath: '/bundle/',

7890
yarn.lock Normal file

File diff suppressed because it is too large Load diff