From 5e2073f3ac77f2d8fad1c3990a0f9812fe2a326c Mon Sep 17 00:00:00 2001 From: Jeff Parsons Date: Tue, 27 Dec 2016 17:16:18 -0800 Subject: [PATCH] Let's switch from import back to require, to simplify future Node support --- Gruntfile.js | 8 ++++++++ gulpfile.js | 2 ++ modules/htmlout/lib/htmlout.js | 2 ++ modules/pdp11/lib/bus.js | 15 ++++++++------- modules/pdp11/lib/computer.js | 24 ++++++++++++------------ modules/pdp11/lib/cpu.js | 10 +++++----- modules/pdp11/lib/cpuops.js | 2 +- modules/pdp11/lib/cpustate.js | 20 ++++++++++---------- modules/pdp11/lib/debugger.js | 24 ++++++++++++------------ modules/pdp11/lib/defines.js | 2 +- modules/pdp11/lib/device.js | 22 +++++++++++----------- modules/pdp11/lib/disk.js | 14 +++++++------- modules/pdp11/lib/keyboard.js | 10 +++++----- modules/pdp11/lib/memory.js | 8 ++++---- modules/pdp11/lib/messages.js | 2 +- modules/pdp11/lib/panel.js | 14 +++++++------- modules/pdp11/lib/pc11.js | 16 ++++++++-------- modules/pdp11/lib/ram.js | 16 ++++++++-------- modules/pdp11/lib/rk11.js | 18 +++++++++--------- modules/pdp11/lib/rl11.js | 18 +++++++++--------- modules/pdp11/lib/rom.js | 18 +++++++++--------- modules/pdp11/lib/serialport.js | 16 ++++++++-------- modules/shared/es6/component.js | 6 +++--- modules/shared/es6/debugger.js | 6 +++--- modules/shared/es6/diskapi.js | 2 +- modules/shared/es6/dumpapi.js | 2 +- modules/shared/es6/embed.js | 6 +++--- modules/shared/es6/keys.js | 2 +- modules/shared/es6/netlib.js | 12 ++++++------ modules/shared/es6/proclib.js | 2 +- modules/shared/es6/reportapi.js | 2 +- modules/shared/es6/save.js | 6 +++--- modules/shared/es6/state.js | 6 +++--- modules/shared/es6/strlib.js | 2 +- modules/shared/es6/userapi.js | 2 +- modules/shared/es6/usrlib.js | 2 +- modules/shared/es6/weblib.js | 6 +++--- 37 files changed, 179 insertions(+), 166 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 67011eff9..a13c299e5 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -201,6 +201,8 @@ module.exports = function(grunt) { return "/**\n * @copyright " + filepath.replace(/^\./, "http://pcjs.org") + " (C) Jeff Parsons 2012-2016\n */\n\n" + src.replace(/(^|\n)[ \t]*(['"])use strict\2;?/g, '') .replace(/^(import|export)[ \t]+[^\n]*\n/gm, '') + .replace(/^[ \t]*var\s+\S+\s+=\s+require\((['"]).*?\1\);/gm, '') + .replace(/^[ \t]*(if\s+\(NODE\)\s*|)module\.exports\s+=\s+\S+;/gm, '') .replace(/\/\*\*\s*\*\s*@fileoverview[\s\S]*?\*\/\s*/g, '') .replace(/[ \t]*if\s*\(NODE\)\s*(\{[^}]*}|[^\n]*)(\n|$)/gm, '') .replace(/[ \t]*if\s*\(typeof\s+module\s*!==\s*(['"])undefined\1\)\s*(\{[^}]*}|[^\n]*)(\n|$)/gm, '') @@ -217,6 +219,8 @@ module.exports = function(grunt) { return "/**\n * @copyright " + filepath.replace(/^\./, "http://pcjs.org") + " (C) Jeff Parsons 2012-2016\n */\n\n" + src.replace(/(^|\n)[ \t]*(['"])use strict\2;?/g, '') .replace(/^(import|export)[ \t]+[^\n]*\n/gm, '') + .replace(/^[ \t]*var\s+\S+\s+=\s+require\((['"]).*?\1\);/gm, '') + .replace(/^[ \t]*(if\s+\(NODE\)\s*|)module\.exports\s+=\s+\S+;/gm, '') .replace(/\/\*\*\s*\*\s*@fileoverview[\s\S]*?\*\/\s*/g, '') .replace(/[ \t]*if\s*\(NODE\)\s*(\{[^}]*}|[^\n]*)(\n|$)/gm, '') .replace(/[ \t]*if\s*\(typeof\s+module\s*!==\s*(['"])undefined\1\)\s*(\{[^}]*}|[^\n]*)(\n|$)/gm, '') @@ -233,6 +237,8 @@ module.exports = function(grunt) { return "/**\n * @copyright " + filepath.replace(/^\./, "http://pcjs.org") + " (C) Jeff Parsons 2012-2016\n */\n\n" + src.replace(/(^|\n)[ \t]*(['"])use strict\2;?/g, '') .replace(/^(import|export)[ \t]+[^\n]*\n/gm, '') + .replace(/^[ \t]*var\s+\S+\s+=\s+require\((['"]).*?\1\);/gm, '') + .replace(/^[ \t]*(if\s+\(NODE\)\s*|)module\.exports\s+=\s+\S+;/gm, '') .replace(/\/\*\*\s*\*\s*@fileoverview[\s\S]*?\*\/\s*/g, '') .replace(/[ \t]*if\s*\(NODE\)\s*(\{[^}]*}|[^\n]*)(\n|$)/gm, '') .replace(/[ \t]*if\s*\(typeof\s+module\s*!==\s*(['"])undefined\1\)\s*(\{[^}]*}|[^\n]*)(\n|$)/gm, '') @@ -249,6 +255,8 @@ module.exports = function(grunt) { return "/**\n * @copyright " + filepath.replace(/^\./, "http://pcjs.org") + " (C) Jeff Parsons 2012-2016\n */\n\n" + src.replace(/(^|\n)[ \t]*(['"])use strict\2;?/g, '') .replace(/^(import|export)[ \t]+[^\n]*\n/gm, '') + .replace(/^[ \t]*var\s+\S+\s+=\s+require\((['"]).*?\1\);/gm, '') + .replace(/^[ \t]*(if\s+\(NODE\)\s*|)module\.exports\s+=\s+\S+;/gm, '') .replace(/\/\*\*\s*\*\s*@fileoverview[\s\S]*?\*\/\s*/g, '') .replace(/[ \t]*if\s*\(NODE\)\s*(\{[^}]*}|[^\n]*)(\n|$)/gm, '') .replace(/[ \t]*if\s*\(typeof\s+module\s*!==\s*(['"])undefined\1\)\s*(\{[^}]*}|[^\n]*)(\n|$)/gm, '') diff --git a/gulpfile.js b/gulpfile.js index c0d662eca..ed41a2f65 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -92,6 +92,8 @@ gulp.task('mktmp', function() { .pipe(header('/**\n * @copyright ' + file.path.replace(/.*\/(modules\/.*)/, "http://pcjs.org/$1") + ' (C) Jeff Parsons 2012-2016\n */\n\n')) .pipe(replace(/(^|\n)[ \t]*(['"])use strict\2;?/g, "")) .pipe(replace(/^(import|export)[ \t]+[^\n]*\n/gm, "")) + .pipe(replace(/^[ \t]*var\s+\S+\s+=\s+require\((['"]).*?\1\);/gm, "")) + .pipe(replace(/^[ \t]*(if\s+\(NODE\)\s*|)module\.exports\s+=\s+\S+;/gm, "")) .pipe(replace(/\/\*\*\s*\*\s*@fileoverview[\s\S]*?\*\/\s*/g, "")) .pipe(replace(/[ \t]*if\s*\(NODE\)\s*(\{[^}]*}|[^\n]*)(\n|$)/gm, "")) .pipe(replace(/[ \t]*if\s*\(typeof\s+module\s*!==\s*(['"])undefined\1\)\s*(\{[^}]*}|[^\n]*)(\n|$)/gm, "")) diff --git a/modules/htmlout/lib/htmlout.js b/modules/htmlout/lib/htmlout.js index cdae7cde0..2a9c86571 100644 --- a/modules/htmlout/lib/htmlout.js +++ b/modules/htmlout/lib/htmlout.js @@ -514,6 +514,8 @@ HTMLOut.filter = function(req, res, next) } else { sData = sData.replace(/^([ \t]*import\s+\S+\s+from\s+(['"]).*?\1;)/gm, "// $1"); sData = sData.replace(/^([ \t]*export\s+default\s+\S+;)/gm, "// $1"); + sData = sData.replace(/^([ \t]*var\s+\S+\s+=\s+require\((['"]).*?\1\);)/gm, "// $1"); + sData = sData.replace(/^([ \t]*(if\s+\(NODE\)\s*|)module\.exports\s+=\s+\S+;)/gm, "// $1"); res.set("Content-Type", "application/javascript"); res.status(200).send(sData); } diff --git a/modules/pdp11/lib/bus.js b/modules/pdp11/lib/bus.js index 276006ee3..b4e42a01c 100644 --- a/modules/pdp11/lib/bus.js +++ b/modules/pdp11/lib/bus.js @@ -32,12 +32,13 @@ "use strict"; -import Str from "../../shared/es6/strlib"; -import Usr from "../../shared/es6/usrlib"; -import Component from "../../shared/es6/component"; -import State from "../../shared/es6/state"; -import MemoryPDP11 from "./memory"; -import MessagesPDP11 from "./messages"; +var Str = require("../../shared/es6/strlib"); +var Usr = require("../../shared/es6/usrlib"); +var Component = require("../../shared/es6/component"); +var State = require("../../shared/es6/state"); +var PDP11 = require("./defines"); +var MemoryPDP11 = require("./memory"); +var MessagesPDP11 = require("./messages"); /* * Data types used by scanMemory() @@ -1421,4 +1422,4 @@ BusPDP11.IOController = { } }; -export default BusPDP11; +if (NODE) module.exports = BusPDP11; diff --git a/modules/pdp11/lib/computer.js b/modules/pdp11/lib/computer.js index 6638ac148..513cb6230 100644 --- a/modules/pdp11/lib/computer.js +++ b/modules/pdp11/lib/computer.js @@ -32,16 +32,16 @@ "use strict"; -import Str from "../../shared/es6/strlib"; -import Usr from "../../shared/es6/usrlib"; -import Web from "../../shared/es6/weblib"; -import UserAPI from "../../shared/es6/userapi"; -import ReportAPI from "../../shared/es6/reportapi"; -import Component from "../../shared/es6/component"; -import State from "../../shared/es6/state"; -import PDP11 from "./defines"; -import BusPDP11 from "./bus"; -import MessagesPDP11 from "./messages"; +var Str = require("../../shared/es6/strlib"); +var Usr = require("../../shared/es6/usrlib"); +var Web = require("../../shared/es6/weblib"); +var UserAPI = require("../../shared/es6/userapi"); +var ReportAPI = require("../../shared/es6/reportapi"); +var Component = require("../../shared/es6/component"); +var State = require("../../shared/es6/state"); +var PDP11 = require("./defines"); +var BusPDP11 = require("./bus"); +var MessagesPDP11 = require("./messages"); class ComputerPDP11 extends Component { /** @@ -50,7 +50,7 @@ class ComputerPDP11 extends Component { * The ComputerPDP11 component has no required (parmsComputer) properties, but it does * support the following: * -z * autoPower: true to automatically power the computer (default), false to wait; + * autoPower: true to automatically power the computer (default), false to wait; * false is honored only if a "power" button binding exists. * * busWidth: number of memory address lines (address bits) on the computer's "bus"; @@ -1621,4 +1621,4 @@ Web.onInit(ComputerPDP11.init); Web.onShow(ComputerPDP11.show); Web.onExit(ComputerPDP11.exit); -export default ComputerPDP11; +module.exports = ComputerPDP11; diff --git a/modules/pdp11/lib/cpu.js b/modules/pdp11/lib/cpu.js index 4e372670f..df3b0ece2 100644 --- a/modules/pdp11/lib/cpu.js +++ b/modules/pdp11/lib/cpu.js @@ -32,10 +32,10 @@ "use strict"; -import Str from "../../shared/es6/strlib"; -import Usr from "../../shared/es6/usrlib"; -import Component from "../../shared/es6/component"; -import MessagesPDP11 from "./messages"; +var Str = require("../../shared/es6/strlib"); +var Usr = require("../../shared/es6/usrlib"); +var Component = require("../../shared/es6/component"); +var MessagesPDP11 = require("./messages"); /* * A word (or more) about PDP-11 speeds: @@ -1245,4 +1245,4 @@ CPUPDP11.YIELDS_PER_STATUS = 15; // every 15 yields (ie, twice pe CPUPDP11.BUTTONS = ["power", "reset"]; -export default CPUPDP11; +module.exports = CPUPDP11; diff --git a/modules/pdp11/lib/cpuops.js b/modules/pdp11/lib/cpuops.js index 9fbe928b3..82e00f8ee 100644 --- a/modules/pdp11/lib/cpuops.js +++ b/modules/pdp11/lib/cpuops.js @@ -32,7 +32,7 @@ "use strict"; -import PDP11 from "./defines"; +var PDP11 = require("./defines"); /* * Decoding starts at the bottom of this file, in op1120() and op1145(). diff --git a/modules/pdp11/lib/cpustate.js b/modules/pdp11/lib/cpustate.js index 2061c895f..12a318bac 100644 --- a/modules/pdp11/lib/cpustate.js +++ b/modules/pdp11/lib/cpustate.js @@ -32,15 +32,15 @@ "use strict"; -import Str from "../../shared/es6/strlib"; -import Web from "../../shared/es6/weblib"; -import Component from "../../shared/es6/component"; -import State from "../../shared/es6/state"; -import PDP11 from "./defines"; -import BusPDP11 from "./bus"; -import CPUPDP11 from "./cpu"; -import MessagesPDP11 from "./messages"; -import MemoryPDP11 from "./memory"; +var Str = require("../../shared/es6/strlib"); +var Web = require("../../shared/es6/weblib"); +var Component = require("../../shared/es6/component"); +var State = require("../../shared/es6/state"); +var PDP11 = require("./defines"); +var BusPDP11 = require("./bus"); +var CPUPDP11 = require("./cpu"); +var MessagesPDP11 = require("./messages"); +var MemoryPDP11 = require("./memory"); /* * Overview of Device Interrupt Support @@ -2969,4 +2969,4 @@ class CPUStatePDP11 extends CPUPDP11 { */ Web.onInit(CPUStatePDP11.init); -export default CPUStatePDP11; +module.exports = CPUStatePDP11; diff --git a/modules/pdp11/lib/debugger.js b/modules/pdp11/lib/debugger.js index fff05b6ba..ed2795583 100644 --- a/modules/pdp11/lib/debugger.js +++ b/modules/pdp11/lib/debugger.js @@ -32,17 +32,17 @@ "use strict"; -import Str from "../../shared/es6/strlib"; -import Usr from "../../shared/es6/usrlib"; -import Web from "../../shared/es6/weblib"; -import Component from "../../shared/es6/component"; -import Debugger from "../../shared/es6/debugger"; -import Keys from "../../shared/es6/keys"; -import State from "../../shared/es6/state"; -import PDP11 from "./defines"; -import BusPDP11 from "./bus"; -import MemoryPDP11 from "./memory"; -import MessagesPDP11 from "./messages"; +var Str = require("../../shared/es6/strlib"); +var Usr = require("../../shared/es6/usrlib"); +var Web = require("../../shared/es6/weblib"); +var Component = require("../../shared/es6/component"); +var Debugger = require("../../shared/es6/debugger"); +var Keys = require("../../shared/es6/keys"); +var State = require("../../shared/es6/state"); +var PDP11 = require("./defines"); +var BusPDP11 = require("./bus"); +var MemoryPDP11 = require("./memory"); +var MessagesPDP11 = require("./messages"); /** * DebuggerPDP11 Address Object @@ -4376,4 +4376,4 @@ if (DEBUGGER) { } // endif DEBUGGER -export default DebuggerPDP11; +module.exports = DebuggerPDP11; diff --git a/modules/pdp11/lib/defines.js b/modules/pdp11/lib/defines.js index 29af1a5de..c1971cc78 100644 --- a/modules/pdp11/lib/defines.js +++ b/modules/pdp11/lib/defines.js @@ -885,4 +885,4 @@ PDP11.ACCESS.UPDATE_BYTE = PDP11.ACCESS.BYTE | PDP11.ACCESS.UPDATE; // forme */ PDP11.PSW.FLAGS = (PDP11.PSW.NF | PDP11.PSW.ZF | PDP11.PSW.VF | PDP11.PSW.CF); -export default PDP11; +module.exports = PDP11; diff --git a/modules/pdp11/lib/device.js b/modules/pdp11/lib/device.js index 2d282101f..469e95996 100644 --- a/modules/pdp11/lib/device.js +++ b/modules/pdp11/lib/device.js @@ -32,16 +32,16 @@ "use strict"; -import Str from "../../shared/es6/strlib"; -import Web from "../../shared/es6/weblib"; -import Component from "../../shared/es6/component"; -import PDP11 from "./defines"; -import BusPDP11 from "./bus"; -import MemoryPDP11 from "./memory"; -import MessagesPDP11 from "./messages"; -import PC11 from "./pc11"; -import RL11 from "./rl11"; -import RK11 from "./rk11"; +var Str = require("../../shared/es6/strlib"); +var Web = require("../../shared/es6/weblib"); +var Component = require("../../shared/es6/component"); +var PDP11 = require("./defines"); +var BusPDP11 = require("./bus"); +var MemoryPDP11 = require("./memory"); +var MessagesPDP11 = require("./messages"); +var PC11 = require("./pc11"); +var RL11 = require("./rl11"); +var RK11 = require("./rk11"); class DevicePDP11 extends Component { /** @@ -1188,4 +1188,4 @@ DevicePDP11.UNIBUS_IOTABLE = { */ Web.onInit(DevicePDP11.init); -export default DevicePDP11; +module.exports = DevicePDP11; diff --git a/modules/pdp11/lib/disk.js b/modules/pdp11/lib/disk.js index 655924ca2..168fe6989 100644 --- a/modules/pdp11/lib/disk.js +++ b/modules/pdp11/lib/disk.js @@ -45,12 +45,12 @@ * to further reduce some of the duplication between them, but the above functionality is a good start. */ -import Str from "../../shared/es6/strlib"; -import Web from "../../shared/es6/weblib"; -import DiskAPI from "../../shared/es6/diskapi"; -import DumpAPI from "../../shared/es6/dumpapi"; -import Component from "../../shared/es6/component"; -import MessagesPDP11 from "./messages"; +var Str = require("../../shared/es6/strlib"); +var Web = require("../../shared/es6/weblib"); +var DiskAPI = require("../../shared/es6/diskapi"); +var DumpAPI = require("../../shared/es6/dumpapi"); +var Component = require("../../shared/es6/component"); +var MessagesPDP11 = require("./messages"); /** * Every Sector object (once loaded, parsed, and "normalized") should have ALL of the following named properties: @@ -1238,4 +1238,4 @@ class DiskPDP11 extends Component { */ DiskPDP11.nDisks = 0; -export default DiskPDP11; +module.exports = DiskPDP11; diff --git a/modules/pdp11/lib/keyboard.js b/modules/pdp11/lib/keyboard.js index 687daff8c..338ab6dce 100644 --- a/modules/pdp11/lib/keyboard.js +++ b/modules/pdp11/lib/keyboard.js @@ -32,10 +32,10 @@ "use strict"; -import Web from "../../shared/es6/weblib"; -import Component from "../../shared/es6/component"; -import PDP11 from "./defines"; -import MessagesPDP11 from "./messages"; +var Web = require("../../shared/es6/weblib"); +var Component = require("../../shared/es6/component"); +var PDP11 = require("./defines"); +var MessagesPDP11 = require("./messages"); class KeyboardPDP11 extends Component { /** @@ -108,4 +108,4 @@ KeyboardPDP11.MINPRESSTIME = 100; // 100ms */ Web.onInit(KeyboardPDP11.init); -export default KeyboardPDP11; +module.exports = KeyboardPDP11; diff --git a/modules/pdp11/lib/memory.js b/modules/pdp11/lib/memory.js index 16694658d..ee947cb7e 100644 --- a/modules/pdp11/lib/memory.js +++ b/modules/pdp11/lib/memory.js @@ -32,9 +32,9 @@ "use strict"; -import Component from "../../shared/lib/component"; -import PDP11 from "./defines"; -import MessagesPDP11 from "./messages"; +var Component = require("../../shared/lib/component"); +var PDP11 = require("./defines"); +var MessagesPDP11 = require("./messages"); /** * @class DataView @@ -1006,4 +1006,4 @@ var littleEndian = (TYPEDARRAYS? (function() { return new Uint16Array(buffer)[0] === 256; })() : false); -export default MemoryPDP11; +module.exports = MemoryPDP11; diff --git a/modules/pdp11/lib/messages.js b/modules/pdp11/lib/messages.js index bc8415545..a0baf6ed8 100644 --- a/modules/pdp11/lib/messages.js +++ b/modules/pdp11/lib/messages.js @@ -117,4 +117,4 @@ MessagesPDP11.CATEGORIES = { "halt": MessagesPDP11.HALT }; -export default MessagesPDP11; +module.exports = MessagesPDP11; diff --git a/modules/pdp11/lib/panel.js b/modules/pdp11/lib/panel.js index 2169aaaf1..dbb052b42 100644 --- a/modules/pdp11/lib/panel.js +++ b/modules/pdp11/lib/panel.js @@ -32,12 +32,12 @@ "use strict"; -import Str from "../../shared/lib/strlib"; -import Web from "../../shared/lib/weblib"; -import Component from "../../shared/es6/component"; -import PDP11 from "./defines"; -import BusPDP11 from "./bus"; -import MessagesPDP11 from "./messages"; +var Str = require("../../shared/lib/strlib"); +var Web = require("../../shared/lib/weblib"); +var Component = require("../../shared/es6/component"); +var PDP11 = require("./defines"); +var BusPDP11 = require("./bus"); +var MessagesPDP11 = require("./messages"); class PanelPDP11 extends Component { /** @@ -1148,4 +1148,4 @@ PanelPDP11.UNIBUS_IOTABLE = { */ Web.onInit(PanelPDP11.init); -export default PanelPDP11; +module.exports = PanelPDP11; diff --git a/modules/pdp11/lib/pc11.js b/modules/pdp11/lib/pc11.js index 2e40a129a..0129ff17d 100644 --- a/modules/pdp11/lib/pc11.js +++ b/modules/pdp11/lib/pc11.js @@ -28,13 +28,13 @@ "use strict"; -import Str from "../../shared/lib/strlib"; -import Web from "../../shared/lib/weblib"; -import DumpAPI from "../../shared/lib/dumpapi"; -import Component from "../../shared/lib/component"; -import State from "../../shared/lib/state"; -import PDP11 from "./defines"; -import MessagesPDP11 from "./messages"; +var Str = require("../../shared/lib/strlib"); +var Web = require("../../shared/lib/weblib"); +var DumpAPI = require("../../shared/lib/dumpapi"); +var Component = require("../../shared/lib/component"); +var State = require("../../shared/lib/state"); +var PDP11 = require("./defines"); +var MessagesPDP11 = require("./messages"); class PC11 extends Component { /** @@ -945,4 +945,4 @@ PC11.UNIBUS_IOTABLE = { [PDP11.UNIBUS.PRB]: /* 177552 */ [null, null, PC11.prototype.readPRB, PC11.prototype.writePRB, "PRB"] }; -export default PC11; +module.exports = PC11; diff --git a/modules/pdp11/lib/ram.js b/modules/pdp11/lib/ram.js index 861b85750..c416e8f70 100644 --- a/modules/pdp11/lib/ram.js +++ b/modules/pdp11/lib/ram.js @@ -32,13 +32,13 @@ "use strict"; -import Str from "../../shared/lib/strlib"; -import Web from "../../shared/lib/weblib"; -import DumpAPI from "../../shared/lib/dumpapi"; -import Component from "../../shared/lib/component"; -import PDP11 from "./defines"; -import MemoryPDP11 from "./memory"; -import MessagesPDP11 from "./messages"; +var Str = require("../../shared/lib/strlib"); +var Web = require("../../shared/lib/weblib"); +var DumpAPI = require("../../shared/lib/dumpapi"); +var Component = require("../../shared/lib/component"); +var PDP11 = require("./defines"); +var MemoryPDP11 = require("./memory"); +var MessagesPDP11 = require("./messages"); class RAMPDP11 extends Component { /** @@ -406,4 +406,4 @@ class RAMPDP11 extends Component { */ Web.onInit(RAMPDP11.init); -export default RAMPDP11; +module.exports = RAMPDP11; diff --git a/modules/pdp11/lib/rk11.js b/modules/pdp11/lib/rk11.js index 597f64207..10751bb61 100644 --- a/modules/pdp11/lib/rk11.js +++ b/modules/pdp11/lib/rk11.js @@ -28,14 +28,14 @@ "use strict"; -import Str from "../../shared/lib/strlib"; -import Web from "../../shared/lib/weblib"; -import DiskAPI from "../../shared/lib/diskapi"; -import Component from "../../shared/lib/component"; -import State from "../../shared/lib/state"; -import PDP11 from "./defines"; -import MessagesPDP11 from "./messages"; -import DiskPDP11 from "./disk"; +var Str = require("../../shared/lib/strlib"); +var Web = require("../../shared/lib/weblib"); +var DiskAPI = require("../../shared/lib/diskapi"); +var Component = require("../../shared/lib/component"); +var State = require("../../shared/lib/state"); +var PDP11 = require("./defines"); +var MessagesPDP11 = require("./messages"); +var DiskPDP11 = require("./disk"); class RK11 extends Component { /** @@ -1437,4 +1437,4 @@ RK11.UNIBUS_IOTABLE = { [PDP11.UNIBUS.RKDB]: /* 177416 */ [null, null, RK11.prototype.readRKDB, RK11.prototype.writeRKDB, "RKDB"] }; -export default RK11; +module.exports = RK11; diff --git a/modules/pdp11/lib/rl11.js b/modules/pdp11/lib/rl11.js index afcf6c6e6..72214baad 100644 --- a/modules/pdp11/lib/rl11.js +++ b/modules/pdp11/lib/rl11.js @@ -28,14 +28,14 @@ "use strict"; -import Str from "../../shared/lib/strlib"; -import Web from "../../shared/lib/weblib"; -import DiskAPI from "../../shared/lib/diskapi"; -import Component from "../../shared/lib/component"; -import State from "../../shared/lib/state"; -import PDP11 from "./defines"; -import MessagesPDP11 from "./messages"; -import DiskPDP11 from "./disk"; +var Str = require("../../shared/lib/strlib"); +var Web = require("../../shared/lib/weblib"); +var DiskAPI = require("../../shared/lib/diskapi"); +var Component = require("../../shared/lib/component"); +var State = require("../../shared/lib/state"); +var PDP11 = require("./defines"); +var MessagesPDP11 = require("./messages"); +var DiskPDP11 = require("./disk"); class RL11 extends Component { /** @@ -1372,4 +1372,4 @@ RL11.UNIBUS_IOTABLE = { [PDP11.UNIBUS.RLBE]: /* 174410 */ [null, null, RL11.prototype.readRLBE, RL11.prototype.writeRLBE, "RLBE"] }; -export default RL11; +module.exports = RL11; diff --git a/modules/pdp11/lib/rom.js b/modules/pdp11/lib/rom.js index 4e20441be..d3577de96 100644 --- a/modules/pdp11/lib/rom.js +++ b/modules/pdp11/lib/rom.js @@ -32,14 +32,14 @@ "use strict"; -import Str from "../../shared/lib/strlib"; -import Web from "../../shared/lib/weblib"; -import DumpAPI from "../../shared/lib/dumpapi"; -import Component from "../../shared/lib/component"; -import PDP11 from "./defines"; -import BusPDP11 from "./bus"; -import MemoryPDP11 from "./memory"; -import MessagesPDP11 from "./messages"; +var Str = require("../../shared/lib/strlib"); +var Web = require("../../shared/lib/weblib"); +var DumpAPI = require("../../shared/lib/dumpapi"); +var Component = require("../../shared/lib/component"); +var PDP11 = require("./defines"); +var BusPDP11 = require("./bus"); +var MemoryPDP11 = require("./memory"); +var MessagesPDP11 = require("./messages"); class ROMPDP11 extends Component { /** @@ -387,4 +387,4 @@ class ROMPDP11 extends Component { */ Web.onInit(ROMPDP11.init); -export default ROMPDP11; +module.exports = ROMPDP11; diff --git a/modules/pdp11/lib/serialport.js b/modules/pdp11/lib/serialport.js index 87f6417b9..3ed0f948c 100644 --- a/modules/pdp11/lib/serialport.js +++ b/modules/pdp11/lib/serialport.js @@ -32,13 +32,13 @@ "use strict"; -import Str from "../../shared/lib/strlib"; -import Web from "../../shared/lib/weblib"; -import Component from "../../shared/lib/component"; -import Keys from "../../shared/lib/keys"; -import State from "../../shared/lib/state"; -import PDP11 from "./defines"; -import MessagesPDP11 from "./messages"; +var Str = require("../../shared/lib/strlib"); +var Web = require("../../shared/lib/weblib"); +var Component = require("../../shared/lib/component"); +var Keys = require("../../shared/lib/keys"); +var State = require("../../shared/lib/state"); +var PDP11 = require("./defines"); +var MessagesPDP11 = require("./messages"); /** * Since the Closure Compiler treats ES6 classes as @struct rather than @dict by default, @@ -884,4 +884,4 @@ SerialPortPDP11.UNIBUS_IOTABLE = { */ Web.onInit(SerialPortPDP11.init); -export default SerialPortPDP11; +module.exports = SerialPortPDP11; diff --git a/modules/shared/es6/component.js b/modules/shared/es6/component.js index 74f1ad9be..c6a26294c 100644 --- a/modules/shared/es6/component.js +++ b/modules/shared/es6/component.js @@ -49,8 +49,8 @@ "use strict"; -import Usr from "../../shared/es6/usrlib"; -import Web from "../../shared/es6/weblib"; +var Usr = require("../../shared/es6/usrlib"); +var Web = require("../../shared/es6/weblib"); /** * Since the Closure Compiler treats ES6 classes as @struct rather than @dict by default, @@ -1053,4 +1053,4 @@ if (!Function.prototype.bind) { }; } -export default Component; +module.exports = Component; diff --git a/modules/shared/es6/debugger.js b/modules/shared/es6/debugger.js index 16308d4e0..a1b837d6a 100644 --- a/modules/shared/es6/debugger.js +++ b/modules/shared/es6/debugger.js @@ -28,8 +28,8 @@ "use strict"; -import Str from "../../shared/es6/strlib"; -import Component from "../../shared/es6/component"; +var Str = require("../../shared/es6/strlib"); +var Component = require("../../shared/es6/component"); /** * Debugger Address Object @@ -674,4 +674,4 @@ if (DEBUGGER) { } // endif DEBUGGER -export default Debugger; +module.exports = Debugger; diff --git a/modules/shared/es6/diskapi.js b/modules/shared/es6/diskapi.js index c7299e0d2..a87edb993 100644 --- a/modules/shared/es6/diskapi.js +++ b/modules/shared/es6/diskapi.js @@ -239,4 +239,4 @@ DiskAPI.ATTR = { ARCHIVE: 0x20 // PC-DOS 2.0 and up }; -export default DiskAPI; +module.exports = DiskAPI; diff --git a/modules/shared/es6/dumpapi.js b/modules/shared/es6/dumpapi.js index 6c8b74ae3..6c43ea40f 100644 --- a/modules/shared/es6/dumpapi.js +++ b/modules/shared/es6/dumpapi.js @@ -82,4 +82,4 @@ var DumpAPI = { DumpAPI.asDiskCommands = [DumpAPI.QUERY.DIR, DumpAPI.QUERY.DISK, DumpAPI.QUERY.PATH]; DumpAPI.asFileCommands = [DumpAPI.QUERY.FILE]; -export default DumpAPI; +module.exports = DumpAPI; diff --git a/modules/shared/es6/embed.js b/modules/shared/es6/embed.js index 8ccc5a059..ba7020d93 100644 --- a/modules/shared/es6/embed.js +++ b/modules/shared/es6/embed.js @@ -28,9 +28,9 @@ "use strict"; -import Str from "../../shared/es6/strlib"; -import Web from "../../shared/es6/weblib"; -import Component from "../../shared/es6/component"; +var Str = require("../../shared/es6/strlib"); +var Web = require("../../shared/es6/weblib"); +var Component = require("../../shared/es6/component"); /* * We now support asynchronous XML and XSL file loads; simply set fAsync (below) to true. diff --git a/modules/shared/es6/keys.js b/modules/shared/es6/keys.js index a96b75efe..a85160fd3 100644 --- a/modules/shared/es6/keys.js +++ b/modules/shared/es6/keys.js @@ -248,4 +248,4 @@ Keys.SHIFTED_KEYCODES[Keys.KEYCODE.FF_DASH] = Keys.ASCII['_']; Keys.SHIFTED_KEYCODES[Keys.KEYCODE.FF_EQUALS] = Keys.ASCII['+']; Keys.SHIFTED_KEYCODES[Keys.KEYCODE.FF_SEMI] = Keys.ASCII[':']; -export default Keys; +module.exports = Keys; diff --git a/modules/shared/es6/netlib.js b/modules/shared/es6/netlib.js index d36997057..e4dc5ab1b 100644 --- a/modules/shared/es6/netlib.js +++ b/modules/shared/es6/netlib.js @@ -28,11 +28,11 @@ "use strict"; -import fs from "fs"; -import http from "http"; -import path from "path"; -import url from "url"; -import Str from "../../shared/es6/strlib"; +var fs = require("fs"); +var http = require("http"); +var path = require("path"); +var url = require("url"); +var Str = require("../../shared/es6/strlib"); class Net { /** @@ -387,4 +387,4 @@ Net.REVEAL_PDFS = "pdfs"; Net.asPropagate = [Net.GORT_COMMAND, "autostart"]; Net.sServerRoot = null; -export default Net; +module.exports = Net; diff --git a/modules/shared/es6/proclib.js b/modules/shared/es6/proclib.js index 818a708a4..412a4a8d3 100644 --- a/modules/shared/es6/proclib.js +++ b/modules/shared/es6/proclib.js @@ -84,4 +84,4 @@ class Proc { } } -export default Proc; +module.exports = Proc; diff --git a/modules/shared/es6/reportapi.js b/modules/shared/es6/reportapi.js index 26774be35..fddbee167 100644 --- a/modules/shared/es6/reportapi.js +++ b/modules/shared/es6/reportapi.js @@ -46,4 +46,4 @@ var ReportAPI = { } }; -export default ReportAPI; +module.exports = ReportAPI; diff --git a/modules/shared/es6/save.js b/modules/shared/es6/save.js index a1c03e238..48324f501 100644 --- a/modules/shared/es6/save.js +++ b/modules/shared/es6/save.js @@ -28,9 +28,9 @@ "use strict"; -import Str from "../../shared/es6/strlib"; -import Web from "../../shared/es6/weblib"; -import Component from "../../shared/es6/component"; +var Str = require("../../shared/es6/strlib"); +var Web = require("../../shared/es6/weblib"); +var Component = require("../../shared/es6/component"); /** * savePC(idMachine, sPCJSFile, callback) diff --git a/modules/shared/es6/state.js b/modules/shared/es6/state.js index eff2e5b48..b0f2f05f8 100644 --- a/modules/shared/es6/state.js +++ b/modules/shared/es6/state.js @@ -28,8 +28,8 @@ "use strict"; -import Web from "../../shared/es6/weblib"; -import Component from "../../shared/es6/component"; +var Web = require("../../shared/es6/weblib"); +var Component = require("../../shared/es6/component"); class State { /** @@ -392,4 +392,4 @@ class State { } } -export default State; +module.exports = State; diff --git a/modules/shared/es6/strlib.js b/modules/shared/es6/strlib.js index 24db0468b..9495d2e9a 100644 --- a/modules/shared/es6/strlib.js +++ b/modules/shared/es6/strlib.js @@ -620,4 +620,4 @@ Str.aASCIICodes = { 0x1F: "US" // Unit Separator }; -export default Str; +module.exports = Str; diff --git a/modules/shared/es6/userapi.js b/modules/shared/es6/userapi.js index 6c0a17f37..6f8f00cf5 100644 --- a/modules/shared/es6/userapi.js +++ b/modules/shared/es6/userapi.js @@ -65,4 +65,4 @@ var UserAPI = { } }; -export default UserAPI; +module.exports = UserAPI; diff --git a/modules/shared/es6/usrlib.js b/modules/shared/es6/usrlib.js index d3260b457..a3aca3b93 100644 --- a/modules/shared/es6/usrlib.js +++ b/modules/shared/es6/usrlib.js @@ -321,4 +321,4 @@ Usr.asDays = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", Usr.asMonths = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"]; Usr.aMonthDays = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]; -export default Usr; +module.exports = Usr; diff --git a/modules/shared/es6/weblib.js b/modules/shared/es6/weblib.js index c83cc951e..6baf69461 100644 --- a/modules/shared/es6/weblib.js +++ b/modules/shared/es6/weblib.js @@ -28,8 +28,8 @@ "use strict"; -import Component from "../../shared/es6/component"; -import ReportAPI from "../../shared/es6/reportapi"; +var Component = require("../../shared/es6/component"); +var ReportAPI = require("../../shared/es6/reportapi"); /* * According to http://www.w3schools.com/jsref/jsref_obj_global.asp, these are the *global* properties @@ -984,4 +984,4 @@ Web.onPageEvent(Web.isUserAgent("Opera") || Web.isUserAgent("iOS")? 'onunload' : Web.doPageEvent(Web.aPageEventHandlers['exit']); }); -export default Web; +module.exports = Web;