Merge pull request #48 from oslabs-beta/staging-faast

Fixed 'npm run prod' hang by Fredo

Author: andrewjcho84

__tests__/componentReducer.test.ts

@@ -73,7 +73,11 @@ describe('Testing componentReducer functionality', function () {
   })
 
   // TEST 'UPDATE CSS'
-
+  describe('UPDATE CSS reducer', () => {
+    it('should update background color of focused component', () => {
+      
+    })
+  })
 
   // TEST 'RESET STATE'
 

app/electron/main.js

@@ -202,11 +202,11 @@ app.on('window-all-closed', () => {
   app.quit();
 });
 
-app.on('activate', async () => {
+app.on('activate', () => {
   // On macOS it's common to re-create a window in the app when the
   // dock icon is clicked and there are no other windows open.
   if (win === null) {
-    await createWindow();
+    createWindow();
   }
 });
 

app/src/helperFunctions/generateCode.ts

@@ -1,6 +1,7 @@
 import { Component, State, ChildElement } from '../interfaces/InterfacesNew';
 import HTMLTypes from '../context/HTMLTypes';
-const { format } = require('prettier');
+
+
 
 declare global {
   interface Window {
@@ -222,6 +223,7 @@ const formatCode = (code: string) => {
   // in test environment, window.api is not defined,
   // so we reference original prettier format function instead
   if (process.env.NODE_ENV === 'test') {
+    const { format } = require('prettier');
     return format(code, {
       singleQuote: true,
       trailingComma: 'es5',

app/src/utils/createNonce.js

@@ -3,5 +3,5 @@ const { v4: uuidv4 } = require('uuid');
 // Generate an arbitrary number
 // this arbitrary number will be used in CspHtmlWebpackPlugin and HtmlWebpackPlugin configuration in webpack
 module.exports = function() {
-  return new Buffer(uuidv4()).toString('base64');
+  return new Buffer.from(uuidv4()).toString('base64');
 };