Upgrade markdown-loader & marked (#7467)

* Upgrade markdown-loader & marked

* Align UglifyJS (wallet/shell)

* Add ethereumjs-util Babel compilation
This commit is contained in:
Jaco Greeff 2018-01-05 10:59:35 +01:00 committed by Afri Schoedon
parent ac95bfa285
commit 855c1126a4
9 changed files with 2194 additions and 2146 deletions

1462
js-old/package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -95,7 +95,6 @@
"istanbul": "1.0.0-alpha.2", "istanbul": "1.0.0-alpha.2",
"jsdom": "9.11.0", "jsdom": "9.11.0",
"json-loader": "0.5.4", "json-loader": "0.5.4",
"markdown-loader": "2.0.0",
"mocha": "3.2.0", "mocha": "3.2.0",
"mock-local-storage": "1.0.2", "mock-local-storage": "1.0.2",
"mock-socket": "6.0.4", "mock-socket": "6.0.4",
@ -156,7 +155,6 @@
"keythereum": "0.4.6", "keythereum": "0.4.6",
"lodash": "4.17.2", "lodash": "4.17.2",
"loglevel": "1.4.1", "loglevel": "1.4.1",
"marked": "0.3.6",
"material-ui": "0.16.5", "material-ui": "0.16.5",
"material-ui-chip-input": "0.11.1", "material-ui-chip-input": "0.11.1",
"mobx": "2.6.4", "mobx": "2.6.4",
@ -198,7 +196,7 @@
"sw-toolbox": "^3.6.0", "sw-toolbox": "^3.6.0",
"u2f-api": "0.0.9", "u2f-api": "0.0.9",
"u2f-api-polyfill": "0.4.3", "u2f-api-polyfill": "0.4.3",
"uglify-js": "2.8.16", "uglify-js": "2.8.22",
"useragent.js": "0.5.6", "useragent.js": "0.5.6",
"utf8": "2.1.2", "utf8": "2.1.2",
"valid-url": "1.0.9", "valid-url": "1.0.9",

View File

@ -26,7 +26,6 @@ export EditMeta from './EditMeta';
export ExecuteContract from './ExecuteContract'; export ExecuteContract from './ExecuteContract';
export ExportAccount from './ExportAccount'; export ExportAccount from './ExportAccount';
export Faucet from './Faucet'; export Faucet from './Faucet';
export FirstRun from './FirstRun';
export LoadContract from './LoadContract'; export LoadContract from './LoadContract';
export PasswordManager from './PasswordManager'; export PasswordManager from './PasswordManager';
export SaveContract from './SaveContract'; export SaveContract from './SaveContract';

View File

@ -22,9 +22,7 @@ import styles from '../application.css';
export default class Container extends Component { export default class Container extends Component {
static propTypes = { static propTypes = {
children: PropTypes.node.isRequired, children: PropTypes.node.isRequired
onCloseFirstRun: PropTypes.func,
showFirstRun: PropTypes.bool
}; };
render () { render () {

View File

@ -59,7 +59,7 @@ module.exports = {
}, },
{ {
test: /\.js$/, test: /\.js$/,
include: /(material-chip-input|ethereumjs-tx)/, include: /(material-chip-input|ethereumjs-tx|ethereumjs-util)/,
use: 'babel-loader' use: 'babel-loader'
}, },
{ {
@ -83,19 +83,6 @@ module.exports = {
} }
] ]
}, },
{
test: /\.md$/,
use: [
{
loader: 'html-loader',
options: {}
},
{
loader: 'markdown-loader',
options: {}
}
]
},
{ {
test: /\.css$/, test: /\.css$/,
include: [ /src/ ], include: [ /src/ ],

View File

@ -59,7 +59,7 @@ module.exports = {
}, },
{ {
test: /\.js$/, test: /\.js$/,
include: /(ethereumjs-tx)/, include: /(ethereumjs-tx|ethereumjs-util)/,
use: [ 'babel-loader' ] use: [ 'babel-loader' ]
} }
] ]

2829
js/package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -106,7 +106,8 @@
"istanbul": "1.0.0-alpha.2", "istanbul": "1.0.0-alpha.2",
"jsdom": "9.11.0", "jsdom": "9.11.0",
"json-loader": "0.5.4", "json-loader": "0.5.4",
"markdown-loader": "2.0.0", "markdown-loader": "2.0.1",
"marked": "0.3.9",
"mocha": "3.2.0", "mocha": "3.2.0",
"mock-local-storage": "1.0.2", "mock-local-storage": "1.0.2",
"mock-socket": "6.0.4", "mock-socket": "6.0.4",

View File

@ -16,7 +16,7 @@
module.exports = { module.exports = {
test: /\.js$/, test: /\.js$/,
include: /(get-own-enumerable-property-symbols|ethereumjs-tx|stringify-object)/, include: /(get-own-enumerable-property-symbols|ethereumjs-tx|ethereumjs-util|stringify-object)/,
use: [ { use: [ {
loader: 'happypack/loader', loader: 'happypack/loader',
options: { options: {