use import instead of multi-entry plugin

package.json

@@ -21,12 +21,11 @@
     "lint": "bin/lint"
   },
   "devDependencies": {
+    "@rollup/plugin-buble": "^0.21.3",
     "blint": "^1.1.0",
     "node-static": "0.7.11",
     "puppeteer": "^1.20.0",
-    "rollup": "^1.26.3",
-    "@rollup/plugin-buble": "^0.21.3",
-    "@rollup/plugin-multi-entry": "^3.0.1"
+    "rollup": "^1.26.3"
   },
   "bugs": "http://github.com/codemirror/CodeMirror/issues",
   "keywords": [
@@ -44,6 +43,5 @@
     "dependencies": {},
     "devDependencies": {}
   },
-  "dependencies": {
-  }
+  "dependencies": {}
 }

rollup.config.js

@@ -1,5 +1,4 @@
 import buble from '@rollup/plugin-buble';
-import multi from '@rollup/plugin-multi-entry';
 
 export default [
   {
@@ -21,23 +20,23 @@ export default [
     plugins: [ buble({namedFunctionExpressions: false}) ]
   },
   {
-    input: ["src/addon/runmode/runmode-standalone.js", "addon/runmode/runmode.js"],
+    input: ["src/addon/runmode/runmode-standalone.js"],
     output: {
       format: "iife",
       file: "addon/runmode/runmode-standalone.js",
       name: "CodeMirror",
       freeze: false, // IE8 doesn't support Object.freeze.
     },
-    plugins: [ buble({namedFunctionExpressions: false}), multi() ]
+    plugins: [ buble({namedFunctionExpressions: false}) ]
   },
   {
-    input: ["src/addon/runmode/runmode.node.js", "addon/runmode/runmode.js"],
+    input: ["src/addon/runmode/runmode.node.js"],
     output: {
       format: "cjs",
       file: "addon/runmode/runmode.node.js",
       name: "CodeMirror",
       freeze: false, // IE8 doesn't support Object.freeze.
     },
-    plugins: [ buble({namedFunctionExpressions: false}), multi() ]
+    plugins: [ buble({namedFunctionExpressions: false}) ]
   },
 ];

src/addon/runmode/codemirror-standalone.js

@@ -0,0 +1,20 @@
+import StringStream from "../../util/StringStream.js"
+import * as modeMethods from "../../modes.js"
+
+// Create a minimal CodeMirror needed to use runMode, and assign to root.
+var root = typeof globalThis !== 'undefined' ? globalThis : window
+root.CodeMirror = {}
+
+// Copy StringStream and mode methods into CodeMirror object.
+CodeMirror.StringStream = StringStream
+for (var exported in modeMethods) CodeMirror[exported] = modeMethods[exported]
+
+// Minimal default mode.
+CodeMirror.defineMode("null", () => ({token: stream => stream.skipToEnd()}))
+CodeMirror.defineMIME("text/plain", "null")
+
+CodeMirror.registerHelper = CodeMirror.registerGlobalHelper = Math.min
+CodeMirror.splitLines = function(string) { return string.split(/\r?\n|\r/); }
+
+CodeMirror.defaults = { indentUnit: 2 }
+export default CodeMirror;

src/addon/runmode/codemirror.node.js

@@ -0,0 +1,19 @@
+import StringStream from "../../util/StringStream.js"
+import * as modeMethods from "../../modes.js"
+
+// Copy StringStream and mode methods into exports (CodeMirror) object.
+exports.StringStream = StringStream
+for (var exported in modeMethods) exports[exported] = modeMethods[exported]
+
+// Shim library CodeMirror with the minimal CodeMirror defined above. 
+require.cache[require.resolve("../../lib/codemirror")] = require.cache[require.resolve("./runmode.node")]
+require.cache[require.resolve("../../addon/runmode/runmode")] = require.cache[require.resolve("./runmode.node")]
+
+// Minimal default mode.
+exports.defineMode("null", () => ({token: stream => stream.skipToEnd()}))
+exports.defineMIME("text/plain", "null")
+
+exports.registerHelper = exports.registerGlobalHelper = Math.min
+exports.splitLines = function(string) { return string.split(/\r?\n|\r/); }
+
+exports.defaults = { indentUnit: 2 }

src/addon/runmode/runmode-standalone.js

@@ -1,19 +1,2 @@
-import StringStream from "../../util/StringStream.js"
-import * as modeMethods from "../../modes.js"
-
-// Create a minimal CodeMirror needed to use runMode, and assign to root.
-var root = typeof globalThis !== 'undefined' ? globalThis : window
-root.CodeMirror = {}
-
-// Copy StringStream and mode methods into CodeMirror object.
-CodeMirror.StringStream = StringStream
-for (var exported in modeMethods) CodeMirror[exported] = modeMethods[exported]
-
-// Minimal default mode.
-CodeMirror.defineMode("null", () => ({token: stream => stream.skipToEnd()}))
-CodeMirror.defineMIME("text/plain", "null")
-
-CodeMirror.registerHelper = CodeMirror.registerGlobalHelper = Math.min
-CodeMirror.splitLines = function(string) { return string.split(/\r?\n|\r/); }
-
-CodeMirror.defaults = { indentUnit: 2 }
+import "./codemirror-standalone.js"
+import "../../../addon/runmode/runmode.js"

src/addon/runmode/runmode.node.js

@@ -1,19 +1,2 @@
-import StringStream from "../../util/StringStream.js"
-import * as modeMethods from "../../modes.js"
-
-// Copy StringStream and mode methods into exports (CodeMirror) object.
-exports.StringStream = StringStream
-for (var exported in modeMethods) exports[exported] = modeMethods[exported]
-
-// Shim library CodeMirror with the minimal CodeMirror defined above. 
-require.cache[require.resolve("../../lib/codemirror")] = require.cache[require.resolve("./runmode.node")]
-require.cache[require.resolve("../../addon/runmode/runmode")] = require.cache[require.resolve("./runmode.node")]
-
-// Minimal default mode.
-exports.defineMode("null", () => ({token: stream => stream.skipToEnd()}))
-exports.defineMIME("text/plain", "null")
-
-exports.registerHelper = exports.registerGlobalHelper = Math.min
-exports.splitLines = function(string) { return string.split(/\r?\n|\r/); }
-
-exports.defaults = { indentUnit: 2 }
+import "./codemirror.node.js"
+import "../../../addon/runmode/runmode.js"