Browse Source

js files: .packages => .packageDescriptors

Herbert Vojčík 6 years ago
parent
commit
942a30fa46

+ 2 - 2
external/amber-cli/src/AmberCli.js

@@ -2,8 +2,8 @@ define(["amber/boot", "amber_core/Kernel-Objects"], function($boot){"use strict"
 if(!("nilAsValue" in $boot))$boot.nilAsValue=$boot.nilAsReceiver;
 var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
 $core.addPackage("AmberCli");
-$core.packages["AmberCli"].innerEval = function (expr) { return eval(expr); };
-$core.packages["AmberCli"].transport = {"type":"amd","amdNamespace":"amber_cli"};
+($core.packageDescriptors||$core.packages)["AmberCli"].innerEval = function (expr) { return eval(expr); };
+($core.packageDescriptors||$core.packages)["AmberCli"].transport = {"type":"amd","amdNamespace":"amber_cli"};
 
 $core.addClass("AmberCli", $globals.Object, [], "AmberCli");
 //>>excludeStart("ide", pragmas.excludeIdeData);

+ 2 - 2
external/amber-dev/lib/NodeTestRunner.js

@@ -2,8 +2,8 @@ define(["amber/boot", "amber_core/Kernel-Objects"], function($boot){"use strict"
 if(!("nilAsValue" in $boot))$boot.nilAsValue=$boot.nilAsReceiver;
 var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
 $core.addPackage("NodeTestRunner");
-$core.packages["NodeTestRunner"].innerEval = function (expr) { return eval(expr); };
-$core.packages["NodeTestRunner"].transport = {"type":"amd","amdNamespace":"amber_devkit"};
+($core.packageDescriptors||$core.packages)["NodeTestRunner"].innerEval = function (expr) { return eval(expr); };
+($core.packageDescriptors||$core.packages)["NodeTestRunner"].transport = {"type":"amd","amdNamespace":"amber_devkit"};
 
 $core.addClass("NodeTestRunner", $globals.Object, [], "NodeTestRunner");
 

+ 2 - 2
src/Compiler-AST.js

@@ -2,8 +2,8 @@ define(["amber/boot", "amber_core/Kernel-Dag", "amber_core/Kernel-Methods"], fun
 if(!("nilAsValue" in $boot))$boot.nilAsValue=$boot.nilAsReceiver;
 var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
 $core.addPackage("Compiler-AST");
-$core.packages["Compiler-AST"].innerEval = function (expr) { return eval(expr); };
-$core.packages["Compiler-AST"].transport = {"type":"amd","amdNamespace":"amber_core"};
+($core.packageDescriptors||$core.packages)["Compiler-AST"].innerEval = function (expr) { return eval(expr); };
+($core.packageDescriptors||$core.packages)["Compiler-AST"].transport = {"type":"amd","amdNamespace":"amber_core"};
 
 $core.addClass("ASTNode", $globals.DagParentNode, ["parent", "position", "source", "shouldBeAliased"], "Compiler-AST");
 //>>excludeStart("ide", pragmas.excludeIdeData);

+ 2 - 2
src/Compiler-Core.js

@@ -2,8 +2,8 @@ define(["amber/boot", "amber_core/Kernel-Collections", "amber_core/Kernel-Except
 if(!("nilAsValue" in $boot))$boot.nilAsValue=$boot.nilAsReceiver;
 var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
 $core.addPackage("Compiler-Core");
-$core.packages["Compiler-Core"].innerEval = function (expr) { return eval(expr); };
-$core.packages["Compiler-Core"].transport = {"type":"amd","amdNamespace":"amber_core"};
+($core.packageDescriptors||$core.packages)["Compiler-Core"].innerEval = function (expr) { return eval(expr); };
+($core.packageDescriptors||$core.packages)["Compiler-Core"].transport = {"type":"amd","amdNamespace":"amber_core"};
 
 $core.addClass("AbstractCodeGenerator", $globals.Object, ["currentClass", "currentPackage", "source"], "Compiler-Core");
 //>>excludeStart("ide", pragmas.excludeIdeData);

+ 2 - 2
src/Compiler-IR.js

@@ -2,8 +2,8 @@ define(["amber/boot", "amber_core/Compiler-AST", "amber_core/Kernel-Dag", "amber
 if(!("nilAsValue" in $boot))$boot.nilAsValue=$boot.nilAsReceiver;
 var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
 $core.addPackage("Compiler-IR");
-$core.packages["Compiler-IR"].innerEval = function (expr) { return eval(expr); };
-$core.packages["Compiler-IR"].transport = {"type":"amd","amdNamespace":"amber_core"};
+($core.packageDescriptors||$core.packages)["Compiler-IR"].innerEval = function (expr) { return eval(expr); };
+($core.packageDescriptors||$core.packages)["Compiler-IR"].transport = {"type":"amd","amdNamespace":"amber_core"};
 
 $core.addClass("IRASTTranslator", $globals.NodeVisitor, ["source", "theClass", "method", "sequence", "nextAlias"], "Compiler-IR");
 //>>excludeStart("ide", pragmas.excludeIdeData);

+ 2 - 2
src/Compiler-Inlining.js

@@ -2,8 +2,8 @@ define(["amber/boot", "amber_core/Compiler-AST", "amber_core/Compiler-Core", "am
 if(!("nilAsValue" in $boot))$boot.nilAsValue=$boot.nilAsReceiver;
 var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
 $core.addPackage("Compiler-Inlining");
-$core.packages["Compiler-Inlining"].innerEval = function (expr) { return eval(expr); };
-$core.packages["Compiler-Inlining"].transport = {"type":"amd","amdNamespace":"amber_core"};
+($core.packageDescriptors||$core.packages)["Compiler-Inlining"].innerEval = function (expr) { return eval(expr); };
+($core.packageDescriptors||$core.packages)["Compiler-Inlining"].transport = {"type":"amd","amdNamespace":"amber_core"};
 
 $core.addClass("ASTPreInliner", $globals.NodeVisitor, [], "Compiler-Inlining");
 $core.addMethod(

+ 2 - 2
src/Compiler-Interpreter.js

@@ -2,8 +2,8 @@ define(["amber/boot", "amber_core/Compiler-AST", "amber_core/Compiler-Semantic",
 if(!("nilAsValue" in $boot))$boot.nilAsValue=$boot.nilAsReceiver;
 var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
 $core.addPackage("Compiler-Interpreter");
-$core.packages["Compiler-Interpreter"].innerEval = function (expr) { return eval(expr); };
-$core.packages["Compiler-Interpreter"].transport = {"type":"amd","amdNamespace":"amber_core"};
+($core.packageDescriptors||$core.packages)["Compiler-Interpreter"].innerEval = function (expr) { return eval(expr); };
+($core.packageDescriptors||$core.packages)["Compiler-Interpreter"].transport = {"type":"amd","amdNamespace":"amber_core"};
 
 $core.addClass("AIBlockClosure", $globals.BlockClosure, ["node", "outerContext"], "Compiler-Interpreter");
 //>>excludeStart("ide", pragmas.excludeIdeData);

+ 2 - 2
src/Compiler-Semantic.js

@@ -2,8 +2,8 @@ define(["amber/boot", "amber_core/Compiler-AST", "amber_core/Compiler-Core", "am
 if(!("nilAsValue" in $boot))$boot.nilAsValue=$boot.nilAsReceiver;
 var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
 $core.addPackage("Compiler-Semantic");
-$core.packages["Compiler-Semantic"].innerEval = function (expr) { return eval(expr); };
-$core.packages["Compiler-Semantic"].transport = {"type":"amd","amdNamespace":"amber_core"};
+($core.packageDescriptors||$core.packages)["Compiler-Semantic"].innerEval = function (expr) { return eval(expr); };
+($core.packageDescriptors||$core.packages)["Compiler-Semantic"].transport = {"type":"amd","amdNamespace":"amber_core"};
 
 $core.addClass("LexicalScope", $globals.Object, ["node", "instruction", "temps", "args", "outerScope", "blockIndex"], "Compiler-Semantic");
 //>>excludeStart("ide", pragmas.excludeIdeData);

+ 2 - 2
src/Compiler-Tests.js

@@ -2,8 +2,8 @@ define(["amber/boot", "amber_core/SUnit"], function($boot){"use strict";
 if(!("nilAsValue" in $boot))$boot.nilAsValue=$boot.nilAsReceiver;
 var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
 $core.addPackage("Compiler-Tests");
-$core.packages["Compiler-Tests"].innerEval = function (expr) { return eval(expr); };
-$core.packages["Compiler-Tests"].transport = {"type":"amd","amdNamespace":"amber_core"};
+($core.packageDescriptors||$core.packages)["Compiler-Tests"].innerEval = function (expr) { return eval(expr); };
+($core.packageDescriptors||$core.packages)["Compiler-Tests"].transport = {"type":"amd","amdNamespace":"amber_core"};
 
 $core.addClass("ASTParsingTest", $globals.TestCase, [], "Compiler-Tests");
 $core.addMethod(

+ 2 - 2
src/Kernel-Announcements.js

@@ -2,8 +2,8 @@ define(["amber/boot", "amber_core/Kernel-Objects"], function($boot){"use strict"
 if(!("nilAsValue" in $boot))$boot.nilAsValue=$boot.nilAsReceiver;
 var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
 $core.addPackage("Kernel-Announcements");
-$core.packages["Kernel-Announcements"].innerEval = function (expr) { return eval(expr); };
-$core.packages["Kernel-Announcements"].transport = {"type":"amd","amdNamespace":"amber_core"};
+($core.packageDescriptors||$core.packages)["Kernel-Announcements"].innerEval = function (expr) { return eval(expr); };
+($core.packageDescriptors||$core.packages)["Kernel-Announcements"].transport = {"type":"amd","amdNamespace":"amber_core"};
 
 $core.addClass("AnnouncementSubscription", $globals.Object, ["valuable", "announcementClass"], "Kernel-Announcements");
 //>>excludeStart("ide", pragmas.excludeIdeData);

+ 2 - 2
src/Kernel-Classes.js

@@ -2,8 +2,8 @@ define(["amber/boot", "amber_core/Kernel-Collections", "amber_core/Kernel-Helper
 if(!("nilAsValue" in $boot))$boot.nilAsValue=$boot.nilAsReceiver;
 var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
 $core.addPackage("Kernel-Classes");
-$core.packages["Kernel-Classes"].innerEval = function (expr) { return eval(expr); };
-$core.packages["Kernel-Classes"].transport = {"type":"amd","amdNamespace":"amber_core"};
+($core.packageDescriptors||$core.packages)["Kernel-Classes"].innerEval = function (expr) { return eval(expr); };
+($core.packageDescriptors||$core.packages)["Kernel-Classes"].transport = {"type":"amd","amdNamespace":"amber_core"};
 
 $core.addClass("Behavior", $globals.Object, ["organization"], "Kernel-Classes");
 //>>excludeStart("ide", pragmas.excludeIdeData);

+ 2 - 2
src/Kernel-Collections.js

@@ -2,8 +2,8 @@ define(["amber/boot", "amber_core/Kernel-Objects"], function($boot){"use strict"
 if(!("nilAsValue" in $boot))$boot.nilAsValue=$boot.nilAsReceiver;
 var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
 $core.addPackage("Kernel-Collections");
-$core.packages["Kernel-Collections"].innerEval = function (expr) { return eval(expr); };
-$core.packages["Kernel-Collections"].transport = {"type":"amd","amdNamespace":"amber_core"};
+($core.packageDescriptors||$core.packages)["Kernel-Collections"].innerEval = function (expr) { return eval(expr); };
+($core.packageDescriptors||$core.packages)["Kernel-Collections"].transport = {"type":"amd","amdNamespace":"amber_core"};
 
 $core.addClass("Association", $globals.Object, ["key", "value"], "Kernel-Collections");
 //>>excludeStart("ide", pragmas.excludeIdeData);

+ 2 - 2
src/Kernel-Dag.js

@@ -2,8 +2,8 @@ define(["amber/boot", "amber_core/Kernel-Objects"], function($boot){"use strict"
 if(!("nilAsValue" in $boot))$boot.nilAsValue=$boot.nilAsReceiver;
 var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
 $core.addPackage("Kernel-Dag");
-$core.packages["Kernel-Dag"].innerEval = function (expr) { return eval(expr); };
-$core.packages["Kernel-Dag"].transport = {"type":"amd","amdNamespace":"amber_core"};
+($core.packageDescriptors||$core.packages)["Kernel-Dag"].innerEval = function (expr) { return eval(expr); };
+($core.packageDescriptors||$core.packages)["Kernel-Dag"].transport = {"type":"amd","amdNamespace":"amber_core"};
 
 $core.addClass("AbstractDagVisitor", $globals.Object, [], "Kernel-Dag");
 //>>excludeStart("ide", pragmas.excludeIdeData);

+ 2 - 2
src/Kernel-Exceptions.js

@@ -2,8 +2,8 @@ define(["amber/boot", "amber_core/Kernel-Objects"], function($boot){"use strict"
 if(!("nilAsValue" in $boot))$boot.nilAsValue=$boot.nilAsReceiver;
 var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
 $core.addPackage("Kernel-Exceptions");
-$core.packages["Kernel-Exceptions"].innerEval = function (expr) { return eval(expr); };
-$core.packages["Kernel-Exceptions"].transport = {"type":"amd","amdNamespace":"amber_core"};
+($core.packageDescriptors||$core.packages)["Kernel-Exceptions"].innerEval = function (expr) { return eval(expr); };
+($core.packageDescriptors||$core.packages)["Kernel-Exceptions"].transport = {"type":"amd","amdNamespace":"amber_core"};
 
 $core.addClass("Error", $globals.Object, ["messageText"], "Kernel-Exceptions");
 //>>excludeStart("ide", pragmas.excludeIdeData);

+ 2 - 2
src/Kernel-Helpers.js

@@ -2,8 +2,8 @@ define(["amber/boot"], function($boot){"use strict";
 if(!("nilAsValue" in $boot))$boot.nilAsValue=$boot.nilAsReceiver;
 var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
 $core.addPackage("Kernel-Helpers");
-$core.packages["Kernel-Helpers"].innerEval = function (expr) { return eval(expr); };
-$core.packages["Kernel-Helpers"].transport = {"type":"amd","amdNamespace":"amber_core"};
+($core.packageDescriptors||$core.packages)["Kernel-Helpers"].innerEval = function (expr) { return eval(expr); };
+($core.packageDescriptors||$core.packages)["Kernel-Helpers"].transport = {"type":"amd","amdNamespace":"amber_core"};
 
 $core.addTrait("TSubclassable", "Kernel-Helpers");
 $core.addMethod(

+ 2 - 2
src/Kernel-Infrastructure.js

@@ -2,8 +2,8 @@ define(["amber/boot", "amber_core/Kernel-Collections", "amber_core/Kernel-Except
 if(!("nilAsValue" in $boot))$boot.nilAsValue=$boot.nilAsReceiver;
 var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
 $core.addPackage("Kernel-Infrastructure");
-$core.packages["Kernel-Infrastructure"].innerEval = function (expr) { return eval(expr); };
-$core.packages["Kernel-Infrastructure"].transport = {"type":"amd","amdNamespace":"amber_core"};
+($core.packageDescriptors||$core.packages)["Kernel-Infrastructure"].innerEval = function (expr) { return eval(expr); };
+($core.packageDescriptors||$core.packages)["Kernel-Infrastructure"].transport = {"type":"amd","amdNamespace":"amber_core"};
 
 $core.addClass("AmberBootstrapInitialization", $globals.Object, [], "Kernel-Infrastructure");
 

+ 2 - 2
src/Kernel-Methods.js

@@ -2,8 +2,8 @@ define(["amber/boot", "amber_core/Kernel-Objects"], function($boot){"use strict"
 if(!("nilAsValue" in $boot))$boot.nilAsValue=$boot.nilAsReceiver;
 var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
 $core.addPackage("Kernel-Methods");
-$core.packages["Kernel-Methods"].innerEval = function (expr) { return eval(expr); };
-$core.packages["Kernel-Methods"].transport = {"type":"amd","amdNamespace":"amber_core"};
+($core.packageDescriptors||$core.packages)["Kernel-Methods"].innerEval = function (expr) { return eval(expr); };
+($core.packageDescriptors||$core.packages)["Kernel-Methods"].transport = {"type":"amd","amdNamespace":"amber_core"};
 
 $core.addClass("BlockClosure", $globals.Object, [], "Kernel-Methods");
 //>>excludeStart("ide", pragmas.excludeIdeData);

+ 2 - 2
src/Kernel-Objects.js

@@ -2,8 +2,8 @@ define(["amber/boot", "amber_core/Kernel-Helpers"], function($boot){"use strict"
 if(!("nilAsValue" in $boot))$boot.nilAsValue=$boot.nilAsReceiver;
 var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
 $core.addPackage("Kernel-Objects");
-$core.packages["Kernel-Objects"].innerEval = function (expr) { return eval(expr); };
-$core.packages["Kernel-Objects"].transport = {"type":"amd","amdNamespace":"amber_core"};
+($core.packageDescriptors||$core.packages)["Kernel-Objects"].innerEval = function (expr) { return eval(expr); };
+($core.packageDescriptors||$core.packages)["Kernel-Objects"].transport = {"type":"amd","amdNamespace":"amber_core"};
 
 $core.addClass("ProtoObject", null, [], "Kernel-Objects");
 //>>excludeStart("ide", pragmas.excludeIdeData);

+ 2 - 2
src/Kernel-Promises.js

@@ -2,8 +2,8 @@ define(["amber/boot", "amber_core/Kernel-Objects"], function($boot){"use strict"
 if(!("nilAsValue" in $boot))$boot.nilAsValue=$boot.nilAsReceiver;
 var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
 $core.addPackage("Kernel-Promises");
-$core.packages["Kernel-Promises"].innerEval = function (expr) { return eval(expr); };
-$core.packages["Kernel-Promises"].transport = {"type":"amd","amdNamespace":"amber_core"};
+($core.packageDescriptors||$core.packages)["Kernel-Promises"].innerEval = function (expr) { return eval(expr); };
+($core.packageDescriptors||$core.packages)["Kernel-Promises"].transport = {"type":"amd","amdNamespace":"amber_core"};
 
 $core.addClass("Promise", $globals.Object, [], "Kernel-Promises");
 

+ 2 - 2
src/Kernel-Tests.js

@@ -2,8 +2,8 @@ define(["amber/boot", "amber_core/Kernel-Objects", "amber_core/SUnit"], function
 if(!("nilAsValue" in $boot))$boot.nilAsValue=$boot.nilAsReceiver;
 var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
 $core.addPackage("Kernel-Tests");
-$core.packages["Kernel-Tests"].innerEval = function (expr) { return eval(expr); };
-$core.packages["Kernel-Tests"].transport = {"type":"amd","amdNamespace":"amber_core"};
+($core.packageDescriptors||$core.packages)["Kernel-Tests"].innerEval = function (expr) { return eval(expr); };
+($core.packageDescriptors||$core.packages)["Kernel-Tests"].transport = {"type":"amd","amdNamespace":"amber_core"};
 
 $core.addClass("AnnouncementSubscriptionTest", $globals.TestCase, [], "Kernel-Tests");
 $core.addMethod(

+ 2 - 2
src/Platform-Browser.js

@@ -2,8 +2,8 @@ define(["amber/boot", "amber_core/Kernel-Objects"], function($boot){"use strict"
 if(!("nilAsValue" in $boot))$boot.nilAsValue=$boot.nilAsReceiver;
 var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
 $core.addPackage("Platform-Browser");
-$core.packages["Platform-Browser"].innerEval = function (expr) { return eval(expr); };
-$core.packages["Platform-Browser"].transport = {"type":"amd","amdNamespace":"amber_core"};
+($core.packageDescriptors||$core.packages)["Platform-Browser"].innerEval = function (expr) { return eval(expr); };
+($core.packageDescriptors||$core.packages)["Platform-Browser"].transport = {"type":"amd","amdNamespace":"amber_core"};
 
 $core.addClass("BrowserPlatform", $globals.Object, [], "Platform-Browser");
 //>>excludeStart("ide", pragmas.excludeIdeData);

+ 2 - 2
src/Platform-DOM-Tests.js

@@ -2,8 +2,8 @@ define(["amber/boot", "amber_core/SUnit"], function($boot){"use strict";
 if(!("nilAsValue" in $boot))$boot.nilAsValue=$boot.nilAsReceiver;
 var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
 $core.addPackage("Platform-DOM-Tests");
-$core.packages["Platform-DOM-Tests"].innerEval = function (expr) { return eval(expr); };
-$core.packages["Platform-DOM-Tests"].transport = {"type":"amd","amdNamespace":"amber_core"};
+($core.packageDescriptors||$core.packages)["Platform-DOM-Tests"].innerEval = function (expr) { return eval(expr); };
+($core.packageDescriptors||$core.packages)["Platform-DOM-Tests"].transport = {"type":"amd","amdNamespace":"amber_core"};
 
 $core.addClass("PlatformDomTest", $globals.TestCase, ["fixtureDiv"], "Platform-DOM-Tests");
 $core.addMethod(

+ 2 - 2
src/Platform-DOM.js

@@ -2,8 +2,8 @@ define(["amber/boot", "amber_core/Kernel-Collections", "amber_core/Kernel-Infras
 if(!("nilAsValue" in $boot))$boot.nilAsValue=$boot.nilAsReceiver;
 var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
 $core.addPackage("Platform-DOM");
-$core.packages["Platform-DOM"].innerEval = function (expr) { return eval(expr); };
-$core.packages["Platform-DOM"].transport = {"type":"amd","amdNamespace":"amber_core"};
+($core.packageDescriptors||$core.packages)["Platform-DOM"].innerEval = function (expr) { return eval(expr); };
+($core.packageDescriptors||$core.packages)["Platform-DOM"].transport = {"type":"amd","amdNamespace":"amber_core"};
 
 $core.addClass("PlatformDom", $globals.Object, [], "Platform-DOM");
 

+ 8 - 8
src/Platform-ImportExport.js

@@ -2,8 +2,8 @@ define(["amber/boot", "amber_core/Kernel-Classes", "amber_core/Kernel-Exceptions
 if(!("nilAsValue" in $boot))$boot.nilAsValue=$boot.nilAsReceiver;
 var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
 $core.addPackage("Platform-ImportExport");
-$core.packages["Platform-ImportExport"].innerEval = function (expr) { return eval(expr); };
-$core.packages["Platform-ImportExport"].transport = {"type":"amd","amdNamespace":"amber_core"};
+($core.packageDescriptors||$core.packages)["Platform-ImportExport"].innerEval = function (expr) { return eval(expr); };
+($core.packageDescriptors||$core.packages)["Platform-ImportExport"].transport = {"type":"amd","amdNamespace":"amber_core"};
 
 $core.addClass("AbstractExporter", $globals.Object, [], "Platform-ImportExport");
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -1504,7 +1504,7 @@ var self=this,$self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv(aStream)._write_(["$core.packages[",$recv($recv(aPackage)._name())._asJavaScriptSource(),"].innerEval = ","function (expr) { return eval(expr); }",";"]);
+$recv(aStream)._write_(["($core.packageDescriptors||$core.packages)[",$recv($recv(aPackage)._name())._asJavaScriptSource(),"].innerEval = ","function (expr) { return eval(expr); }",";"]);
 $recv(aStream)._lf();
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -1513,7 +1513,7 @@ return self;
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["aPackage", "aStream"],
-source: "exportPackageContextOf: aPackage on: aStream\x0a\x09aStream\x0a\x09\x09write: {\x0a\x09\x09\x09'$core.packages['.\x0a\x09\x09\x09aPackage name asJavaScriptSource.\x0a\x09\x09\x09'].innerEval = '.\x0a\x09\x09\x09'function (expr) { return eval(expr); }'.\x0a\x09\x09\x09';' };\x0a\x09\x09lf",
+source: "exportPackageContextOf: aPackage on: aStream\x0a\x09aStream\x0a\x09\x09write: {\x0a\x09\x09\x09'($core.packageDescriptors||$core.packages)['.\x0a\x09\x09\x09aPackage name asJavaScriptSource.\x0a\x09\x09\x09'].innerEval = '.\x0a\x09\x09\x09'function (expr) { return eval(expr); }'.\x0a\x09\x09\x09';' };\x0a\x09\x09lf",
 referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: ["write:", "asJavaScriptSource", "name", "lf"]
@@ -1587,7 +1587,7 @@ $2=$recv($recv(aPackage)._name())._asJavaScriptSource();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["asJavaScriptSource"]=1;
 //>>excludeEnd("ctx");
-$1=["$core.packages[",$2,"].imports = ",$recv(imports)._asJavaScriptSource(),";"];
+$1=["($core.packageDescriptors||$core.packages)[",$2,"].imports = ",$recv(imports)._asJavaScriptSource(),";"];
 $recv(aStream)._write_($1);
 return $recv(aStream)._lf();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -1601,7 +1601,7 @@ return self;
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["aPackage", "aStream"],
-source: "exportPackageImportsOf: aPackage on: aStream\x0a\x09aPackage importsAsJson ifNotEmpty: [ :imports |\x0a\x09\x09aStream\x0a\x09\x09\x09write: {\x0a\x09\x09\x09\x09'$core.packages['.\x0a\x09\x09\x09\x09aPackage name asJavaScriptSource.\x0a\x09\x09\x09\x09'].imports = '.\x0a\x09\x09\x09\x09imports asJavaScriptSource.\x0a\x09\x09\x09\x09';' };\x0a\x09\x09\x09lf ]",
+source: "exportPackageImportsOf: aPackage on: aStream\x0a\x09aPackage importsAsJson ifNotEmpty: [ :imports |\x0a\x09\x09aStream\x0a\x09\x09\x09write: {\x0a\x09\x09\x09\x09'($core.packageDescriptors||$core.packages)['.\x0a\x09\x09\x09\x09aPackage name asJavaScriptSource.\x0a\x09\x09\x09\x09'].imports = '.\x0a\x09\x09\x09\x09imports asJavaScriptSource.\x0a\x09\x09\x09\x09';' };\x0a\x09\x09\x09lf ]",
 referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: ["ifNotEmpty:", "importsAsJson", "write:", "asJavaScriptSource", "name", "lf"]
@@ -1682,7 +1682,7 @@ var self=this,$self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv(aStream)._write_(["$core.packages[",$recv($recv(aPackage)._name())._asJavaScriptSource(),"].transport = ",$recv($recv(aPackage)._transport())._asJSONString(),";"]);
+$recv(aStream)._write_(["($core.packageDescriptors||$core.packages)[",$recv($recv(aPackage)._name())._asJavaScriptSource(),"].transport = ",$recv($recv(aPackage)._transport())._asJSONString(),";"]);
 $recv(aStream)._lf();
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -1691,7 +1691,7 @@ return self;
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["aPackage", "aStream"],
-source: "exportPackageTransportOf: aPackage on: aStream\x0a\x09aStream\x0a\x09\x09write: {\x0a\x09\x09\x09'$core.packages['.\x0a\x09\x09\x09aPackage name asJavaScriptSource.\x0a\x09\x09\x09'].transport = '.\x0a\x09\x09\x09aPackage transport asJSONString.\x0a\x09\x09\x09';' };\x0a\x09\x09lf",
+source: "exportPackageTransportOf: aPackage on: aStream\x0a\x09aStream\x0a\x09\x09write: {\x0a\x09\x09\x09'($core.packageDescriptors||$core.packages)['.\x0a\x09\x09\x09aPackage name asJavaScriptSource.\x0a\x09\x09\x09'].transport = '.\x0a\x09\x09\x09aPackage transport asJSONString.\x0a\x09\x09\x09';' };\x0a\x09\x09lf",
 referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: ["write:", "asJavaScriptSource", "name", "asJSONString", "transport", "lf"]

+ 3 - 3
src/Platform-ImportExport.st

@@ -380,7 +380,7 @@ exportPackageBodyBlockPrologueOf: aPackage on: aStream
 exportPackageContextOf: aPackage on: aStream
 	aStream
 		write: {
-			'$core.packages['.
+			'($core.packageDescriptors||$core.packages)['.
 			aPackage name asJavaScriptSource.
 			'].innerEval = '.
 			'function (expr) { return eval(expr); }'.
@@ -402,7 +402,7 @@ exportPackageImportsOf: aPackage on: aStream
 	aPackage importsAsJson ifNotEmpty: [ :imports |
 		aStream
 			write: {
-				'$core.packages['.
+				'($core.packageDescriptors||$core.packages)['.
 				aPackage name asJavaScriptSource.
 				'].imports = '.
 				imports asJavaScriptSource.
@@ -423,7 +423,7 @@ exportPackageTraitCompositionsOf: aPackage on: aStream
 exportPackageTransportOf: aPackage on: aStream
 	aStream
 		write: {
-			'$core.packages['.
+			'($core.packageDescriptors||$core.packages)['.
 			aPackage name asJavaScriptSource.
 			'].transport = '.
 			aPackage transport asJSONString.

+ 2 - 2
src/Platform-Node.js

@@ -2,8 +2,8 @@ define(["amber/boot", "amber_core/Kernel-Objects"], function($boot){"use strict"
 if(!("nilAsValue" in $boot))$boot.nilAsValue=$boot.nilAsReceiver;
 var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
 $core.addPackage("Platform-Node");
-$core.packages["Platform-Node"].innerEval = function (expr) { return eval(expr); };
-$core.packages["Platform-Node"].transport = {"type":"amd","amdNamespace":"amber_core"};
+($core.packageDescriptors||$core.packages)["Platform-Node"].innerEval = function (expr) { return eval(expr); };
+($core.packageDescriptors||$core.packages)["Platform-Node"].transport = {"type":"amd","amdNamespace":"amber_core"};
 
 $core.addClass("NodePlatform", $globals.Object, [], "Platform-Node");
 //>>excludeStart("ide", pragmas.excludeIdeData);

+ 2 - 2
src/Platform-Services.js

@@ -2,8 +2,8 @@ define(["amber/boot", "amber_core/Kernel-Collections", "amber_core/Kernel-Infras
 if(!("nilAsValue" in $boot))$boot.nilAsValue=$boot.nilAsReceiver;
 var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
 $core.addPackage("Platform-Services");
-$core.packages["Platform-Services"].innerEval = function (expr) { return eval(expr); };
-$core.packages["Platform-Services"].transport = {"type":"amd","amdNamespace":"amber_core"};
+($core.packageDescriptors||$core.packages)["Platform-Services"].innerEval = function (expr) { return eval(expr); };
+($core.packageDescriptors||$core.packages)["Platform-Services"].transport = {"type":"amd","amdNamespace":"amber_core"};
 
 $core.addClass("ConsoleErrorHandler", $globals.Object, [], "Platform-Services");
 //>>excludeStart("ide", pragmas.excludeIdeData);

+ 2 - 2
src/SUnit-Tests.js

@@ -2,8 +2,8 @@ define(["amber/boot", "amber_core/SUnit"], function($boot){"use strict";
 if(!("nilAsValue" in $boot))$boot.nilAsValue=$boot.nilAsReceiver;
 var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
 $core.addPackage("SUnit-Tests");
-$core.packages["SUnit-Tests"].innerEval = function (expr) { return eval(expr); };
-$core.packages["SUnit-Tests"].transport = {"type":"amd","amdNamespace":"amber_core"};
+($core.packageDescriptors||$core.packages)["SUnit-Tests"].innerEval = function (expr) { return eval(expr); };
+($core.packageDescriptors||$core.packages)["SUnit-Tests"].transport = {"type":"amd","amdNamespace":"amber_core"};
 
 $core.addClass("ExampleSetTest", $globals.TestCase, ["empty", "full"], "SUnit-Tests");
 //>>excludeStart("ide", pragmas.excludeIdeData);

+ 2 - 2
src/SUnit.js

@@ -2,8 +2,8 @@ define(["amber/boot", "amber_core/Kernel-Classes", "amber_core/Kernel-Exceptions
 if(!("nilAsValue" in $boot))$boot.nilAsValue=$boot.nilAsReceiver;
 var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
 $core.addPackage("SUnit");
-$core.packages["SUnit"].innerEval = function (expr) { return eval(expr); };
-$core.packages["SUnit"].transport = {"type":"amd","amdNamespace":"amber_core"};
+($core.packageDescriptors||$core.packages)["SUnit"].innerEval = function (expr) { return eval(expr); };
+($core.packageDescriptors||$core.packages)["SUnit"].transport = {"type":"amd","amdNamespace":"amber_core"};
 
 $core.addClass("ResultAnnouncement", $globals.Object, ["result"], "SUnit");
 //>>excludeStart("ide", pragmas.excludeIdeData);