diff --git a/.gitignore b/.gitignore index 24871b8..9bd38ac 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -build -node_modules -tests/coverage +node_modules/ +tests/coverage/ +dist/ diff --git a/.jscsrc b/.jscsrc index d3357c1..aad5667 100644 --- a/.jscsrc +++ b/.jscsrc @@ -1,9 +1,9 @@ { "excludeFiles": [ ".git/**", - "build/**", "node_modules/**", - "tests/coverage/**" + "tests/coverage/**", + "dist/**" ], "fileExtensions": [".js"], "preset": "google", diff --git a/.npmignore b/.npmignore index 9ac76a3..c07168d 100644 --- a/.npmignore +++ b/.npmignore @@ -1,2 +1,3 @@ -node_modules -tests/coverage +node_modules/ +tests/coverage/ +src/ diff --git a/entry.js b/entry.js deleted file mode 100644 index 1b9274d..0000000 --- a/entry.js +++ /dev/null @@ -1,8 +0,0 @@ -module.exports = { - Mixin: require('./src/load-child-mixin.js'), - Component: require('./src/load-child-component.js'), - loadChild: require('./src/load-child.js'), - serialize: require('./src/serialize.js').serialize, - render: require('./src/render.js').render, - injectState: require('./src/render.js').injectState -}; diff --git a/package.json b/package.json index 1000463..a2d4423 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "react-component-tree", "version": "0.2.3", "description": "Serialize and reproduce the state of an entire tree of React components", - "main": "build/bundle.js", + "main": "dist/entry.js", "repository": { "type": "git", "url": "https://github.com/skidding/react-component-tree.git" @@ -11,6 +11,7 @@ "lodash": "^3.6.0" }, "devDependencies": { + "babel": "^5.8.23", "babel-core": "^5.0.12", "babel-loader": "^5.0.0", "chai": "^2.2.0", @@ -18,7 +19,7 @@ "istanbul": "^0.3.13", "istanbul-instrumenter-loader": "^0.1.2", "jscs": "^1.12.0", - "karma": "^0.12.31", + "karma": "^0.13.9", "karma-chai": "^0.1.0", "karma-cli": "0.0.4", "karma-coverage": "^0.2.7", @@ -26,12 +27,12 @@ "karma-mocha-reporter": "^1.0.2", "karma-phantomjs-launcher": "^0.1.4", "karma-sinon-chai": "^0.3.0", - "karma-webpack": "^1.5.0", + "karma-webpack": "^1.7.0", "mocha": "^2.2.4", "react": "^0.13.1", "sinon": "^1.14.1", "sinon-chai": "^2.7.0", - "webpack": "^1.8.2" + "webpack": "^1.12.0" }, "peerDependencies": { "react": "^0.13.1" @@ -40,7 +41,7 @@ "pretest": "jscs --esnext ./", "test": "karma start --single-run", "coveralls": "cat tests/coverage/*/lcov.info | node_modules/coveralls/bin/coveralls.js", - "build": "webpack -p", - "prepublish": "npm run build" + "compile": "babel -d dist/ src/", + "prepublish": "rm -rf dist && npm run compile" } } diff --git a/src/entry.js b/src/entry.js new file mode 100644 index 0000000..d8e7090 --- /dev/null +++ b/src/entry.js @@ -0,0 +1,8 @@ +module.exports = { + Mixin: require('./load-child-mixin.js'), + Component: require('./load-child-component.js'), + loadChild: require('./load-child.js'), + serialize: require('./serialize.js').serialize, + render: require('./render.js').render, + injectState: require('./render.js').injectState +}; diff --git a/webpack.config.js b/webpack.config.js deleted file mode 100644 index 6b5a44b..0000000 --- a/webpack.config.js +++ /dev/null @@ -1,22 +0,0 @@ -var path = require('path'); - -module.exports = { - entry: './entry.js', - externals: { - 'lodash': 'lodash', - 'react': 'react' - }, - module: { - loaders: [{ - test: /\.js$/, - exclude: /node_modules/, - loader: 'babel-loader' - }] - }, - output: { - libraryTarget: 'umd', - library: 'ComponentTree', - path: path.join(__dirname, 'build'), - filename: 'bundle.js' - } -};