diff --git a/.babelrc b/.babelrc index 15d27ad..13a46b9 100644 --- a/.babelrc +++ b/.babelrc @@ -1,4 +1,12 @@ { - "stage": 0, - "loose": "all" + "presets": [ + "react", + "es2015" + ], + "plugins": [ + "transform-object-rest-spread", + "transform-class-properties", + "transform-decorators-legacy", + "transform-export-extensions" + ] } diff --git a/examples/.babelrc b/examples/.babelrc index b0b9a96..13a46b9 100644 --- a/examples/.babelrc +++ b/examples/.babelrc @@ -1,3 +1,12 @@ { - "stage": 0 + "presets": [ + "react", + "es2015" + ], + "plugins": [ + "transform-object-rest-spread", + "transform-class-properties", + "transform-decorators-legacy", + "transform-export-extensions" + ] } diff --git a/examples/basic/package.json b/examples/basic/package.json index 0a76d9e..18a5ed0 100644 --- a/examples/basic/package.json +++ b/examples/basic/package.json @@ -5,7 +5,7 @@ "main": "server.js", "scripts": { "test": "echo \"Error: no test specified\" && exit 1", - "start": "node -r babel/register server.js" + "start": "node -r babel-core/register server.js" }, "author": "Andrew Clark ", "license": "MIT", diff --git a/examples/package.json b/examples/package.json index 9d4393c..f73bfc1 100644 --- a/examples/package.json +++ b/examples/package.json @@ -8,15 +8,18 @@ "author": "Andrew Clark ", "license": "MIT", "devDependencies": { - "babel": "^5.8.23", - "babel-core": "^5.8.23", - "babel-loader": "^5.3.2", - "babel-plugin-react-transform": "^1.0.3", - "babel-runtime": "^5.8.20", + "babel-cli": "^6.10.1", + "babel-core": "^6.2.1", + "babel-loader": "^6.2.4", + "babel-plugin-transform-class-properties": "^6.11.5", + "babel-plugin-transform-decorators-legacy": "^1.3.4", + "babel-plugin-transform-export-extensions": "^6.8.0", + "babel-plugin-transform-object-rest-spread": "^6.8.0", + "babel-preset-es2015": "^6.1.18", + "babel-preset-react": "^6.1.18", "express": "^4.13.3", "lodash": "^3.10.1", "query-string": "^2.4.1", - "react-transform-hmr": "^1.0.1", "redux": "^2.0.0", "serialize-javascript": "^1.1.2", "webpack": "^1.12.1", diff --git a/examples/server-rendering/package.json b/examples/server-rendering/package.json index f4e28c3..9699bf1 100644 --- a/examples/server-rendering/package.json +++ b/examples/server-rendering/package.json @@ -5,7 +5,7 @@ "main": "server.js", "scripts": { "test": "echo \"Error: no test specified\" && exit 1", - "start": "node -r babel/register server.js" + "start": "node -r babel-core/register server.js" }, "author": "Andrew Clark ", "license": "MIT", diff --git a/examples/webpack.config.base.js b/examples/webpack.config.base.js index edecc5e..b7d919e 100644 --- a/examples/webpack.config.base.js +++ b/examples/webpack.config.base.js @@ -1,34 +1,12 @@ -import fs from 'fs'; import path from 'path'; const PROJECT_SRC = path.resolve(__dirname, '../src'); -const babelrc = fs.readFileSync(path.join('..', '.babelrc')); -let babelLoaderQuery = {}; - -try { - babelLoaderQuery = JSON.parse(babelrc); -} catch (err) { - console.error('Error parsing .babelrc.'); - console.error(err); -} -babelLoaderQuery.plugins = babelLoaderQuery.plugins || []; -babelLoaderQuery.plugins.push('react-transform'); -babelLoaderQuery.extra = babelLoaderQuery.extra || {}; -babelLoaderQuery.extra['react-transform'] = { - transforms: [{ - transform: 'react-transform-hmr', - imports: ['react'], - locals: ['module'] - }] -}; - export default { module: { loaders: [{ test: /\.js$/, loader: 'babel', - query: babelLoaderQuery, exclude: path.resolve(__dirname, 'node_modules'), include: [ path.resolve(__dirname), diff --git a/package.json b/package.json index ea98974..12632e7 100644 --- a/package.json +++ b/package.json @@ -10,8 +10,8 @@ "build:umd:min": "NODE_ENV=production browserify -s ReduxRouter --detect-globals lib/index.js | uglifyjs -c warnings=false -m > dist/redux-router.min.js", "clean": "rimraf lib && rimraf dist && rimraf server.js", "lint": "eslint src", - "test": "mocha --compilers js:babel/register --recursive --require src/__tests__/init.js src/**/*-test.js", - "test-watch": "mocha --compilers js:babel/register --recursive --require src/__tests__/init.js -w src/**/*-test.js", + "test": "mocha --compilers js:babel-core/register --recursive --require src/__tests__/init.js src/**/*-test.js", + "test-watch": "mocha --compilers js:babel-core/register --recursive --require src/__tests__/init.js -w src/**/*-test.js", "prepublish": "npm run clean && mkdir dist && npm run build" }, "repository": { @@ -35,10 +35,16 @@ "server.js" ], "devDependencies": { - "babel": "^5.6.14", - "babel-core": "5.6.15", - "babel-eslint": "^4.1.1", - "babel-loader": "^5.3.2", + "babel-cli": "^6.10.1", + "babel-core": "^6.2.1", + "babel-eslint": "^6.0.4", + "babel-loader": "^6.2.4", + "babel-plugin-transform-class-properties": "^6.11.5", + "babel-plugin-transform-decorators-legacy": "^1.3.4", + "babel-plugin-transform-export-extensions": "^6.8.0", + "babel-plugin-transform-object-rest-spread": "^6.8.0", + "babel-preset-es2015": "^6.1.18", + "babel-preset-react": "^6.1.18", "browserify": "^13.0.1", "chai": "^3.0.0", "eslint": "^1.3.1", diff --git a/src/__tests__/ReduxRouter-test.js b/src/__tests__/ReduxRouter-test.js index f8bcaed..e19c739 100644 --- a/src/__tests__/ReduxRouter-test.js +++ b/src/__tests__/ReduxRouter-test.js @@ -223,8 +223,6 @@ describe('', () => { 'or a class/function (for composite components) but got: object. ' + 'Check the render method of `ReduxRouterContext`.'; - const routingContextInvalidPropErrorMessage = 'Invalid prop `RoutingContext` of type `object` supplied to `ReduxRouterContext`'; - const routingContextInvalidElementTypeErrorMessage = 'React.createElement: type should not be null, undefined, boolean, or number. ' + 'It should be a string (for DOM elements) or a ReactClass (for composite components). ' + 'Check the render method of `ReduxRouterContext`.'; @@ -235,7 +233,6 @@ describe('', () => { expect(consoleErrorSpy.calledTwice).to.be.true; - expect(consoleErrorSpy.args[0][0]).to.contain(routingContextInvalidPropErrorMessage); expect(consoleErrorSpy.args[1][0]).to.contain(routingContextInvalidElementTypeErrorMessage); });