Use beta @derbyjs scoped racer

package.json

@@ -36,11 +36,11 @@
     "test-browser": "node test/server.js"
   },
   "dependencies": {
+    "@derbyjs/racer": "^2.0.0-beta.1",
     "chokidar": "^3.5.3",
     "esprima-derby": "^0.1.0",
     "html-util": "^0.2.3",
     "qs": "^6.11.0",
-    "racer": "git+ssh://[email protected]/derbyjs/racer.git#racer-2",
     "resolve": "^1.22.1",
     "serialize-object": "^1.0.0",
     "tracks": "^0.5.8"

src/App.ts

@@ -8,8 +8,8 @@
 import { EventEmitter } from 'events';
 import { basename } from 'path';
 
-import { type Model } from 'racer';
-import { util } from 'racer';
+import { type Model } from '@derbyjs/racer';
+import { util } from '@derbyjs/racer';
 
 import components = require('./components');
 import { type ComponentConstructor, type SingletonComponentConstructor } from './components';

src/AppForServer.ts

@@ -6,7 +6,7 @@
  *
  */
 
-import * as racer from 'racer';
+import * as racer from '@derbyjs/racer';
 
 const util = racer.util;
 import { AppBase } from './App';

src/Controller.ts

@@ -1,6 +1,6 @@
 import { EventEmitter } from 'events';
 
-import { type Model } from 'racer';
+import { type Model } from '@derbyjs/racer';
 
 import { type AppBase } from './App';
 import { type ComponentModelData } from './components';

src/Derby.ts

@@ -4,15 +4,12 @@
  *
  */
 
+import { Racer, util, type Model} from '@derbyjs/racer';
+
 import { App, type AppBase } from './App';
 import { Component } from './components';
 import { Page } from './Page';
 
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const racer = require('racer');
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const Racer = require('racer/lib/Racer');
-
 export abstract class DerbyBase extends Racer {
   Component = Component;
   abstract createApp(name: string, filename: string, options): AppBase
@@ -21,21 +18,13 @@ export abstract class DerbyBase extends Racer {
 export class Derby extends DerbyBase {
   App = App;
   Page = Page;
-  Model: typeof racer.Model;
+  Model: typeof Model;
 
   createApp(name: string, filename: string, options) {
     return new this.App(this, name, filename, options);
   }
-
-  use(plugin, options) {
-    return racer.util.use.call(this, plugin, options);
-  }
-
-  serverUse(plugin, options) {
-    return racer.util.serverUse.call(this, plugin, options);
-  }
 }
 
-if (!racer.util.isServer) {
+if (!util.isServer) {
   module.require('./documentListeners').add(document);
 }

src/DerbyStandalone.ts

@@ -1,5 +1,5 @@
-// import Model = require('racer/lib/Model/ModelStandalone');
-// import util = require('racer/lib/util');
+// import Model = require('@derbyjs/racer/lib/Model/ModelStandalone');
+// import util = require('@derbyjs/racer/lib/util');
 
 // import { App } from './App';
 // import * as components from './components';

src/Page.ts

@@ -1,4 +1,4 @@
-import { type Model, util } from 'racer';
+import { type Model, util } from '@derbyjs/racer';
 
 import { type AppBase, type App } from './App';
 import components = require('./components');

src/PageForServer.ts

@@ -1,5 +1,5 @@
+import { type Model } from '@derbyjs/racer';
 import type { Request, Response } from 'express';
-import { type Model } from 'racer';
 
 import { type AppForServer } from './AppForServer';
 import { PageBase } from './Page';

src/components.ts

@@ -7,7 +7,7 @@
  *
  */
 
-import { type ChildModel, type ModelData, util } from 'racer';
+import { type ChildModel, type ModelData, util } from '@derbyjs/racer';
 
 import { Controller } from './Controller';
 import { PageBase } from './Page';

src/files.js

@@ -4,9 +4,10 @@
  *
  */
 
+import * as racer from '@derbyjs/racer';
+
 var fs = require('fs');
 var path = require('path');
-var util = require('racer/lib/util');
 var resolve = require('resolve');
 var parsing = require('./parsing');
 
@@ -55,7 +56,7 @@ function loadViewsSync(app, sourceFilename, namespace) {
 
 function loadStylesSync(app, sourceFilename, options) {
   if (options == null) {
-    options = { compress: util.isProduction };
+    options = { compress: racer.util.isProduction };
   }
   var resolved = resolve.sync(sourceFilename, {
     extensions: app.styleExtensions,

src/index.ts

@@ -1,7 +1,7 @@
+import { util } from '@derbyjs/racer';
+
 import { Derby } from './Derby';
 
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const util = require('racer').util;
 
 const DerbyClass = util.isServer
   ? util.serverRequire(module, './DerbyForServer').DerbyForServer

src/routes.ts

@@ -1,4 +1,4 @@
-import { type Model } from 'racer';
+import { type Model } from '@derbyjs/racer';
 import tracks = require('tracks');
 
 import { type AppBase } from './App';

src/types.d.ts

@@ -1,14 +1,14 @@
-import 'racer';
+import '@derbyjs/racer';
 
-declare module 'racer' {
+declare module '@derbyjs/racer' {
   interface util {
     isProduction: boolean;
   }
   interface Model {
-    hasErrored: boolean;
+    hasErrored?: boolean;
   }
 }
 
-declare module 'racer/lib/util' {
+declare module '@derbyjs/racer/lib/util' {
   export let isProduction: boolean;
 }

test-utils/domTestRunner.js

@@ -1,4 +1,4 @@
-var util = require('racer').util;
+var util = require('@derbyjs/racer').util;
 var registerAssertions = require('./assertions');
 var ComponentHarness = require('./ComponentHarness');