Merge pull request #18 from GeorgeCrecoukias/sourcejs-react-16

Sergey Zarouski · web-flow · commit 339db89615ff · 2017-10-17T14:52:56.000-04:00
upgraded to react 16, convertd jsx files to es6 and removed createClass
diff --git a/.babelrc b/.babelrc
@@ -1,3 +1,3 @@
 {
-  "presets": ["es2015"]
+  "presets": ["es2015", "react"]
 }
diff --git a/SourceCode.js b/SourceCode.js
@@ -0,0 +1,51 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+
+var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+
+var _react = require('react');
+
+var _react2 = _interopRequireDefault(_react);
+
+var _propTypes = require('prop-types');
+
+var _propTypes2 = _interopRequireDefault(_propTypes);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+var SourceCode = function () {
+    function SourceCode() {
+        _classCallCheck(this, SourceCode);
+    }
+
+    _createClass(SourceCode, [{
+        key: 'render',
+        value: function render() {
+            return _react2.default.createElement(
+                'code',
+                { className: 'src-html ' + this.props.extraClasses },
+                this.props.children
+            );
+        }
+    }]);
+
+    return SourceCode;
+}();
+
+SourceCode.displayName = 'SourceCode';
+
+SourceCode.propTypes = {
+    children: _propTypes2.default.element.isRequired,
+    extraClasses: _propTypes2.default.string
+};
+
+SourceCode.defaultProps = {
+    extraClasses: 'source_visible'
+};
+
+exports.default = SourceCode;
diff --git a/SourceCode.jsx b/SourceCode.jsx
diff --git a/SourceExample.js b/SourceExample.js
@@ -0,0 +1,51 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+
+var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+
+var _react = require('react');
+
+var _react2 = _interopRequireDefault(_react);
+
+var _propTypes = require('prop-types');
+
+var _propTypes2 = _interopRequireDefault(_propTypes);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+var SourceExample = function () {
+    function SourceExample() {
+        _classCallCheck(this, SourceExample);
+    }
+
+    _createClass(SourceExample, [{
+        key: 'render',
+        value: function render() {
+            return _react2.default.createElement(
+                'div',
+                { className: 'source_example ' + this.props.extraClasses },
+                this.props.children
+            );
+        }
+    }]);
+
+    return SourceExample;
+}();
+
+SourceExample.displayName = 'SourceExample';
+
+SourceExample.propTypes = {
+    children: _propTypes2.default.element.isRequired,
+    extraClasses: _propTypes2.default.string
+};
+
+SourceExample.defaultProps = {
+    extraClasses: ''
+};
+
+exports.default = SourceExample;
diff --git a/SourceExample.jsx b/SourceExample.jsx
diff --git a/SourceSection.js b/SourceSection.js
@@ -0,0 +1,51 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+
+var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+
+var _react = require('react');
+
+var _react2 = _interopRequireDefault(_react);
+
+var _propTypes = require('prop-types');
+
+var _propTypes2 = _interopRequireDefault(_propTypes);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+var SourceSection = function () {
+    function SourceSection() {
+        _classCallCheck(this, SourceSection);
+    }
+
+    _createClass(SourceSection, [{
+        key: 'render',
+        value: function render() {
+            return _react2.default.createElement(
+                'section',
+                { className: 'source_section ' + this.props.extraClasses },
+                this.props.children
+            );
+        }
+    }]);
+
+    return SourceSection;
+}();
+
+SourceSection.displayName = 'SourceSection';
+
+SourceSection.propTypes = {
+    children: _propTypes2.default.element.isRequired,
+    extraClasses: _propTypes2.default.string
+};
+
+SourceSection.defaultProps = {
+    extraClasses: ''
+};
+
+exports.default = SourceExample;
diff --git a/SourceSection.jsx b/SourceSection.jsx
diff --git a/core/middleware/index.js b/core/middleware/index.js
@@ -70,7 +70,7 @@ function cleanCache() {
     _.each(require.cache, function cleanReferences(cacheObj, key) {
         var pathMatcher = new FilePatternMatcher({
             filePaths: [key],
-            patterns: options.refreshCachePatterns || ['**/*.jsx']
+            patterns: options.refreshCachePatterns || ['**/*.js']
         });
 
         if (pathMatcher.hasMatch()) {
diff --git a/package.json b/package.json
@@ -1,23 +1,25 @@
 {
   "name": "sourcejs-react",
-  "version": "5.0.2",
+  "version": "6.0.0",
   "description": "React middleware for sourcejs.com",
   "main": "index.js",
   "scripts": {
     "test": "jest"
   },
   "dependencies": {
-    "babel": "^5.8.23",
-    "babel-core": "^5.8.25",
+    "babel-cli": "^6.26.0",
+    "babel-core": "^6.26.0",
+    "babel-preset-es2015": "^6.24.1",
+    "babel-preset-react": "^6.24.1",
     "eol": "^0.2.0",
     "lodash": "^3.8.0",
     "minimatch": "^2.0.10",
-    "react": "^15.0.0",
-    "react-dom": "^15.0.0"
+    "prop-types": "^15.6.0",
+    "react": "^16.0.0",
+    "react-dom": "^16.0.0"
   },
   "devDependencies": {
     "babel-jest": "^19.0.0",
-    "babel-preset-es2015": "^6.22.0",
     "jest": "^19.0.2"
   },
   "repository": {
diff --git a/src/SourceCode.js b/src/SourceCode.js
@@ -0,0 +1,26 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+class SourceCode {
+
+    render() {
+        return (
+            <code className={`src-html ${this.props.extraClasses}`}>
+                {this.props.children}
+            </code>
+        );
+    }
+}
+
+SourceCode.displayName = 'SourceCode';
+
+SourceCode.propTypes= {
+    children: PropTypes.element.isRequired,
+    extraClasses: PropTypes.string
+};
+
+SourceCode.defaultProps= {
+    extraClasses: 'source_visible'
+};
+
+export default SourceCode;
diff --git a/src/SourceExample.js b/src/SourceExample.js
@@ -0,0 +1,26 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+
+class SourceExample {
+    render() {
+        return (
+			<div className={`source_example ${this.props.extraClasses}`}>
+                {this.props.children}
+			</div>
+        );
+    }
+}
+
+SourceExample.displayName = 'SourceExample';
+
+SourceExample.propTypes = {
+    children: PropTypes.element.isRequired,
+    extraClasses: PropTypes.string
+};
+
+SourceExample.defaultProps = {
+    extraClasses: ''
+};
+
+export default SourceExample;
diff --git a/src/SourceSection.js b/src/SourceSection.js
@@ -0,0 +1,25 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+class SourceSection {
+    render() {
+        return (
+			<section className={`source_section ${this.props.extraClasses}`}>
+                {this.props.children}
+			</section>
+        );
+    }
+}
+
+SourceSection.displayName = 'SourceSection';
+
+SourceSection.propTypes = {
+    children: PropTypes.element.isRequired,
+    extraClasses: PropTypes.string
+};
+
+SourceSection.defaultProps = {
+    extraClasses: ''
+};
+
+export default SourceExample;

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- "presets": ["es2015"]`
	`2`	`+ "presets": ["es2015", "react"]`
`3`	`3`	`}`