Skip to content

Commit

Permalink
Fixes geosolutions-it#1207: compatibility with npm 3 (geosolutions-it…
Browse files Browse the repository at this point in the history
…#1208)

Fixes geosolutions-it#1207: compatibility with npm 3
  • Loading branch information
mbarto authored Oct 25, 2016
1 parent f0fba60 commit d006289
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 8 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
language: node_js
node_js:
- 0.12
- 4
script: npm run travis
before_install:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
before_script:
- npm install -g npm && npm install
- if [[ `npm -v` != 3* ]]; then npm i -g npm@3; fi
- npm -v
branches:
only:
- master
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"babel-preset-es2015": "6.6.0",
"babel-preset-react": "6.5.0",
"babel-preset-stage-0": "6.5.0",
"codemirror": "5.18.2",
"css-loader": "0.19.0",
"download-cli": "1.0.1",
"escope": "3.2.0",
Expand Down Expand Up @@ -46,6 +47,7 @@
"react-addons-css-transition-group": "0.14.8",
"react-addons-test-utils": "0.14.8",
"react-hot-loader": "1.3.0",
"react-motion": "0.4.4",
"react-router": "2.4.0",
"react-router-redux": "2.1.0",
"react-select": "1.0.0-beta14",
Expand Down
4 changes: 2 additions & 2 deletions web/client/examples/plugins/components/PluginConfigurator.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ const React = require('react');
const {Input, Button, Glyphicon} = require('react-bootstrap');

const Codemirror = require('react-codemirror');
require('react-codemirror/node_modules/codemirror/lib/codemirror.css');
require('codemirror/lib/codemirror.css');

require('react-codemirror/node_modules/codemirror/mode/javascript/javascript');
require('codemirror/mode/javascript/javascript');


const PluginConfigurator = React.createClass({
Expand Down
6 changes: 3 additions & 3 deletions web/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<version>0.0.24</version>
<version>1.1</version>

<executions>

Expand All @@ -96,8 +96,8 @@
<goal>install-node-and-npm</goal>
</goals>
<configuration>
<nodeVersion>v0.12.4</nodeVersion>
<npmVersion>2.10.1</npmVersion>
<nodeVersion>v4.6.1</nodeVersion>
<npmVersion>3.10.5</npmVersion>
<installDirectory>..</installDirectory>
</configuration>
</execution>
Expand Down

0 comments on commit d006289

Please sign in to comment.