From 5badff999eda6cbf8ffe65b0faeb3d849a9c03d5 Mon Sep 17 00:00:00 2001
From: Ray Schamp <ray@scratch.mit.edu>
Date: Thu, 15 Sep 2016 16:20:37 -0400
Subject: [PATCH] Use ES5 module style
This way we can have a consistent style for Node and web code.
---
src/components/blocks.js | 10 ++++++----
src/components/gui.js | 12 +++++++-----
src/components/toolbox.js | 6 ++++--
src/index.js | 6 ++++--
src/playground.js | 9 +++++----
5 files changed, 26 insertions(+), 17 deletions(-)
diff --git a/src/components/blocks.js b/src/components/blocks.js
index 72da7ecfd..0474480fc 100644
--- a/src/components/blocks.js
+++ b/src/components/blocks.js
@@ -1,8 +1,8 @@
-import defaultsDeep from 'lodash.defaultsdeep';
-import React from 'react';
-import ScratchBlocks from 'scratch-blocks/blocks_compressed_vertical';
+const defaultsDeep = require('lodash.defaultsdeep');
+const React = require('react');
+const ScratchBlocks = require('scratch-blocks/blocks_compressed_vertical');
-export default class Blocks extends React.Component {
+class Blocks extends React.Component {
constructor (props) {
super(props);
this.mountBlocks = this.mountBlocks.bind(this);
@@ -69,3 +69,5 @@ Blocks.defaultOptions = {
Blocks.defaultProps = {
options: Blocks.defaultOptions
};
+
+module.exports = Blocks;
diff --git a/src/components/gui.js b/src/components/gui.js
index d0ebe1e37..614884d0f 100644
--- a/src/components/gui.js
+++ b/src/components/gui.js
@@ -1,9 +1,9 @@
-import React from 'react';
-import VM from 'scratch-vm';
-import Blocks from './blocks';
-import Toolbox from './toolbox';
+const React = require('react');
+const VM = require('scratch-vm');
+const Blocks = require('./blocks');
+const Toolbox = require('./toolbox');
-export default class GUI extends React.Component {
+class GUI extends React.Component {
render () {
return (
<div className="scratch-gui">
@@ -26,3 +26,5 @@ GUI.propTypes = {
GUI.defaultProps = {
vm: new VM()
};
+
+module.exports = GUI;
diff --git a/src/components/toolbox.js b/src/components/toolbox.js
index 83cd3697c..04d31ebbc 100644
--- a/src/components/toolbox.js
+++ b/src/components/toolbox.js
@@ -1,9 +1,11 @@
-import React from 'react';
+const React = require('react');
-export default class Toolbox extends React.Component {
+class Toolbox extends React.Component {
render () {
return (
<div className="scratch-toolbox" />
);
}
}
+
+module.exports = Toolbox;
diff --git a/src/index.js b/src/index.js
index 61035648b..93f125bec 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,2 +1,4 @@
-export {default as GUI} from './components/gui';
-export {default as Blocks} from './components/blocks';
+module.exports = {
+ GUI: require('./components/gui'),
+ Blocks: require('./components/blocks')
+};
diff --git a/src/playground.js b/src/playground.js
index d87855ce5..c129fda2f 100644
--- a/src/playground.js
+++ b/src/playground.js
@@ -1,7 +1,8 @@
-import React from 'react';
-import ReactDOM from 'react-dom';
-import {GUI} from '.';
+const React = require('react');
+const ReactDOM = require('react-dom');
+const GUI = require('.').GUI;
ReactDOM.render(
<GUI />,
- document.getElementById('app'));
+ document.getElementById('app')
+);
--
GitLab