Skip to content

Commit

Permalink
Merge cec146b into 806a93e
Browse files Browse the repository at this point in the history
  • Loading branch information
homer0 committed Feb 12, 2019
2 parents 806a93e + cec146b commit 38347af
Show file tree
Hide file tree
Showing 7 changed files with 2,648 additions and 1,937 deletions.
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6
8
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
language: node_js
node_js:
- "6.10"
- "8.11"
- "10.15"
after_success:
- 'cat ./coverage/lcov.info | ./node_modules/.bin/coveralls'
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ It adds the required presets to the [Babel](https://babeljs.io) configuration in
|--------------|----------------------------------------------------------------------------------------|
| Package | projext-plugin-webpack-react. |
| Description | Allows you to bundle a React project with projext using the webpack build engine. |
| Node Version | >= v6.10.0 |
| Node Version | >= v8.0.0 |

## Usage

Expand Down Expand Up @@ -77,9 +77,9 @@ And that's all there is, if you are running the target by itself, it will config
### Babel

This plugin adds the [`react`](https://yarnpkg.com/en/package/babel-preset-react) preset for JSX support, and if hot reload is enabled, the [`react-hot-loader/babel`](https://yarnpkg.com/en/package/react-hot-loader) plugin.
This plugin adds the [`react`](https://yarnpkg.com/en/package/@babel/preset-react) preset for JSX support, and if hot reload is enabled, the [`react-hot-loader/babel`](https://yarnpkg.com/en/package/react-hot-loader) plugin.

If hot reload is enabled, the plugin also disables the `module` feature from the [`env`](https://yarnpkg.com/en/package/babel-preset-env) preset.
If hot reload is enabled, the plugin also disables the `module` feature from the [`env`](https://yarnpkg.com/en/package/@babel/preset-env) preset.

### External dependencies

Expand Down
34 changes: 18 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,35 @@
"name": "projext-plugin-webpack-react",
"description": "Allows you to bundle a React project with projext using the webpack build engine.",
"homepage": "https://homer0.github.io/projext-plugin-webpack-react/",
"version": "3.0.0",
"version": "4.0.0",
"repository": "homer0/projext-plugin-webpack-react",
"author": "Leonardo Apiwan (@homer0) <me@homer0.com>",
"license": "MIT",
"dependencies": {
"babel-preset-react": "^6.24.1",
"react-hot-loader": "^4.3.3",
"react": "^16.4.1"
"@babel/preset-react": "^7.0.0",
"@babel/core": "7.2.2",
"react-hot-loader": "^4.6.5",
"react": "^16.7.0",
"react-dom": "^16.7.0"
},
"devDependencies": {
"wootils": "^1.3.2",
"eslint": "4.19.1",
"eslint-config-airbnb-base": "13.0.0",
"eslint-plugin-import": "2.12.0",
"eslint-plugin-node": "6.0.1",
"babel-preset-env": "1.7.0",
"jest-ex": "5.0.0",
"jest-cli": "23.1.0",
"jasmine-expect": "3.8.3",
"wootils": "^2.0.0",
"eslint": "5.13.0",
"eslint-config-airbnb-base": "13.1.0",
"eslint-plugin-import": "2.16.0",
"eslint-plugin-node": "8.0.1",
"@babel/preset-env": "7.3.1",
"jest-ex": "6.0.0",
"jest-cli": "24.0.0",
"jasmine-expect": "4.0.1",
"esdoc": "1.1.0",
"esdoc-standard-plugin": "1.0.0",
"esdoc-node": "1.0.3",
"coveralls": "3.0.1"
"esdoc-node": "1.0.4",
"coveralls": "3.0.2"
},
"engine-strict": true,
"engines": {
"node": ">=6.0.0",
"node": ">=8.0.0",
"npm": ">=3.0.0"
},
"main": "src/index.js",
Expand Down
2 changes: 1 addition & 1 deletion src/plugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class ProjextReactPlugin {
* @access protected
* @ignore
*/
this._babelPreset = 'react';
this._babelPreset = '@babel/preset-react';
/**
* The name of the plugin required for HMR.
* @type {string}
Expand Down
4 changes: 2 additions & 2 deletions tests/plugin.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ describe('plugin:projextReact/main', () => {
let sut = null;
let reducer = null;
let result = null;
const expectedPreset = 'react';
const expectedPreset = '@babel/preset-react';
// When
sut = new ProjextReactPlugin();
sut.register(app);
Expand Down Expand Up @@ -138,7 +138,7 @@ describe('plugin:projextReact/main', () => {
let sut = null;
let reducer = null;
let result = null;
const expectedPreset = 'react';
const expectedPreset = '@babel/preset-react';
const expectedPlugin = 'react-hot-loader/babel';
const expectedConfigWithPreset = {
preset: expectedPreset,
Expand Down
Loading

0 comments on commit 38347af

Please sign in to comment.