Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix several small bugs #188

Closed
wants to merge 1 commit into from
+37 −30
Closed

Fix several small bugs #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
node_modules
*.log
.idea
*.iml
22 changes: 11 additions & 11 deletions dist/manager.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/manager.js.map
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion dist/server/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,9 @@ var logger = console;

function removeReactHmre(presets) {
var index = presets.indexOf('react-hmre');
presets.splice(index, 1);
if (index > -1) {
presets.splice(index, 1);
}
}

// Tries to load a .babelrc and returns the parsed object if successful
Expand Down
30 changes: 15 additions & 15 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"mocha": "--require scripts/mocha_runner src/**/__tests__/**/*.js"
},
"scripts": {
"prepublish": ". ./scripts/prepublish.sh",
"prepublish": "./scripts/prepublish.sh",
"lint": "eslint src",
"lintfix": "eslint src --fix",
"testonly": "mocha $npm_package_options_mocha",
Expand Down Expand Up @@ -49,30 +49,30 @@
},
"devDependencies": {
"@kadira/react-split-pane": "^1.4.0",
"react-modal": "^1.2.0",
"redbox-react": "^1.2.2",
"react": "^15.0.0",
"react-dom": "^15.0.0",
"lodash.pick": "^4.2.0",
"qs": "^6.1.0",
"mantra-core": "^1.6.1",
"deep-equal": "^1.0.1",
"babel-cli": "^6.3.14",
"babel-eslint": "^6.0.2",
"babel-plugin-transform-runtime": "^6.3.14",
"chai": "^3.5.0",
"deep-equal": "^1.0.1",
"enzyme": "^2.2.0",
"eslint": "^2.7.0",
"eslint-config-airbnb": "^6.2.0",
"eslint-plugin-babel": "^3.1.0",
"eslint-plugin-react": "^4.2.3",
"expect": "^1.6.0",
"jsdom": "^8.4.0",
"lodash.pick": "^4.2.0",
"mantra-core": "^1.6.1",
"mocha": "^2.4.5",
"chai": "^3.5.0",
"mock-fs": "^3.8.0",
"nodemon": "^1.9.1",
"sinon": "^1.17.3",
"enzyme": "^2.2.0",
"expect": "^1.6.0",
"jsdom": "^8.4.0",
"react-addons-test-utils": "^15.0.1"
"qs": "^6.1.0",
"react": "^15.0.0",
"react-addons-test-utils": "^15.0.1",
"react-dom": "^15.0.0",
"react-modal": "^1.2.0",
"redbox-react": "^1.2.2",
"sinon": "^1.17.3"
},
"main": "dist/client/index.js",
"engines": {
Expand Down
3 changes: 2 additions & 1 deletion scripts/prepublish.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
#!/bin/bash
echo "> Start transpiling ES2015"
echo ""
rm -rf ./dist
./node_modules/.bin/babel --ignore __tests__,manager --plugins "transform-runtime" ./src --out-dir ./dist
if [[ -z $DEV_BUILD ]]; then
if [ -z $DEV_BUILD ]; then
./node_modules/.bin/webpack --config scripts/webpack.manager.conf.js
fi
echo ""
Expand Down
1 change: 1 addition & 0 deletions scripts/publish.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
#!/usr/bin/env bash
npm publish --access=public
4 changes: 3 additions & 1 deletion src/server/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ const logger = console;

function removeReactHmre(presets) {
const index = presets.indexOf('react-hmre');
presets.splice(index, 1);
if (index > -1) {
presets.splice(index, 1);
}
}

// Tries to load a .babelrc and returns the parsed object if successful
Expand Down