Skip to content
This repository has been archived by the owner on May 24, 2022. It is now read-only.

WIP: Relates to #281. Partly fixes yarn electron error. Error with sed running fixElectronBug script remains #283

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,14 @@ yarn --version // Should be at least 1.4.2
```bash
git clone https://github.com/paritytech/fether
cd ./fether
```

### Update Yarn and install dependencies

```bash
npm install --global yarn;
brew upgrade yarn;
Copy link
Collaborator

@amaury1093 amaury1093 Dec 13, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's a mention to require yarn 1.4.2 above, and that is enough imo. A link to yarn website could be good too.

But the actually command to install yarn, I'd like to avoid. Moreover, you're installing yarn twice here, and both installs could actually give different versions of yarn.

npm install copyfiles -g;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

copyfiles is not needed as a global dependency

yarn install
```

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
}
},
"devDependencies": {
"babel-eslint": "^8.2.5",
"babel-eslint": "^9.0.0",
"husky": "^1.0.0-rc.13",
"lerna": "^2.11.0",
"npm-run-all": "^4.1.2",
Expand Down
2 changes: 2 additions & 0 deletions packages/fether-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@
"rxjs": "^6.2.0"
},
"devDependencies": {
"@babel/core": "^7.0.0",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are using CRA to manage all these dependencies

"@babel/plugin-proposal-decorators": "^7.0.0",
"babel-plugin-transform-decorators-legacy": "^1.3.5",
"capitalize": "^1.0.0",
"node-sass": "^4.9.0",
Expand Down
21 changes: 15 additions & 6 deletions packages/fether-ui/babel.config.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
module.exports = {
plugins: ['@babel/plugin-proposal-class-properties'],
presets: [
'@babel/preset-env',
'@babel/preset-react',
['@babel/preset-stage-0', { decoratorsLegacy: true }]
]
plugins: [
// Stage 2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

stage-0 includes everything here, why only include some?

['@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',

// Stage 3
'@babel/plugin-syntax-dynamic-import',
'@babel/plugin-syntax-import-meta',
['@babel/plugin-proposal-class-properties', { loose: false }],
'@babel/plugin-proposal-json-strings'
],
presets: ['@babel/preset-env', '@babel/preset-react']
};
19 changes: 17 additions & 2 deletions packages/fether-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,22 @@
"@babel/core": "^7.0.0-beta.49",
"@babel/preset-env": "^7.0.0-beta.49",
"@babel/preset-react": "^7.0.0-beta.49",
"@babel/preset-stage-0": "^7.0.0-beta.49",
"@babel/plugin-proposal-class-properties": "^7.0.0",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

stage-0 includes everything below

"@babel/plugin-proposal-decorators": "^7.0.0",
"@babel/plugin-proposal-do-expressions": "^7.0.0",
"@babel/plugin-proposal-export-default-from": "^7.0.0",
"@babel/plugin-proposal-export-namespace-from": "^7.0.0",
"@babel/plugin-proposal-function-bind": "^7.0.0",
"@babel/plugin-proposal-function-sent": "^7.0.0",
"@babel/plugin-proposal-json-strings": "^7.0.0",
"@babel/plugin-proposal-logical-assignment-operators": "^7.0.0",
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.0.0",
"@babel/plugin-proposal-numeric-separator": "^7.0.0",
"@babel/plugin-proposal-optional-chaining": "^7.0.0",
"@babel/plugin-proposal-pipeline-operator": "^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",
"prop-types": "^15.6.1",
"react": "^16.4.0",
"rimraf": "^2.6.2"
Expand All @@ -50,4 +65,4 @@
"prop-types": "^15.6.1",
"react": "^16.4.0"
}
}
}
Loading