cli build fixes on global

izelnakri · Nov 5, 2017 · 838f232 · 838f232
1 parent f73393a
commit 838f232
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/TODO b/TODO
@@ -8,3 +8,4 @@
   }
 - non-json request/responses? - just kidding... or do I?!?
 - rollup -i ./lib/response.js -o response.js -f cjs
+- memserver glue [jsonEndpoint]
diff --git a/cli.js b/cli.js
@@ -97,6 +97,7 @@ function generateModelFiles() {
 
   if (!fs.existsSync(`${memServerDirectory}/models/${modelFileName}.js`)) {
     fs.writeFileSync(`${memServerDirectory}/models/${modelFileName}.js`, `import Model from 'memserver/model';
+    
 export default Model({
 
 });`);

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "memserver",
-  "version": "0.8.7",
+  "version": "0.8.8",
   "description": "in-memory database/ORM and http mock server you can run in-browser and node environments. Built for large frontend teams, fast tests and rapid prototyping",
   "main": "lib/index.js",
   "license": "ISC",

diff --git a/rollup.config.js b/rollup.config.js
@@ -42,7 +42,9 @@ export default {
     }),
     resolve({ jsnext: true }),
     commonjs({
-      include: 'node_modules/**',
+      include: IS_DEVELOPMENT ? 'node_modules/**' : [
+        `${require.resolve('memserver')}/../../node_modules/**`, 'node_modules/**'
+      ],
       namedExports: {
         'node_modules/ember-cli-string-utils/index.js': ['classify', 'underscore', 'dasherize'],
         'node_modules/ember-inflector/index.js': ['singularize', 'pluralize']