0.8.9 release: small MEMSERVER const to let for fastboot

izelnakri · Nov 10, 2017 · fb8c952 · fb8c952
1 parent 838f232
commit fb8c952
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -40,7 +40,7 @@ const modelFixtureTree = modelFileNames.reduce((tree, fileName) => {
   });
 }, {});
 
-const MEMSERVER = require('./mem-server-cjs.js');
+let MEMSERVER = require('./mem-server-cjs.js');
 const Server = require(`${process.cwd()}/memserver/server`).default;
 const initializer_path = `${process.cwd()}/memserver/initializer.js`;
 const initializer = fs.existsSync(initializer_path) ? require(initializer_path).default : () => {};

diff --git a/lib/mem-server-cjs.js b/lib/mem-server-cjs.js
@@ -222,7 +222,7 @@ function getDefaultStatusCode(verb) {
 
 // HACK: Pretender REST defaults hack: For better UX
 ['get', 'put', 'post', 'delete'].forEach((verb) => {
-  window.Pretender.prototype[verb] = function (path, handler, async) {
+  window.Pretender.prototype[verb] = function(path, handler, async) {
     const fullPath = (this.urlPrefix || '') + (this.namespace ? ('/' + this.namespace) : '') + path;
     const targetHandler = handler || getDefaultRouteHandler(verb.toUpperCase(), fullPath);
     const timing = async ? async.timing || this.timing : this.timing;
@@ -272,7 +272,9 @@ function getDefaultRouteHandler(verb, path) {
 const ENVIRONMENT_IS_NODE = typeof global === 'object';
 const targetNamespace = ENVIRONMENT_IS_NODE ? global : window;
 
-global.self = window.self;
+if (ENVIRONMENT_IS_NODE) {
+  global.self = window.self;
+}
 
 window.FakeXMLHttpRequest = FakeXMLHttpRequest;
 window.RouteRecognizer = RouteRecognizer;

diff --git a/lib/mem-server.js b/lib/mem-server.js
@@ -4,7 +4,9 @@ import { primaryKeyTypeSafetyCheck } from './utils';
 const ENVIRONMENT_IS_NODE = typeof global === 'object';
 const targetNamespace = ENVIRONMENT_IS_NODE ? global : window;
 
-global.self = window.self;
+if (ENVIRONMENT_IS_NODE) {
+  global.self = window.self;
+}
 
 import FakeXMLHttpRequest from 'fake-xml-http-request';
 import RouteRecognizer from 'route-recognizer';

diff --git a/lib/pretender-hacks.js b/lib/pretender-hacks.js
@@ -137,7 +137,7 @@ function getDefaultStatusCode(verb) {
 
 // HACK: Pretender REST defaults hack: For better UX
 ['get', 'put', 'post', 'delete'].forEach((verb) => {
-  window.Pretender.prototype[verb] = function (path, handler, async) {
+  window.Pretender.prototype[verb] = function(path, handler, async) {
     const fullPath = (this.urlPrefix || '') + (this.namespace ? ('/' + this.namespace) : '') + path;
     const targetHandler = handler || getDefaultRouteHandler(verb.toUpperCase(), fullPath);
     const timing = async ? async.timing || this.timing : this.timing;

diff --git a/package.json b/package.json
@@ -1,14 +1,18 @@
 {
   "name": "memserver",
-  "version": "0.8.8",
+  "version": "0.8.9",
   "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",
   "scripts": {
     "test": "sh run-tests.sh",
     "bin": "node cli.js",
-    "build-browser": "rollup -c --environment BUILD:development",
-    "prepublish": "rollup -i ./lib/model.js -o model.js -f cjs && rollup -i ./lib/response.js -o response.js -f cjs && rollup -i ./lib/mem-server.js -o ./lib/mem-server-cjs.js -f cjs"
+    "build:browser": "rollup -c --environment BUILD:development",
+    "build:model": "rollup -i ./lib/model.js -o model.js -f cjs",
+    "build:model-iife": "rollup -i ./lib/model.js -o model.js -f cjs",
+    "build:response": "rollup -i ./lib/response.js -o response.js -f cjs",
+    "build:memserver-cjs": "rollup -i ./lib/mem-server.js -o ./lib/mem-server-cjs.js -f cjs",
+    "prepublish": "npm run build:model && npm run build:response && npm run build:memserver-cjs"
   },
   "bin": {
     "memserver": "cli.js"