Browse Source

libs: amber_core => amber/core in deps

Herby Vojčík 5 years ago
parent
commit
41e745f01a

+ 2 - 2
Gruntfile.js

@@ -75,7 +75,7 @@ module.exports = function (grunt) {
                     // list all tests in dependency order
                     'src/Helios-Browser-Tests.st', 'src/Helios-Workspace-Tests.st', 'src/Helios-SUnit-Tests.st'
                 ],
-                libraries: ['amber_core/SUnit', 'amber/web/Web'],
+                libraries: ['amber/core/SUnit', 'amber/web/Web'],
                 amd_namespace: 'helios',
                 jsGlobals: ['navigator']
             }
@@ -93,7 +93,7 @@ module.exports = function (grunt) {
                     rawText: {
                         "jquery": "/* do not load in node test runner */",
                         "__app__": "(" + function () {
-                            define(["amber/deploy", "helios/all", "amber_core/Platform-Node", "amber_devkit/NodeTestRunner"], function (amber) {
+                            define(["amber/deploy", "helios/all", "amber/core/Platform-Node", "amber_devkit/NodeTestRunner"], function (amber) {
                                 amber.initialize().then(function () {
                                     amber.globals.NodeTestRunner._main();
                                 });

+ 1 - 1
index.html

@@ -25,7 +25,7 @@
                 require.callback = function () {
                     require(["amber/es6-promise"], function (promiseLib) {
                         promiseLib.polyfill();
-                        require(["helios/app", "amber_core/Platform-Browser"], function (amber) {
+                        require(["helios/app", "amber/core/Platform-Browser"], function (amber) {
                             amber.initialize({'transport.defaultAmdNamespace': "helios"}).then(function () {
                                 amber.globals.HLManager._setup();
                             });

+ 1 - 1
package.json

@@ -28,7 +28,7 @@
   },
   "dependencies": {
     "@ambers/contrib-web": ">=0.6.0",
-    "@ambers/lang": ">=0.22.6",
+    "@ambers/lang": ">0.22.6",
     "bootstrap": "^3.3.7",
     "codemirror": ">=5.39.2 <5.43.0",
     "es6-promise": "^4.2.4",

+ 1 - 1
src/Helios-Announcements.js

@@ -1,4 +1,4 @@
-define(["amber/boot", "require", "amber_core/Kernel-Objects"], function($boot,requirejs){"use strict";
+define(["amber/boot", "require", "amber/core/Kernel-Objects"], function($boot,requirejs){"use strict";
 var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
 var $pkg = $core.addPackage("Helios-Announcements");
 $pkg.innerEval = function (expr) { return eval(expr); };

+ 1 - 1
src/Helios-Browser-Tests.js

@@ -1,4 +1,4 @@
-define(["amber/boot", "require", "amber_core/SUnit"], function($boot,requirejs){"use strict";
+define(["amber/boot", "require", "amber/core/SUnit"], function($boot,requirejs){"use strict";
 var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
 var $pkg = $core.addPackage("Helios-Browser-Tests");
 $pkg.innerEval = function (expr) { return eval(expr); };

+ 1 - 1
src/Helios-Browser.js

@@ -1,4 +1,4 @@
-define(["amber/boot", "require", "amber_core/Kernel-Objects", "helios/Helios-Core"], function($boot,requirejs){"use strict";
+define(["amber/boot", "require", "amber/core/Kernel-Objects", "helios/Helios-Core"], function($boot,requirejs){"use strict";
 var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
 var $pkg = $core.addPackage("Helios-Browser");
 $pkg.innerEval = function (expr) { return eval(expr); };

+ 1 - 1
src/Helios-Commands-Core.js

@@ -1,4 +1,4 @@
-define(["amber/boot", "require", "amber_core/Kernel-Objects"], function($boot,requirejs){"use strict";
+define(["amber/boot", "require", "amber/core/Kernel-Objects"], function($boot,requirejs){"use strict";
 var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
 var $pkg = $core.addPackage("Helios-Commands-Core");
 $pkg.innerEval = function (expr) { return eval(expr); };

+ 1 - 1
src/Helios-Core.js

@@ -1,4 +1,4 @@
-define(["amber/boot", "require", "amber/web/Web", "amber_core/Kernel-Objects"], function($boot,requirejs){"use strict";
+define(["amber/boot", "require", "amber/core/Kernel-Objects", "amber/web/Web"], function($boot,requirejs){"use strict";
 var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
 var $pkg = $core.addPackage("Helios-Core");
 $pkg.innerEval = function (expr) { return eval(expr); };

+ 3 - 3
src/Helios-Debugger.js

@@ -1,10 +1,10 @@
-define(["amber/boot", "require", "amber_core/Kernel-Objects", "helios/Helios-Core", "helios/Helios-Workspace"], function($boot,requirejs){"use strict";
+define(["amber/boot", "require", "amber/core/Kernel-Objects", "helios/Helios-Core", "helios/Helios-Workspace"], function($boot,requirejs){"use strict";
 var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
 var $pkg = $core.addPackage("Helios-Debugger");
 $pkg.innerEval = function (expr) { return eval(expr); };
-$pkg.imports = ["amber_core/Compiler-Interpreter"];
+$pkg.imports = ["amber/core/Compiler-Interpreter"];
 //>>excludeStart("imports", pragmas.excludeImports);
-$pkg.isReady = new Promise(function (resolve, reject) { requirejs(["amber_core/Compiler-Interpreter"], function () {resolve();}, reject); });
+$pkg.isReady = new Promise(function (resolve, reject) { requirejs(["amber/core/Compiler-Interpreter"], function () {resolve();}, reject); });
 //>>excludeEnd("imports");
 $pkg.transport = {"type":"amd","amdNamespace":"helios"};
 

+ 1 - 1
src/Helios-Debugger.st

@@ -1,5 +1,5 @@
 Smalltalk createPackage: 'Helios-Debugger'!
-(Smalltalk packageAt: 'Helios-Debugger' ifAbsent: [ self error: 'Package not created: Helios-Debugger' ]) imports: {'amber_core/Compiler-Interpreter'}!
+(Smalltalk packageAt: 'Helios-Debugger' ifAbsent: [ self error: 'Package not created: Helios-Debugger' ]) imports: {'amber/core/Compiler-Interpreter'}!
 Object subclass: #HLContextInspectorDecorator
 	instanceVariableNames: 'context'
 	package: 'Helios-Debugger'!

+ 1 - 1
src/Helios-Exceptions.js

@@ -1,4 +1,4 @@
-define(["amber/boot", "require", "amber_core/Kernel-Exceptions"], function($boot,requirejs){"use strict";
+define(["amber/boot", "require", "amber/core/Kernel-Exceptions"], function($boot,requirejs){"use strict";
 var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
 var $pkg = $core.addPackage("Helios-Exceptions");
 $pkg.innerEval = function (expr) { return eval(expr); };

+ 1 - 1
src/Helios-Helpers.js

@@ -1,4 +1,4 @@
-define(["amber/boot", "require", "amber_core/Kernel-Objects"], function($boot,requirejs){"use strict";
+define(["amber/boot", "require", "amber/core/Kernel-Objects"], function($boot,requirejs){"use strict";
 var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
 var $pkg = $core.addPackage("Helios-Helpers");
 $pkg.innerEval = function (expr) { return eval(expr); };

+ 1 - 1
src/Helios-KeyBindings.js

@@ -1,4 +1,4 @@
-define(["amber/boot", "require", "amber_core/Kernel-Objects", "helios/Helios-Core"], function($boot,requirejs){"use strict";
+define(["amber/boot", "require", "amber/core/Kernel-Objects", "helios/Helios-Core"], function($boot,requirejs){"use strict";
 var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
 var $pkg = $core.addPackage("Helios-KeyBindings");
 $pkg.innerEval = function (expr) { return eval(expr); };

+ 1 - 1
src/Helios-Layout.js

@@ -1,4 +1,4 @@
-define(["amber/boot", "require", "amber/web/Web", "amber_core/Kernel-Objects", "helios/Helios-Core"], function($boot,requirejs){"use strict";
+define(["amber/boot", "require", "amber/core/Kernel-Objects", "amber/web/Web", "helios/Helios-Core"], function($boot,requirejs){"use strict";
 var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
 var $pkg = $core.addPackage("Helios-Layout");
 $pkg.innerEval = function (expr) { return eval(expr); };

+ 1 - 1
src/Helios-References.js

@@ -1,4 +1,4 @@
-define(["amber/boot", "require", "amber_core/Kernel-Objects", "helios/Helios-Core"], function($boot,requirejs){"use strict";
+define(["amber/boot", "require", "amber/core/Kernel-Objects", "helios/Helios-Core"], function($boot,requirejs){"use strict";
 var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
 var $pkg = $core.addPackage("Helios-References");
 $pkg.innerEval = function (expr) { return eval(expr); };

+ 1 - 1
src/Helios-SUnit-Tests.js

@@ -1,4 +1,4 @@
-define(["amber/boot", "require", "amber_core/SUnit"], function($boot,requirejs){"use strict";
+define(["amber/boot", "require", "amber/core/SUnit"], function($boot,requirejs){"use strict";
 var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
 var $pkg = $core.addPackage("Helios-SUnit-Tests");
 $pkg.innerEval = function (expr) { return eval(expr); };

+ 1 - 1
src/Helios-Transcript.js

@@ -1,4 +1,4 @@
-define(["amber/boot", "require", "amber_core/Kernel-Objects", "helios/Helios-Core"], function($boot,requirejs){"use strict";
+define(["amber/boot", "require", "amber/core/Kernel-Objects", "helios/Helios-Core"], function($boot,requirejs){"use strict";
 var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
 var $pkg = $core.addPackage("Helios-Transcript");
 $pkg.innerEval = function (expr) { return eval(expr); };

+ 1 - 1
src/Helios-Workspace-Tests.js

@@ -1,4 +1,4 @@
-define(["amber/boot", "require", "amber_core/SUnit"], function($boot,requirejs){"use strict";
+define(["amber/boot", "require", "amber/core/SUnit"], function($boot,requirejs){"use strict";
 var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
 var $pkg = $core.addPackage("Helios-Workspace-Tests");
 $pkg.innerEval = function (expr) { return eval(expr); };

+ 1 - 1
src/Helios-Workspace.js

@@ -1,4 +1,4 @@
-define(["amber/boot", "require", "amber_core/Kernel-Objects", "helios/Helios-Core"], function($boot,requirejs){"use strict";
+define(["amber/boot", "require", "amber/core/Kernel-Objects", "helios/Helios-Core"], function($boot,requirejs){"use strict";
 var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
 var $pkg = $core.addPackage("Helios-Workspace");
 $pkg.innerEval = function (expr) { return eval(expr); };