From f65d3666500099c205def16ee6b03c3d8a016546 Mon Sep 17 00:00:00 2001
From: Dennis Shy <dshy@movableink.com>
Date: Thu, 3 Oct 2019 16:31:58 -0400
Subject: [PATCH] fix(cli): resolve modules using node algorithm instead of
 hardcode

---
 index.js     | 14 ++++++++++++--
 package.json |  1 +
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/index.js b/index.js
index c219bbff..637acaa6 100644
--- a/index.js
+++ b/index.js
@@ -11,6 +11,7 @@ const rollup = require('broccoli-rollup');
 const rollupNodeResolve = require('rollup-plugin-node-resolve');
 const rollupCommonjs = require('rollup-plugin-commonjs');
 const rollupBabel = require('rollup-plugin-babel');
+const resolvePackagePath = require('resolve-package-path');
 
 let environment;
 
@@ -21,7 +22,11 @@ function maybeDebug(tree, name) {
 }
 
 function getMonacoEditorModulePath() {
-  var monacoEditorModulePath = 'node_modules/monaco-editor';
+  const monacoEditorModulePath = resolvePackagePath('monaco-editor')
+    .split('/')
+    .slice(0, -1)
+    .join('/');
+
   return environment !== 'production'
     ? monacoEditorModulePath + '/dev/vs'
     : monacoEditorModulePath + '/min/vs';
@@ -120,8 +125,13 @@ module.exports = {
       '3-es-rollup'
     );
 
+    const regeneratorPath = require.resolve('regenerator-runtime')
+      .split('/')
+      .slice(0, -1)
+      .join('/');
+
     const regeneratorTree = maybeDebug(
-      new Funnel('node_modules/regenerator-runtime', {
+      new Funnel(regeneratorPath, {
         include: ['runtime.js'],
         destDir: '.'
       }),
diff --git a/package.json b/package.json
index 0da37b68..ae5c61fd 100644
--- a/package.json
+++ b/package.json
@@ -36,6 +36,7 @@
     "ember-cli-typescript": "^2.0.0-rc.1",
     "monaco-editor": "^0.16.0",
     "penpal": "^3.0.7",
+    "resolve-package-path": "^1.2.7",
     "rollup-plugin-babel": "^4.2.0",
     "rollup-plugin-commonjs": "^9.2.0",
     "rollup-plugin-node-resolve": "^4.0.0"