Skip to content

Commit ebb0d0c

Browse files
jourdainjourdain
committed
fix(Dependencies): Bump versions and fix autoprefixer to use postcss
1 parent d9a7ea1 commit ebb0d0c

6 files changed

Lines changed: 179 additions & 76 deletions

File tree

‎.travis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ cache:
1212
- node_modules
1313
node_js:
1414
- "4.1"
15-
before_install:
16-
- npm run dep:travis
15+
before_script:
16+
- npm run travis
1717
script:
1818
- npm run build:release
1919
after_success:

‎dist/Simput.js‎

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/Simput/index.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@ export default React.createClass({
1111
displayName: 'Simput',
1212

1313
propTypes: {
14+
convert: React.PropTypes.func,
1415
data: React.PropTypes.object,
16+
help: React.PropTypes.object,
1517
labels: React.PropTypes.object,
1618
model: React.PropTypes.object,
17-
convert: React.PropTypes.func,
1819
},
1920

2021
getInitialState() {

‎lib/factory.js‎

Lines changed: 37 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,42 @@ import Labels from './Labels';
55
import {getJSON} from './network';
66

77
const container = document.querySelector('.react-content');
8+
/* global Simput */
9+
10+
/* eslint-disable no-use-before-define */
11+
export function createViewer(url, callback) {
12+
var lang = 'en';
13+
getJSON(url, (error, data) => {
14+
if (error) {
15+
console.error(error.toString());
16+
return;
17+
}
18+
19+
if (data.input) {
20+
const scriptToLoad = '/type/' + data.data.type + '.js';
21+
const body = document.getElementsByTagName('body')[0];
22+
const script = document.createElement('script');
23+
script.type = 'text/javascript';
24+
script.src = scriptToLoad;
25+
script.onload = () => {
26+
var module = Simput.types[data.data.type],
27+
labels = new Labels(module, lang), // <= FIXME pick the right language // --lang
28+
help = {}, // FIXME too,
29+
convert = module.convert;
30+
31+
if (module.lang[lang] && module.lang[lang].help) {
32+
help = module.lang[lang].help;
33+
}
34+
ReactDOM.unmountComponentAtNode(container);
35+
ReactDOM.render(<App data={data.data} model={module.model} labels={labels} help={help} convert={convert}/>, container);
36+
};
37+
body.appendChild(script);
38+
} else {
39+
setupChoices(data.data);
40+
}
41+
});
42+
}
43+
/* eslint-enable no-use-before-define */
844

945
function setupSimput(event) {
1046
//console.log('unimplemented', event.target.getAttribute('name'));
@@ -28,7 +64,7 @@ function setupChoices(choices){
2864
<li style={{cursor: 'pointer'}} key={index} onClick={setupSimput} name={el}>{el}</li>
2965
);
3066
}
31-
67+
3268
return (
3369
<ul>
3470
{this.props.choices.map(listamatize)}
@@ -38,36 +74,3 @@ function setupChoices(choices){
3874
});
3975
ReactDOM.render(<Choices choices={choices}/>, container);
4076
}
41-
42-
export function createViewer(url, callback) {
43-
var lang = 'en';
44-
getJSON(url, (error, data) => {
45-
if (error) {
46-
console.error(error.toString());
47-
return;
48-
}
49-
50-
if (data.input) {
51-
const scriptToLoad = '/type/' + data.data.type + '.js';
52-
const body = document.getElementsByTagName('body')[0];
53-
const script = document.createElement('script');
54-
script.type = 'text/javascript';
55-
script.src = scriptToLoad;
56-
script.onload = () => {
57-
var module = Simput.types[data.data.type],
58-
labels = new Labels(module, lang), // <= FIXME pick the right language // --lang
59-
help = {}, // FIXME too,
60-
convert = module.convert;
61-
62-
if (module.lang[lang] && module.lang[lang].help) {
63-
help = module.lang[lang].help;
64-
}
65-
ReactDOM.unmountComponentAtNode(container);
66-
ReactDOM.render(<App data={data.data} model={module.model} labels={labels} help={help} convert={convert}/>, container);
67-
};
68-
body.appendChild(script);
69-
} else {
70-
setupChoices(data.data);
71-
}
72-
});
73-
}

‎package.json‎

Lines changed: 126 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -13,53 +13,149 @@
1313
"url": "https://github.com/Kitware/simput.git"
1414
},
1515
"dependencies": {
16-
"babel-core": "6.3.26",
17-
"babel-loader": "6.2.0",
18-
"babel-preset-es2015": "6.3.13",
19-
"babel-preset-react": "6.3.13",
20-
"body-parser": "^1.14.2",
21-
"commander": "2.9.0",
22-
"css-loader": "0.23.1",
23-
"expose-loader": "0.7.1",
24-
"express": "^4.13.3",
25-
"file-loader": "0.8.5",
26-
"handlebars": "4.0.5",
27-
"handlebars-loader": "1.1.4",
28-
"html-loader": "0.4.0",
29-
"jade": "1.11.0",
30-
"jade-loader": "0.8.0",
31-
"json-loader": "0.5.4",
32-
"node-libs-browser": "0.5.3",
33-
"open": "0.0.5",
34-
"shelljs": "0.5.3",
35-
"url-loader": "0.5.7",
36-
"webpack": "1.12.9"
16+
"body-parser": "1.14.2",
17+
"commander": "2.9.0",
18+
"express": "4.13.4",
19+
"open": "0.0.5",
20+
"shelljs": "0.5.3",
21+
22+
"handlebars": "4.0.5",
23+
"handlebars-loader": "1.1.4",
24+
25+
"node-libs-browser": "1.0.0",
26+
27+
"babel-core": "6.4.5",
28+
"babel-eslint": "5.0.0-beta6",
29+
"babel-loader": "6.2.1",
30+
"babel-preset-es2015": "6.3.13",
31+
"babel-preset-react": "6.3.13",
32+
33+
"eslint": "1.10.3",
34+
"eslint-loader": "1.2.1",
35+
"eslint-plugin-babel": "3.0.0",
36+
"eslint-plugin-react": "3.16.1",
37+
38+
"autoprefixer": "6.3.1",
39+
"autoprefixer-loader": "3.2.0",
40+
"css-loader": "0.23.1",
41+
"expose-loader": "0.7.1",
42+
"file-loader": "0.8.5",
43+
"json-loader": "0.5.4",
44+
"postcss-loader": "0.8.0",
45+
"shader-loader": "1.1.4",
46+
"style-loader": "0.13.0",
47+
"url-loader": "0.5.7",
48+
49+
"webpack": "1.12.12"
3750
},
3851
"devDependencies": {
39-
"tonic-io": "1.1.5",
40-
"tonic-ui": "1.2.13",
52+
"npm-dep": "1.0.0",
53+
54+
"react": "0.14.6",
55+
"react-dom": "0.14.6",
56+
57+
"tonic-io": "1.2.2",
58+
"tonic-ui": "1.2.14",
59+
4160
"font-awesome": "4.5.0",
4261
"mout": "0.11.1",
4362
"normalize.css": "3.0.3",
44-
"react": "0.14.3",
45-
"react-dom": "0.14.3",
63+
4664
"cz-conventional-changelog": "1.1.5"
4765
},
66+
"dep": {
67+
"simput": {
68+
"body-parser": "1.14.2",
69+
"commander": "2.9.0",
70+
"express": "4.13.4",
71+
"open": "0.0.5",
72+
"shelljs": "0.5.3",
73+
74+
"handlebars": "4.0.5",
75+
"handlebars-loader": "1.1.4"
76+
},
77+
"react": {
78+
"react": "0.14.6",
79+
"react-dom": "0.14.6"
80+
},
81+
"build": {
82+
"node-libs-browser": "1.0.0",
83+
84+
"babel-core": "6.4.5",
85+
"babel-eslint": "5.0.0-beta6",
86+
"babel-loader": "6.2.1",
87+
"babel-preset-es2015": "6.3.13",
88+
"babel-preset-react": "6.3.13",
89+
90+
"eslint": "1.10.3",
91+
"eslint-loader": "1.2.1",
92+
"eslint-plugin-babel": "3.0.0",
93+
"eslint-plugin-react": "3.16.1",
94+
95+
"autoprefixer": "6.3.1",
96+
"autoprefixer-loader": "3.2.0",
97+
"css-loader": "0.23.1",
98+
"expose-loader": "0.7.1",
99+
"file-loader": "0.8.5",
100+
"json-loader": "0.5.4",
101+
"postcss-loader": "0.8.0",
102+
"shader-loader": "1.1.4",
103+
"style-loader": "0.13.0",
104+
"url-loader": "0.5.7",
105+
106+
"html-webpack-plugin": "2.7.2",
107+
108+
"webpack": "1.12.12",
109+
"webpack-dev-server": "1.14.1"
110+
},
111+
"deploy": {
112+
"commitizen": "2.5.0",
113+
"semantic-release": "4.3.5",
114+
"tonic-site-generator": "0.2.2"
115+
},
116+
"karma-bug": {
117+
"socket.io": "1.3.7"
118+
},
119+
"test": {
120+
"istanbul":"0.4.2",
121+
"istanbul-instrumenter-loader": "0.1.3",
122+
123+
"expect":"1.13.4",
124+
"jasmine-core": "2.4.1",
125+
"jest-cli": "0.8.2",
126+
"phantomjs": "1.9.19",
127+
128+
"karma": "0.13.19",
129+
"karma-chrome-launcher": "0.2.2",
130+
"karma-cli": "0.1.2",
131+
"karma-coverage" : "0.5.3",
132+
"karma-firefox-launcher": "0.1.7",
133+
"karma-jasmine": "0.3.6",
134+
"karma-phantomjs-launcher": "0.2.3",
135+
"karma-safari-launcher": "0.1.1",
136+
"karma-sourcemap-loader": "0.3.7",
137+
"karma-webpack": "1.7.0"
138+
},
139+
"utils": {
140+
"serve": "1.4.0",
141+
"shelljs": "0.5.3"
142+
}
143+
},
48144
"scripts": {
145+
"prebuild": "npm-dep build simput react",
49146
"build": "webpack",
50147
"build:watch": "webpack watch",
51148
"build:debug": "webpack --display-modules",
52149
"build:release": "webpack -p",
53150

54151
"test": "echo WARNING: Simput process.env.PWD is $(pwd) && ./bin/run-dev.js",
152+
55153
"commit": "git cz",
154+
155+
"presemantic-release": "npm-dep deploy",
56156
"semantic-release": "semantic-release pre && npm publish && semantic-release post",
57157

58-
"dep:webpack": "npm install node-libs-browser@0.5.3 babel-core@6.3.17 eslint@1.10.3 eslint-plugin-babel@3.0.0 eslint-plugin-react@3.11.3 babel-eslint@4.1.6 autoprefixer-loader@3.1.0 babel-loader@6.2.0 babel-preset-es2015@6.3.13 babel-preset-react@6.3.13 css-loader@0.23.0 expose-loader@0.7.1 file-loader@0.8.5 json-loader@0.5.4 style-loader@0.13.0 url-loader@0.5.7 eslint-loader@1.1.1 webpack@1.12.9",
59-
"dep:release": "npm install commitizen@2.4.6 semantic-release@4.3.5",
60-
"dep:travis": "npm run dep:webpack && npm run dep:release",
61-
"dep:local": "npm run dep:webpack && npm run dep:www && npm run dep:release",
62-
"dep:global": "npm run dep:webpack -- -g && npm run dep:release -- -g"
158+
"travis": "npm-dep -a"
63159
},
64160
"bin": {
65161
"Simput": "./bin/simput-cli.js"

‎webpack.config.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,15 @@ module.exports = {
1818
{ test: /\.woff(2)?(\?v=[0-9]\.[0-9]\.[0-9])?$/, loader: "url-loader?limit=60000&mimetype=application/font-woff" },
1919
{ test: /\.(ttf|eot|svg)(\?v=[0-9]\.[0-9]\.[0-9])?$/, loader: "url-loader?limit=60000" },
2020
{ test: /\.(png|jpg)$/, loader: 'url-loader?limit=8192'},
21-
{ test: /\.css$/, loader: "style-loader!css-loader!autoprefixer-loader?browsers=last 2 version" },
21+
{ test: /\.css$/, loader: "style-loader!css-loader!postcss-loader" },
2222
{ test: /\.c$/i, loader: "shader" },
2323
{ test: /\.js$/, include: /node_modules\/tonic-/, loader: "babel?presets[]=react,presets[]=es2015" },
2424
{ test: /\.js$/, exclude: /node_modules/, loader: "babel?presets[]=react,presets[]=es2015" },
2525
],
2626
},
27+
postcss: [
28+
require('autoprefixer')({ browsers: ['last 2 versions'] }),
29+
],
2730
eslint: {
2831
configFile: '.eslintrc',
2932
},

0 commit comments

Comments
 (0)