Skip to content

Commit

Permalink
Merge aea6f11 into 102341d
Browse files Browse the repository at this point in the history
  • Loading branch information
robisson committed Oct 29, 2018
2 parents 102341d + aea6f11 commit 182b4fb
Show file tree
Hide file tree
Showing 5 changed files with 1,665 additions and 1,425 deletions.
20 changes: 18 additions & 2 deletions .babelrc
@@ -1,4 +1,20 @@
{
"presets": ["es2015", "es2016", "es2017", "react", "stage-2", "flow"],
"retainLines": true
"presets": ["@babel/preset-env", "@babel/preset-react", "@babel/preset-flow"],
"retainLines": true,
"plugins": [
"@babel/plugin-syntax-dynamic-import",
"@babel/plugin-syntax-import-meta",
["@babel/plugin-proposal-class-properties", { "loose": true }],
"@babel/plugin-proposal-json-strings",
[
"@babel/plugin-proposal-decorators",
{
"legacy": true
}
],
"@babel/plugin-proposal-function-sent",
"@babel/plugin-proposal-export-namespace-from",
"@babel/plugin-proposal-numeric-separator",
"@babel/plugin-proposal-throw-expressions"
]
}
29 changes: 19 additions & 10 deletions package.json
Expand Up @@ -50,19 +50,28 @@
"check": "npm-check"
},
"devDependencies": {
"@babel/cli": "^7.1.2",
"@babel/core": "^7.1.2",
"@babel/node": "^7.0.0",
"@babel/plugin-proposal-class-properties": "^7.1.0",
"@babel/plugin-proposal-decorators": "^7.1.2",
"@babel/plugin-proposal-export-namespace-from": "^7.0.0",
"@babel/plugin-proposal-function-sent": "^7.1.0",
"@babel/plugin-proposal-json-strings": "^7.0.0",
"@babel/plugin-proposal-numeric-separator": "^7.0.0",
"@babel/plugin-proposal-throw-expressions": "^7.0.0",
"@babel/plugin-syntax-dynamic-import": "^7.0.0",
"@babel/plugin-syntax-import-meta": "^7.0.0",
"@babel/polyfill": "^7.0.0",
"@babel/preset-env": "^7.1.0",
"@babel/preset-flow": "^7.0.0",
"@babel/preset-react": "^7.0.0",
"apidoc": "0.17.6",
"axios-mock-adapter": "1.15.0",
"babel-cli": "6.26.0",
"babel-core": "6.26.3",
"babel-core": "^7.0.0-bridge.0",
"babel-eslint": "10.0.1",
"babel-loader": "7",
"babel-polyfill": "6.26.0",
"babel-preset-es2015": "6.24.1",
"babel-preset-es2016": "6.24.1",
"babel-preset-es2017": "6.24.1",
"babel-preset-flow": "6.23.0",
"babel-preset-react": "6.24.1",
"babel-preset-stage-2": "6.24.1",
"babel-jest": "^23.6.0",
"babel-loader": "^8.0.4",
"chai": "4.2.0",
"chai-http": "4.2.0",
"coveralls": "3.0.2",
Expand Down
20 changes: 8 additions & 12 deletions src/client/components/Signup/index.js
Expand Up @@ -82,21 +82,17 @@ type State = {
};

class Signup extends React.Component<Props, State> {
_onCreateAccount: Function;
state: State = {
email: null,
password: "",
confirmPassword: "",
confirmPasswordError: false,
requiredFields: false
};

state: State;

constructor(props) {
constructor(props){
super(props);

this.state = {
email: null,
password: "",
confirmPassword: "",
confirmPasswordError: false,
requiredFields: false
};

this._onCreateAccount = this._onCreateAccount.bind(this);
}

Expand Down
3 changes: 0 additions & 3 deletions webpack.config.js
Expand Up @@ -14,9 +14,6 @@ module.exports = {
test: /\.js?$/,
exclude: /node_modules/,
loader: 'babel-loader',
query: {
presets: ['es2015', 'es2016', 'es2017', 'react', 'stage-2']
}
}
]
}
Expand Down

0 comments on commit 182b4fb

Please sign in to comment.