Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Upgrade markdown-loader & marked #7467

Merged
merged 3 commits into from
Jan 5, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1,478 changes: 529 additions & 949 deletions js-old/package-lock.json

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions js-old/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@
"istanbul": "1.0.0-alpha.2",
"jsdom": "9.11.0",
"json-loader": "0.5.4",
"markdown-loader": "2.0.0",
"mocha": "3.2.0",
"mock-local-storage": "1.0.2",
"mock-socket": "6.0.4",
Expand Down Expand Up @@ -156,7 +155,6 @@
"keythereum": "0.4.6",
"lodash": "4.17.2",
"loglevel": "1.4.1",
"marked": "0.3.6",
"material-ui": "0.16.5",
"material-ui-chip-input": "0.11.1",
"mobx": "2.6.4",
Expand Down Expand Up @@ -198,7 +196,7 @@
"sw-toolbox": "^3.6.0",
"u2f-api": "0.0.9",
"u2f-api-polyfill": "0.4.3",
"uglify-js": "2.8.16",
"uglify-js": "2.8.22",
"useragent.js": "0.5.6",
"utf8": "2.1.2",
"valid-url": "1.0.9",
Expand Down
1 change: 0 additions & 1 deletion js-old/src/modals/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ export EditMeta from './EditMeta';
export ExecuteContract from './ExecuteContract';
export ExportAccount from './ExportAccount';
export Faucet from './Faucet';
export FirstRun from './FirstRun';
export LoadContract from './LoadContract';
export PasswordManager from './PasswordManager';
export SaveContract from './SaveContract';
Expand Down
4 changes: 1 addition & 3 deletions js-old/src/views/Application/Container/container.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,7 @@ import styles from '../application.css';

export default class Container extends Component {
static propTypes = {
children: PropTypes.node.isRequired,
onCloseFirstRun: PropTypes.func,
showFirstRun: PropTypes.bool
children: PropTypes.node.isRequired
};

render () {
Expand Down
15 changes: 1 addition & 14 deletions js-old/webpack/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ module.exports = {
},
{
test: /\.js$/,
include: /(material-chip-input|ethereumjs-tx)/,
include: /(material-chip-input|ethereumjs-tx|ethereumjs-util)/,
use: 'babel-loader'
},
{
Expand All @@ -83,19 +83,6 @@ module.exports = {
}
]
},
{
test: /\.md$/,
use: [
{
loader: 'html-loader',
options: {}
},
{
loader: 'markdown-loader',
options: {}
}
]
},
{
test: /\.css$/,
include: [ /src/ ],
Expand Down
2 changes: 1 addition & 1 deletion js-old/webpack/vendor.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ module.exports = {
},
{
test: /\.js$/,
include: /(ethereumjs-tx)/,
include: /(ethereumjs-tx|ethereumjs-util)/,
use: [ 'babel-loader' ]
}
]
Expand Down