Merge pull request salesforce-ux#161 from salesforce-ux/cleanup

Cleanup

scripts/helpers/paths.js

@@ -11,23 +11,24 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 
 /* eslint-disable camelcase */
 
-var argv = require('minimist')(process.argv.slice(2));
-var isProd = argv.prod === true;
-var _ = require('lodash');
+import _ from 'lodash';
+import path from 'path';
 
-var path = require('path');
+import minimist from 'minimist';
 
-var root = path.resolve(__dirname, '../../');
-var app_modules = path.resolve(root, 'app_modules');
-var git_modules = path.resolve(root, 'git_modules');
-var node_modules = path.resolve(root, 'node_modules');
+const argv = minimist(process.argv.slice(2));
+const isProd = argv.prod === true;
 
-var paths = {
-  root: root,
+const root = path.resolve(__dirname, '../../');
+const app_modules = path.resolve(root, 'app_modules');
+const git_modules = path.resolve(root, 'git_modules');
+const node_modules = path.resolve(root, 'node_modules');
 
-  app_modules: app_modules,
-  git_modules: git_modules,
-  node_modules: node_modules,
+const paths = {
+  root,
+  app_modules,
+  git_modules,
+  node_modules,
 
   scripts: path.resolve(root, 'scripts'),
   site: path.resolve(root, 'site'),
@@ -43,7 +44,7 @@ var paths = {
   www: path.resolve(root, '.www')
 };
 
-module.exports = {
+export default {
 
   /**
    * Make __PATHS__ available in all modules

scripts/tasks/index.js

@@ -9,9 +9,6 @@ Neither the name of salesforce.com, inc. nor the names of its contributors may b
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-const argv = require('minimist')(process.argv.slice(2));
-const isProd = argv.prod === true;
-
 import path from 'path';
 import async from 'async';
 import _ from 'lodash';
@@ -33,6 +30,11 @@ import generateWhitelist from './generate/whitelist';
 import generateWhitelistUtilities from './generate/whitelist-utilities';
 import generateTokensZip from './generate/zip-tokens';
 
+import minimist from 'minimist';
+
+const argv = minimist(process.argv.slice(2));
+const isProd = argv.prod === true;
+
 export default {
 
   build: function() {

ui/components/lib/control/dom-align/index.js

@@ -16,7 +16,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * @author yiminghe@gmail.com
  */
 
-var utils = require('./utils');
+import utils from './utils';
 
 // http://yiminghe.iteye.com/blog/1124720
 

ui/components/process/flavors/wizard/index.react.example.jsx

@@ -9,10 +9,10 @@ Neither the name of salesforce.com, inc. nor the names of its contributors may b
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-const React = require('react');
+import React from 'react';
 import { prefix as pf } from 'app_modules/ui/util/component';
 
-module.exports = (
+export default (
   <div className="demo-only">
     <div className={pf('wizard')} role="navigation">
       <ol className={pf('wizard__list')}>

ui/components/process/index.docs.jsx

@@ -9,12 +9,12 @@ Neither the name of salesforce.com, inc. nor the names of its contributors may b
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-const React = require('react');
-const ComponentDocs = require('app_modules/site/components/page/component/docs');
-const CodeClass = require('app_modules/site/components/code-class');
+import React from 'react';
+import ComponentDocs from 'app_modules/site/components/page/component/docs';
+import CodeClass from 'app_modules/site/components/code-class';
 import { prefix as pf } from 'app_modules/ui/util/component';
 
-module.exports = (
+export default (
   <ComponentDocs>
     <p className="site-text-introduction">A process component communicates to the user the progress of a particular process.</p>
   </ComponentDocs>