Comparing version 4.0.0-beta.9 to 4.0.0-beta.10
/// <reference types="node" /> | ||
import { EventEmitter } from 'events'; | ||
import { type Model } from 'racer'; | ||
import { type Model, type RootModel } from 'racer'; | ||
import { util } from 'racer'; | ||
@@ -43,3 +43,3 @@ import { type ComponentConstructor, type SingletonComponentConstructor } from './components'; | ||
tracksRoutes: Routes; | ||
model: Model; | ||
model: RootModel; | ||
page: Page; | ||
@@ -54,3 +54,3 @@ protected _pendingComponentMap: Record<string, ComponentConstructor | SingletonComponentConstructor>; | ||
loadViews(_viewFilename: any, _viewName?: any): void; | ||
loadStyles(_filename: any, _options: any): void; | ||
loadStyles(_filename: any, _options?: any): void; | ||
component(constructor: ComponentConstructor | SingletonComponentConstructor): this; | ||
@@ -57,0 +57,0 @@ component(name: string, constructor: ComponentConstructor | SingletonComponentConstructor, isDependency?: boolean): this; |
@@ -28,2 +28,3 @@ var __extends = (this && this.__extends) || (function () { | ||
var racer_1 = require("racer"); | ||
var racer_2 = require("racer"); | ||
var components = require("./components"); | ||
@@ -69,4 +70,4 @@ var Page_1 = require("./Page"); | ||
_this = _super.call(this) || this; | ||
_this.use = racer_1.util.use; | ||
_this.serverUse = racer_1.util.serverUse; | ||
_this.use = racer_2.util.use; | ||
_this.serverUse = racer_2.util.serverUse; | ||
if (options == null) { | ||
@@ -230,3 +231,3 @@ options = {}; | ||
this._cancelAttach = false; | ||
this.model = new this.derby.Model(); | ||
this.model = (0, racer_1.createModel)(); | ||
var serializedViews = this._views(); | ||
@@ -243,5 +244,5 @@ serializedViews(derbyTemplates, this.views); | ||
var data = this._getAppData(); | ||
racer_1.util.isProduction = data.nodeEnv === 'production'; | ||
racer_2.util.isProduction = data.nodeEnv === 'production'; | ||
var previousAppInfo; | ||
if (!racer_1.util.isProduction) { | ||
if (!racer_2.util.isProduction) { | ||
previousAppInfo = global.APPS[this.name]; | ||
@@ -258,3 +259,3 @@ if (previousAppInfo) { | ||
this.emit('model', this.model); | ||
if (!racer_1.util.isProduction) | ||
if (!racer_2.util.isProduction) | ||
this._autoRefresh(); | ||
@@ -276,3 +277,3 @@ this.model.unbundle(data); | ||
// Derby or Saddle, re-render from scratch on production failures | ||
if (racer_1.util.isProduction) { | ||
if (racer_2.util.isProduction) { | ||
try { | ||
@@ -279,0 +280,0 @@ page.attach(); |
@@ -122,3 +122,3 @@ /* | ||
AppForServer.prototype.createPage = function (req, res, next) { | ||
var model = req.model || new racer.Model(); | ||
var model = req.model || racer.createModel(); | ||
this.emit('model', model); | ||
@@ -125,0 +125,0 @@ var Page = this.Page; |
@@ -1,2 +0,2 @@ | ||
import { Racer, type Model } from 'racer'; | ||
import { Racer } from 'racer'; | ||
import { App, type AppBase, type AppOptions } from './App'; | ||
@@ -7,3 +7,2 @@ import { Component } from './components'; | ||
Component: typeof Component; | ||
Model: typeof Model; | ||
abstract createApp(name?: string, filename?: string, options?: AppOptions): AppBase; | ||
@@ -14,4 +13,3 @@ } | ||
Page: typeof PageForClient; | ||
Model: typeof Model; | ||
createApp(name?: string, filename?: string, options?: AppOptions): App; | ||
} |
@@ -1,2 +0,2 @@ | ||
import { type Model, ChangeEvent, MoveEvent, RemoveEvent, InsertEvent, LoadEvent, UnloadEvent } from 'racer'; | ||
import { type Model, type RootModel, ChangeEvent, MoveEvent, RemoveEvent, InsertEvent, LoadEvent, UnloadEvent } from 'racer'; | ||
import { type AppBase } from './App'; | ||
@@ -24,2 +24,3 @@ import components = require('./components'); | ||
export declare abstract class Page extends Controller { | ||
model: RootModel; | ||
params: Readonly<PageParams>; | ||
@@ -26,0 +27,0 @@ context: Context; |
{ | ||
"name": "derby", | ||
"description": "MVC framework making it easy to write realtime, collaborative applications that run in both Node.js and browsers.", | ||
"version": "4.0.0-beta.9", | ||
"version": "4.0.0-beta.10", | ||
"homepage": "http://derbyjs.com/", | ||
@@ -6,0 +6,0 @@ "repository": { |
409866