Skip to content

Commit

Permalink
v1.2.4 package upgrades
Browse files Browse the repository at this point in the history
  • Loading branch information
izelnakri committed Dec 29, 2018
1 parent a2da9b4 commit a1d5e5a
Show file tree
Hide file tree
Showing 7 changed files with 1,028 additions and 1,795 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
node_modules
.esm-cache
tags.lock
6 changes: 3 additions & 3 deletions lib/mem-server-cjs.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }

var chalk = _interopDefault(require('ansi-colors'));
var qs = _interopDefault(require('qs'));
var Inflector = _interopDefault(require('i'));
var stringUtils = _interopDefault(require('ember-cli-string-utils'));
var FakeXMLHttpRequest = _interopDefault(require('fake-xml-http-request'));
var RouteRecognizer = _interopDefault(require('route-recognizer'));
require('pretender');
var qs = _interopDefault(require('qs'));
var Inflector = _interopDefault(require('i'));
var stringUtils = _interopDefault(require('ember-cli-string-utils'));

function primaryKeyTypeSafetyCheck(targetPrimaryKeyType, primaryKey, modelName) {
const primaryKeyType = typeof primaryKey;
Expand Down
2 changes: 1 addition & 1 deletion lib/model.js
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ export default function(options) {
function incrementId(Model) {
const ids = targetNamespace.MemServer.DB[Model.modelName];

if (ids.length === 0) {
if (!ids || ids.length === 0) {
return 1;
}

Expand Down
4 changes: 2 additions & 2 deletions model.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }

var chalk = _interopDefault(require('ansi-colors'));
var util = _interopDefault(require('util'));
var chalk = _interopDefault(require('ansi-colors'));
var Inflector = _interopDefault(require('i'));
var emberCliStringUtils = require('ember-cli-string-utils');

Expand Down Expand Up @@ -259,7 +259,7 @@ function model(options) {
function incrementId(Model) {
const ids = targetNamespace.MemServer.DB[Model.modelName];

if (ids.length === 0) {
if (!ids || ids.length === 0) {
return 1;
}

Expand Down
2,783 changes: 1,007 additions & 1,776 deletions package-lock.json

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "memserver",
"version": "1.2.3",
"version": "1.2.5",
"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",
"author": "Izel Nakri",
"main": "lib/index.js",
Expand All @@ -22,34 +22,34 @@
"prepublish": "npm run build:model && npm run build:response && npm run build:memserver-cjs"
},
"dependencies": {
"@babel/core": "7.1.2",
"@babel/preset-env": "^7.1.0",
"@babel/core": "7.2.2",
"@babel/preset-env": "^7.2.3",
"@babel/register": "^7.0.0",
"ansi-colors": "3.2.1",
"ansi-colors": "3.2.3",
"ember-cli-string-utils": "^1.1.0",
"esm": "^3.0.84",
"fake-xml-http-request": "^2.0.0",
"i": "^0.3.6",
"jsdom": "^11.12.0",
"pretender": "^2.1.1",
"qs": "^6.5.2",
"rollup": "^0.66.6",
"qs": "^6.6.0",
"rollup": "1.0.0",
"rollup-plugin-commonjs": "^9.2.0",
"rollup-plugin-node-builtins": "^2.1.2",
"rollup-plugin-node-globals": "^1.4.0",
"rollup-plugin-node-resolve": "^3.4.0",
"rollup-plugin-node-resolve": "^4.0.0",
"rollup-plugin-virtual": "^1.0.1",
"route-recognizer": "^0.3.4"
},
"devDependencies": {
"ava": "1.0.0-rc.1",
"cors": "^2.8.4",
"ava": "1.0.1",
"cors": "^2.8.5",
"express": "^4.16.4",
"fs-extra": "^7.0.0",
"fs-extra": "^7.0.1",
"jquery": "^3.3.1",
"mber": "^0.6.2",
"mber": "^0.7.1",
"pryjs": "^1.0.3",
"sinon": "^7.0.1"
"sinon": "^7.2.2"
},
"ava": {
"require": [
Expand Down
3 changes: 2 additions & 1 deletion rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ export default {
input: targetInput,
output: {
file: IS_DEVELOPMENT ? 'dist/memserver.dist.js' : `${CWD}/dist/memserver.dist.js`,
format: 'iife'
format: 'iife',
name: 'MemServer'
},
name: 'MEMSERVER',
footer: 'window.MemServer = MEMSERVER;',
Expand Down

0 comments on commit a1d5e5a

Please sign in to comment.