From 41d033a5cbe7efb9847d8a5828a1fb111fa39198 Mon Sep 17 00:00:00 2001
From: zodern <zodern@users.noreply.github.com>
Date: Mon, 12 Dec 2022 15:13:34 -0600
Subject: [PATCH] Add core-runtime package

---
 packages/{meteor => core-runtime}/define-package.js |  0
 packages/core-runtime/package.js                    | 12 ++++++++++++
 packages/meteor/package.js                          |  2 +-
 tools/isobuild/bundler.js                           |  2 +-
 tools/isobuild/isopack.js                           |  2 +-
 5 files changed, 15 insertions(+), 3 deletions(-)
 rename packages/{meteor => core-runtime}/define-package.js (100%)
 create mode 100644 packages/core-runtime/package.js

diff --git a/packages/meteor/define-package.js b/packages/core-runtime/define-package.js
similarity index 100%
rename from packages/meteor/define-package.js
rename to packages/core-runtime/define-package.js
diff --git a/packages/core-runtime/package.js b/packages/core-runtime/package.js
new file mode 100644
index 0000000000..4cca1ca605
--- /dev/null
+++ b/packages/core-runtime/package.js
@@ -0,0 +1,12 @@
+Package.describe({
+  summary: "Core runtime to load packages and the app",
+  version: '1.0.0'
+});
+
+Package.onUse(function (api) {
+  // This package is linked differently since it sets up the runtime
+  // the linker expects to exist.
+  // Currently this package can not use any exports or ordered dependencies
+
+  api.addFiles('package-registry.js');
+});
diff --git a/packages/meteor/package.js b/packages/meteor/package.js
index 98e5453a3c..91592520d5 100644
--- a/packages/meteor/package.js
+++ b/packages/meteor/package.js
@@ -16,6 +16,7 @@ Npm.depends({
 
 Package.onUse(function (api) {
   api.use('isobuild:compiler-plugin@1.0.0');
+  api.use('core-runtime');
 
   api.export('Meteor');
 
@@ -28,7 +29,6 @@ Package.onUse(function (api) {
   api.export("meteorEnv");
 
   api.addFiles('cordova_environment.js', 'web.cordova');
-  api.addFiles('define-package.js', ['client', 'server']);
   api.addFiles('helpers.js', ['client', 'server']);
   api.addFiles('setimmediate.js', ['client', 'server']);
   api.addFiles('timers.js', ['client', 'server']);
diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js
index 1f36259ba8..fd2a85e4a2 100644
--- a/tools/isobuild/bundler.js
+++ b/tools/isobuild/bundler.js
@@ -170,7 +170,7 @@ var release = require('../packaging/release.js');
 import { loadIsopackage } from '../tool-env/isopackets.js';
 import { CORDOVA_PLATFORM_VERSIONS } from '../cordova';
 import { gzipSync } from "zlib";
-import { PackageRegistry } from "../../packages/meteor/define-package.js";
+import { PackageRegistry } from "../../packages/core-runtime/package-registry.js";
 import { optimisticLStatOrNull } from '../fs/optimistic';
 
 const SOURCE_URL_PREFIX = "meteor://\u{1f4bb}app";
diff --git a/tools/isobuild/isopack.js b/tools/isobuild/isopack.js
index ceb439f9a9..0b917317fe 100644
--- a/tools/isobuild/isopack.js
+++ b/tools/isobuild/isopack.js
@@ -1399,7 +1399,7 @@ Object.assign(Isopack.prototype, {
       'tools', 'examples', 'LICENSE.txt', 'LICENSES',
       'meteor', 'meteor.bat', 'scripts/admin/launch-meteor',
       'packages/package-version-parser/package-version-parser.js',
-      'packages/meteor/define-package.js',
+      'packages/core-runtime/package-registry.js',
       'packages/meteor/flush-buffers-on-exit-in-windows.js',
     );