Skip to content

Commit 99bb7e3

Browse files
jessy1092jessy1092
committed
Merge pull request #33 from jessy1092/0.4
0.4
2 parents e581511 + 36914cd commit 99bb7e3

File tree

114 files changed

+2035
-2224
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+2035
-2224
lines changed

‎.babelrc‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"presets": ["es2015", "react", "stage-0"]
3+
}

‎dst/react-semantify.js‎

Lines changed: 231 additions & 161 deletions
Large diffs are not rendered by default.

‎dst/react-semantify.min.js‎

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

‎gulpfile.babel.js‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,28 @@
1-
"use strict";
2-
31
import gulp from 'gulp';
42
import uglify from 'gulp-uglify';
53
import grename from 'gulp-rename';
64
import source from 'vinyl-source-stream';
75
import buffer from 'vinyl-buffer';
86
import browserify from 'browserify';
97
import gbabel from 'gulp-babel';
8+
import globalShim from 'browserify-global-shim';
109

1110
let build_path = 'dst';
1211
let transpile_path = 'lib';
1312

1413
gulp.task('transpile', () => {
1514
return gulp.src('./src/**/*')
16-
.pipe(gbabel({stage: 0}))
15+
.pipe(gbabel({presets: ['es2015', 'react', 'stage-0']}))
1716
.pipe(gulp.dest(transpile_path));
1817
});
1918

