Exponent templates

.gitignore

@@ -5,3 +5,5 @@
 /app
 /dist
 /desktop/tests/integration/snapshot/tmp
+
+tools/.hyperinstall-state.json

README.md

@@ -56,18 +56,11 @@ Linux is not supported at this time.
 Windows is not supported at this time.
 
 ### Clone and Install Dependencies
+
 ```
-$ git clone git@github.com:decosoftware/deco-ide
-$ cd ./deco-ide/web
-$ npm install
-$ bundle install
-$ cd ../desktop
-$ npm install
-$ npm run copy-libs
-$ cd ../shared
-$ npm install
-$ cd ../desktop/libs/Scripts/sync-service
-$ npm install
+npm i -g hyperinstall
+git clone git@github.com:decosoftware/deco-ide
+./deco-ide/tools/install-dependencies
 ```
 
 ### Development

desktop/gulpfile.babel.js

@@ -82,7 +82,7 @@ gulp.task('dist', ['modify-plist'], (callback) => {
 })
 
 gulp.task('rebuild-native-modules', () => {
-  const modules = ['git-utils', 'nodobjc', 'ffi', 'ref', 'ref-struct']
+  const modules = ['git-utils', 'nodobjc', 'ffi', 'ref', 'ref-struct', 'dtrace-provider']
 
   modules.forEach(module => {
     console.log('Building native module', module, 'for version', NODE_MODULES_VERSION)

desktop/libs/Scripts/deco-tool/configure.deco.js

@@ -53,6 +53,15 @@ const checkEnvironmentOK = () => {
   return true
 }
 
+const checkIsExponent = () => {
+  try {
+    fs.statSync(path.join(process.cwd(), 'exp.json'));
+    return true;
+  } catch(e) {
+    return false;
+  }
+}
+
 const checkGenymotionOK = () => {
   if (!process.env.GENYMOTION_APP) {
     const defaultGenymotionPath = `/Applications/Genymotion.app`
@@ -133,18 +142,20 @@ DECO.on('list-ios-sim', function(args) {
     })
   }
 
-  const targetAppPath = path.join(process.cwd(), path.dirname(PROJECT_SETTING.iosTarget))
-  try {
-    fs.statSync(targetAppPath)
-  } catch (e) {
-    if (e.code == 'ENOENT') {
-      return Promise.reject({
-        payload: [
-          'iOS simulator cannot launch without building your project.',
-          'Please hit cmd + B or Tools > Build Native Modules to build your project.',
-          'If you have a custom build outside of Deco, go to Deco > Project Settings and change the "iosTarget" to your .app file location'
-        ]
-      })
+  if (!checkIsExponent()) {
+    const targetAppPath = path.join(process.cwd(), path.dirname(PROJECT_SETTING.iosTarget))
+    try {
+      fs.statSync(targetAppPath)
+    } catch (e) {
+      if (e.code == 'ENOENT') {
+        return Promise.reject({
+          payload: [
+            'iOS simulator cannot launch without building your project.',
+            'Please hit cmd + B or Tools > Build Native Modules to build your project.',
+            'If you have a custom build outside of Deco, go to Deco > Project Settings and change the "iosTarget" to your .app file location'
+          ]
+        })
+      }
     }
   }
 
@@ -436,3 +447,7 @@ DECO.on('init-template', function (args) {
     .pipe(fs.createWriteStream(path.join(process.cwd(), 'configure.deco.js')))
   return Promise.resolve()
 })
+
+if (checkIsExponent()) {
+  require('./exponent.configure.deco.js')
+}

desktop/libs/Scripts/deco-tool/exponent.configure.deco.js

@@ -0,0 +1,92 @@
+/**
+ *    Copyright (C) 2015 Deco Software Inc.
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU Affero General Public License, version 3,
+ *    as published by the Free Software Foundation.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU Affero General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Affero General Public License
+ *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+'use strict'
+
+const projectRoot = process.cwd()
+
+const child_process = require('child_process')
+const path = require('path')
+const DECO = require('deco-tool')
+
+DECO.on('run-packager', function(args) {
+  return new Promise((resolve, reject) => {
+    let exponentPackagerPath = path.resolve(
+      projectRoot,
+      'node_modules/@exponent/minimal-packager/cli.js'
+    )
+
+    var child = child_process.spawn(exponentPackagerPath, [], {
+      env: process.env,
+      cwd: process.cwd(),
+      stdio: 'inherit',
+    })
+
+    resolve({ child })
+  })
+})
+
+DECO.on('build-ios', function (args) {
+ // noop
+})
+
+DECO.on('build-android', function (args) {
+  // noop
+})
+
+DECO.on('sim-android', function(args) {
+  return openAppOnAndroid()
+})
+
+DECO.on('reload-android-app', function(args) {
+  return openAppOnAndroid()
+})
+
+DECO.on('sim-ios', function(args) {
+  return openAppOnIOS()
+})
+
+DECO.on('reload-ios-app', function(args) {
+  return openAppOnIOS()
+})
+
+function openAppOnAndroid() {
+  return new Promise((resolve, reject) => {
+    const xdl = require(`${projectRoot}/node_modules/xdl`)
+
+    xdl.Android.openProjectAsync(projectRoot).then(() => {
+      resolve('Opened project on Android')
+    }).catch(e => {
+      reject(`Error opening project on Android: ${e.message}`)
+    })
+  })
+}
+
+function openAppOnIOS() {
+  return new Promise((resolve, reject) => {
+    const xdl = require(`${projectRoot}/node_modules/xdl`)
+
+    xdl.Project.getUrlAsync(projectRoot).then(url => {
+      xdl.Simulator.openUrlInSimulatorSafeAsync(url).then(() => {
+        resolve('Opened project in iOS simulator')
+      }).catch(e => {
+        reject(`Error opening project in iOS simulator: ${e.message}`)
+      })
+    }).catch(e => {
+      reject(`Error opening project in iOS simulator: ${e.message}`)
+    })
+  })
+}

desktop/libs/Scripts/deco-tool/template.configure.deco.js

@@ -15,7 +15,7 @@ const packagerPort = Deco.setting.packagerPort
 
 /**
  *
- * HOW TO USE THIS FILE (https://github.com/decosoftware/deco-ide/blob/master/desktop/CONFIGURE.MD)
+ * HOW TO USE THIS FILE (https://github.com/decosoftware/deco-ide/blob/master/desktop/CONFIGURE.md)
  *
  * Runs a registered function in an isolated NodeJS environment when that function's corresponding
  * command is triggered from within the Deco application or when run from shell as a 'deco-tool' command

desktop/package.json

@@ -24,7 +24,6 @@
     "image-diff": "^1.6.3",
     "jest": "^15.1.1",
     "mocha": "^3.0.2",
-    "node-inspector": "^0.12.8",
     "node-pre-gyp": "^0.6.29",
     "plist": "^1.2.0",
     "rimraf": "^2.5.4",
@@ -43,7 +42,7 @@
     "babel-core": "^6.4.0",
     "babel-runtime": "^6.11.6",
     "deco-simulacra": "1.0.0",
-    "electron-prebuilt": "1.4.3",
+    "electron-prebuilt": "^1.4.3",
     "file-tree-server": "0.0.8",
     "file-tree-server-git": "0.0.8",
     "file-tree-server-transport-electron": "0.0.1",
@@ -62,6 +61,7 @@
     "once": "^1.3.3",
     "raven": "^0.10.0",
     "sane": "^1.3.3",
-    "winston": "^2.1.1"
+    "winston": "^2.1.1",
+    "xdl": "^0.25.0"
   }
 }

desktop/src/handlers/moduleHandler.js

@@ -16,46 +16,20 @@
  */
 
 import _ from 'lodash'
-import fs from 'fs'
 import path from 'path'
-import jsonfile from 'jsonfile'
 import dir from 'node-dir'
 
 import Logger from '../log/logger'
-import npm from '../process/npmController'
 import bridge from '../bridge'
-import { onSuccess, onError } from '../actions/genericActions'
-import { startProgressBar, updateProgressBar, endProgressBar } from '../actions/uiActions'
 import { foundRegistries } from '../actions/moduleActions'
 import ModuleConstants from 'shared/constants/ipc/ModuleConstants'
 
 class ModuleHandler {
 
   register() {
-    bridge.on(ModuleConstants.IMPORT_MODULE, this.importModule.bind(this))
     bridge.on(ModuleConstants.SCAN_PROJECT_FOR_REGISTRIES, this.scanPathForRegistries.bind(this))
   }
 
-  readPackageJSON(projectPath) {
-    const packagePath = path.join(projectPath, 'package.json')
-    return new Promise((resolve, reject) => {
-      try {
-        jsonfile.readFile(packagePath, (err, obj) => {
-          if (err && err.code !== 'ENOENT') {
-            Logger.info('Failed to read package.json')
-            Logger.error(err)
-            reject(err)
-          } else {
-            resolve(obj)
-          }
-        })
-      } catch (e) {
-        Logger.error(e)
-        reject(e)
-      }
-    })
-  }
-
   /**
    * Return a map of {filepath => package.json contents}
    * @param  {String} dirname Directory to scan
@@ -154,60 +128,6 @@ class ModuleHandler {
       respond(foundRegistries(registryMap))
     })
   }
-
-  importModule(options, respond) {
-
-    options.version = options.version || 'latest'
-
-    const {name, version, path: installPath } = options
-
-    this.readPackageJSON(options.path).then((packageJSON = {}) => {
-      const {dependencies} = packageJSON
-
-      // If the dependency exists, and the version is compatible
-      if (dependencies && dependencies[name] &&
-          (version === '*' || version === dependencies[name])) {
-        Logger.info(`npm: dependency ${name}@${version} already installed`)
-        respond(onSuccess(ModuleConstants.IMPORT_MODULE))
-      } else {
-        const progressCallback = _.throttle((percent) => {
-          bridge.send(updateProgressBar(name, percent * 100))
-        }, 250)
-
-        bridge.send(startProgressBar(name, 0))
-
-        try {
-          const command = [
-            'install', '-S', `${name}@${version}`,
-            ...options.registry && ['--registry', options.registry]
-          ]
-
-          Logger.info(`npm ${command.join(' ')}`)
-
-          npm.run(command, {cwd: installPath}, (err) => {
-
-            // Ensure a trailing throttled call doesn't fire
-            progressCallback.cancel()
-
-            bridge.send(endProgressBar(name, 100))
-
-            if (err) {
-              Logger.info(`npm: dependency ${name}@${version} failed to install`)
-              respond(onError(ModuleConstants.IMPORT_MODULE))
-            } else {
-              Logger.info(`npm: dependency ${name}@${version} installed successfully`)
-              respond(onSuccess(ModuleConstants.IMPORT_MODULE))
-            }
-          }, progressCallback)
-        } catch(e) {
-          Logger.error(e)
-          respond(onError(ModuleConstants.IMPORT_MODULE))
-        }
-      }
-    })
-
-  }
-
 }
 
-export default new ModuleHandler()
+module.exports = new ModuleHandler()

desktop/src/handlers/windowHandler.js

@@ -57,7 +57,6 @@ class WindowHandler {
     bridge.on(SAVE_AS_DIALOG, this.saveAsDialog.bind(this))
     bridge.on(RESIZE, this.resizeWindow.bind(this))
     bridge.on(OPEN_PATH_CHOOSER_DIALOG, this.openPathChooserDialog.bind(this))
-    bridge.on(OPEN_PATH_CHOOSER_DIALOG, this.openPathChooserDialog.bind(this))
     bridge.on(CONFIRM_DELETE_DIALOG, this.showDeleteDialog.bind(this))
   }
 

desktop/src/menu/menuHandler.js

@@ -21,18 +21,13 @@ const Menu = require('electron').Menu
 const TemplateBuilder = require('./templateBuilder.js')
 
 class MenuHandler {
-  instantiateTemplate() {
-    var template = new TemplateBuilder(process.platform).makeTemplate()
-    this._template = template
-    this._menu = Menu.buildFromTemplate(this._template)
-    Menu.setApplicationMenu(this._menu)
-  }
+  instantiateTemplate(options = {}) {
+    const builder = new TemplateBuilder({platform: process.platform, ...options})
+    const template = builder.makeTemplate()
+    const menu = Menu.buildFromTemplate(template)
 
-  get menu() {
-    return this._menu
+    Menu.setApplicationMenu(menu)
   }
 }
 
-const handler = new MenuHandler()
-
-module.exports = handler
+module.exports = new MenuHandler()