Skip to content
This repository has been archived by the owner on Oct 28, 2021. It is now read-only.

Commit

Permalink
Merge pull request #1 from symphonyoss/Fix-package-json
Browse files Browse the repository at this point in the history
fix: fix package json and deploy process
  • Loading branch information
Evandro Carrenho authored Mar 29, 2017
2 parents 53c0822 + e883749 commit 2dc929f
Show file tree
Hide file tree
Showing 10 changed files with 32 additions and 194 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules/
27 changes: 0 additions & 27 deletions .eslintrc

This file was deleted.

4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
# NPM logs
npm-debug.log*

# Target directories
node_modules/
dist/
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ before_script:
script:
# Install npm dependencies
- "if [[ \"$TRAVIS_PULL_REQUEST\" = \"false\" && $TRAVIS_BRANCH =~ dev ]]; then npm install ; fi"
# Run tests
- "if [[ \"$TRAVIS_PULL_REQUEST\" = \"false\" && $TRAVIS_BRANCH =~ dev ]]; then npm run test ; fi"
# Validate npmjs licenses
- "if [[ \"$TRAVIS_PULL_REQUEST\" = \"false\" && $TRAVIS_BRANCH =~ dev ]]; then npm run license-check ; fi"

Expand Down
19 changes: 10 additions & 9 deletions components/Spinner/Spinner.jsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable no-debugger */
import React, { Component, PropTypes } from 'react';
import './styles/styles.less';

Expand All @@ -10,18 +11,18 @@ export class Spinner extends Component {
}

componentWillReceiveProps(nextProps) {
if (this.props.loading !== nextProps.loading) {
if (!nextProps.loading) {
// if (this.props.loading !== nextProps.loading) {
if (!nextProps.loading) {
this.setState({
style: 'spinner spinner-opacity-0',
});
setTimeout(() => {
this.setState({
style: 'spinner spinner-opacity-0',
style: 'spinner spinner-opacity-0 spinner-height-0',
});
setTimeout(() => {
this.setState({
style: 'spinner spinner-opacity-0 spinner-height-0',
});
}, 700);
}
}, 700);
}
// }
}

render() {
Expand Down
16 changes: 8 additions & 8 deletions components/SubmitInstance/SubmitInstance.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
/* eslint-disable react/no-unused-prop-types */

import React, { PropTypes, Component } from 'react';
import { hashHistory } from 'react-router';
import {
Expand Down Expand Up @@ -40,14 +38,16 @@ export class SubmitInstance extends Component {
}

componentWillReceiveProps(nextProps) {
if (nextProps.saved) {
if (nextProps.operation === 'CREATE' || nextProps.operation === 'UPDATE') {
hashHistory.push('/instance-created');
} else if (nextProps.operation === 'REMOVE') {
if (this.props.saved !== nextProps.saved) {
if (nextProps.saved) {
if (nextProps.operation === 'CREATE' || nextProps.operation === 'UPDATE') {
hashHistory.push('/instance-created');
} else if (nextProps.operation === 'REMOVE') {
hashHistory.push('/');
}
} else {
hashHistory.push('/');
}
} else {
hashHistory.push('/');
}
}

Expand Down
50 changes: 8 additions & 42 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,61 +2,27 @@
"name": "symphony-integration-commons",
"version": "1.0.3",
"description": "Common components for 3rd party developers build the user facing application for Symphony Integrations.",
"main": "./dist/index.bundle.js",
"main": "./dist/index.js",
"scripts": {
"build": "webpack -p --config webpack.config.prod.js",
"postinstall": "webpack -p --config webpack.post.install.js",
"test": "jest",
"postinstall": "babel . --out-dir dist --ignore node_modules,dist --copy-files",
"semantic-release": "semantic-release pre && npm publish && semantic-release post",
"license-check": "node-license-validator --allow-licenses WTFPL Apache Apache-2 BSD-like BSD BSD-2-Clause BSD-3-Clause Apache-2.0 MIT ISC Unlicense MIT/X11 \"MIT / http://rem.mit-license.org\" \"Public Domain\" --allow-packages [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]"
},
"jest": {
"transform": {
".*": "./node_modules/babel-jest"
},
"moduleNameMapper": {
"\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "./__mocks__/fileMock.js",
"\\.(css|less)$": "identity-obj-proxy"
}
},
"license": "Apache-2.0",
"author": "Symphony",
"devDependencies": {
"babel-core": "^6.14.0",
"babel-jest": "^18.0.0",
"babel-loader": "^6.2.5",
"babel-plugin-transform-object-rest-spread": "^6.22.0",
"babel-preset-es2015": "^6.14.0",
"babel-preset-react": "^6.11.1",
"babel-preset-stage-0": "^6.22.0",
"copy-webpack-plugin": "^4.0.1",
"css-loader": "^0.23.1",
"enzyme": "^2.7.1",
"eslint": "^3.7.1",
"eslint-config-airbnb": "^12.0.0",
"eslint-config-google": "^0.6.0",
"eslint-loader": "^1.5.0",
"eslint-plugin-import": "^2.0.0",
"eslint-plugin-jsx-a11y": "^2.2.2",
"eslint-plugin-react": "^6.3.0",
"file-loader": "^0.9.0",
"identity-obj-proxy": "^3.0.0",
"img-loader": "^1.3.1",
"jest": "^18.1.0",
"less": "^2.7.1",
"less-loader": "^2.2.3",
"node-license-validator": "^1.3.0",
"react-addons-test-utils": "^15.4.2",
"semantic-release": "^6.3.2",
"style-loader": "^0.13.0",
"url-loader": "^0.5.7",
"webpack": "^1.12.14",
"webpack-dev-server": "^1.14.1"
"semantic-release": "^6.3.2"
},
"dependencies": {
"axios": "^0.15.3",
"babel-cli": "^6.24.0",
"babel-core": "^6.24.0",
"babel-polyfill": "^6.23.0",
"jquery": "^3.2.0",
"babel-preset-es2015": "^6.24.0",
"babel-preset-react": "^6.23.0",
"babel-preset-stage-0": "^6.22.0",
"react": "^15.3.2",
"react-dom": "^15.4.2",
"react-redux": "^5.0.2",
Expand Down
2 changes: 1 addition & 1 deletion reducers/instancesListReducer.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
SUBMIT_DONE,
} from '../actions';

const instanceList = (state = { instances: [], loading: true }, action) => {
const instanceList = (state = { instances: [], loading: false }, action) => {
switch (action.type) {
case FETCH_INSTANCE_LIST_SUCCESS:
return Object.assign({}, state, {
Expand Down
53 changes: 0 additions & 53 deletions webpack.config.prod.js

This file was deleted.

52 changes: 0 additions & 52 deletions webpack.post.install.js

This file was deleted.

0 comments on commit 2dc929f

Please sign in to comment.