2019
gulp.task('browserify', () => {
21-
return browserify(`./${transpile_path}/index_browser.js`)
20+
return browserify('./src/index.js', {standalone: 'Semantify'})
21+
.transform('babelify', {presets: ['es2015', 'react', 'stage-0']})
22+
.transform(globalShim.configure({
23+
'react': 'React',
24+
'react-dom': 'ReactDOM'
25+
}))
2226
.bundle()
2327
.pipe(source('react-semantify.js'))
2428
.pipe(gulp.dest(build_path))

‎package.json‎

Lines changed: 28 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"name" : "react-semantify",
2+
"name": "react-semantify",
33
"description": "Integrate Semantic-ui with react components.",
4-
"version" : "0.3.2",
4+
"version": "0.3.2",
55
"keywords": [
66
"react",
77
"semantic-ui",
@@ -10,14 +10,14 @@
1010
],
1111
"contributor": [
1212
{
13-
"name" : "Lee",
13+
"name": "Lee",
1414
"email": "[email protected]"
1515
}
1616
],
1717
"repository": [
1818
{
1919
"type": "git",
20-
"url" : "https://github.com/jessy1092/react-semantify"
20+
"url": "https://github.com/jessy1092/react-semantify"
2121
}
2222
],
2323
"bugs": {
@@ -30,30 +30,43 @@
3030
"prepublish": "gulp transpile",
3131
"test": "node ./node_modules/jest-cli/bin/jest.js"
3232
},
33-
"engines":{
33+
"engines": {
3434
"node": ">= 0.10.x"
3535
},
3636
"main": "lib/index.js",
3737
"dependencies": {
38-
"react": "^0.13.3",
39-
"classnames": "^2.1.5"
38+
"classnames": "^2.2.0",
39+
"react": "^0.14.2",
40+
"react-dom": "^0.14.2"
4041
},
4142
"devDependencies": {
42-
"babel": "^5.8.23",
43-
"babel-core": "^5.8.25",
44-
"browserify": "^11.2.0",
43+
"babel": "^6.1.18",
44+
"babel-core": "^6.1.18",
45+
"babel-preset-es2015": "^6.1.18",
46+
"babel-preset-react": "^6.1.18",
47+
"babel-preset-stage-0": "^6.1.18",
48+
"babelify": "^7.2.0",
49+
"browserify": "^12.0.1",
50+
"browserify-global-shim": "^1.0.0",
4551
"gulp": "git://github.com/gulpjs/gulp.git#4.0",
46-
"gulp-babel": "^5.2.1",
52+
"gulp-babel": "^6.1.0",
4753
"gulp-rename": "^1.2.2",
48-
"gulp-uglify": "^1.4.1",
49-
"gulp-util": "^3.0.6",
54+
"gulp-uglify": "^1.5.1",
55+
"gulp-util": "^3.0.7",
5056
"jest-cli": "^0.7.1",
57+
"react-addons-test-utils": "^0.14.2",
5158
"vinyl-buffer": "^1.0.0",
5259
"vinyl-source-stream": "^1.1.0"
5360
},
5461
"jest": {
5562
"scriptPreprocessor": "<rootDir>/test/preprocessor.js",
56-
"testPathDirs": ["<rootDir>/test"],
57-
"unmockedModulePathPatterns": ["<rootDir>/node_modules/react"]
63+
"testPathDirs": [
64+
"<rootDir>/test"
65+
],
66+
"unmockedModulePathPatterns": [
67+
"<rootDir>/node_modules/react",
68+
"<rootDir>/node_modules/react-dom",
69+
"<rootDir>/node_modules/react-addons-test-utils"
70+
]
5871
}
5972
}

‎src/collections/breadcrumb.js‎

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,20 @@
1-
"use strict";
2-
module.exports = function (React) {
1+
import React from 'react';
2+
import ClassGenerator from '../mixins/classGenerator';
33

4-
var ClassGenerator = require('../mixins/classGenerator.js')(React);
4+
let defaultClassName = 'ui breadcrumb';
55

6-
var defaultClassName = 'ui breadcrumb';
6+
module.exports = React.createClass({
77

8-
var Breadcrumb = React.createClass({
8+
mixins: [ClassGenerator],
99

10-
mixins: [ClassGenerator],
10+
render: function () {
1111

12-
render: function () {
12+
let {className, ...other} = this.props;
1313

14-
var {className, ...other} = this.props;
15-
16-
return (
17-
<div {...other} className={this.getClassName(defaultClassName)} >
18-
{this.props.children}
19-
</div>
20-
);
21-
}
22-
});
23-
24-
return Breadcrumb;
25-
}
14+
return (
15+
<div {...other} className={this.getClassName(defaultClassName)} >
16+
{this.props.children}
17+
</div>
18+
);
19+
}
20+
});

‎src/collections/form.js‎

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,20 @@
1-
"use strict";
2-
module.exports = function (React) {
1+
import React from 'react';
2+
import ClassGenerator from '../mixins/classGenerator';
33

4-
var ClassGenerator = require('../mixins/classGenerator.js')(React);
4+
let defaultClassName = 'ui form';
55

6-
var defaultClassName = 'ui form';
6+
module.exports = React.createClass({
77

8-
var Form = React.createClass({
8+
mixins: [ClassGenerator],
99

10-
mixins: [ClassGenerator],
10+
render: function () {
1111

12-
render: function () {
12+
let {className, ...other} = this.props;
1313

14-
var {className, ...other} = this.props;
15-
16-
return (
17-
<form {...other} className={this.getClassName(defaultClassName)} >
18-
{this.props.children}
19-
</form>
20-
);
21-
}
22-
});
23-
24-
return Form;
25-
}
14+
return (
15+
<form {...other} className={this.getClassName(defaultClassName)} >
16+
{this.props.children}
17+
</form>
18+
);
19+
}
20+
});

‎src/collections/grid.js‎

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,20 @@
1-
"use strict";
2-
module.exports = function (React) {
1+
import React from 'react';
2+
import ClassGenerator from '../mixins/classGenerator';
33

4-
var ClassGenerator = require('../mixins/classGenerator.js')(React);
4+
let defaultClassName = 'ui grid';
55

6-
var defaultClassName = 'ui grid';
6+
module.exports = React.createClass({
77

8-
var Grid = React.createClass({
8+
mixins: [ClassGenerator],
99

10-
mixins: [ClassGenerator],
10+
render: function () {
1111

12-
render: function () {
12+
let {className, ...other} = this.props;
1313

14-
var {className, ...other} = this.props;
15-
16-
return (
17-
<div {...other} className={this.getClassName(defaultClassName)} >
18-
{this.props.children}
19-
</div>
20-
);
21-
}
22-
});
23-
24-
return Grid;
25-
}
14+
return (
15+
<div {...other} className={this.getClassName(defaultClassName)} >
16+
{this.props.children}
17+
</div>
18+
);
19+
}
20+
});

‎src/collections/menu.js‎

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,20 @@
1-
"use strict";
2-
module.exports = function (React) {
1+
import React from 'react';
2+
import ClassGenerator from '../mixins/classGenerator';
33

4-
var ClassGenerator = require('../mixins/classGenerator.js')(React);
4+
let defaultClassName = 'ui menu';
55

6-
var defaultClassName = 'ui menu';
6+
module.exports = React.createClass({
77

8-
var Menu = React.createClass({
8+
mixins: [ClassGenerator],
99

10-
mixins: [ClassGenerator],
10+
render: function () {
1111

12-
render: function () {
12+
let {className, ...other} = this.props;
1313

14-
var {className, ...other} = this.props;
15-
16-
return (
17-
<div {...other} className={this.getClassName(defaultClassName)} >
18-
{this.props.children}
19-
</div>
20-
);
21-
}
22-
});
23-
24-
return Menu;
25-
}
14+
return (
15+
<div {...other} className={this.getClassName(defaultClassName)} >
16+
{this.props.children}
17+
</div>
18+
);
19+
}
20+
});

‎src/collections/message.js‎

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,20 @@
1-
"use strict";
2-
module.exports = function (React) {
1+
import React from 'react';
2+
import ClassGenerator from '../mixins/classGenerator';
33

4-
var ClassGenerator = require('../mixins/classGenerator.js')(React);
4+
let defaultClassName = 'ui message';
55

6-
var defaultClassName = 'ui message';
6+
module.exports = React.createClass({
77

8-
var Message = React.createClass({
8+
mixins: [ClassGenerator],
99

10-
mixins: [ClassGenerator],
10+
render: function () {
1111

12-
render: function () {
12+
let {className, ...other} = this.props;
1313

14-
var {className, ...other} = this.props;
15-
16-
return (
17-
<div {...other} className={this.getClassName(defaultClassName)} >
18-
{this.props.children}
19-
</div>
20-
);
21-
}
22-
});
23-
24-
return Message;
25-
}
14+
return (
15+
<div {...other} className={this.getClassName(defaultClassName)} >
16+
{this.props.children}
17+
</div>
18+
);
19+
}
20+
});

0 commit comments

Comments
 (0)