smalltalk and nil really in files, dependencies included

js/lib/amber-core-deploy.js

@@ -1,4 +1,5 @@
 define([
+    'jquery',
     'amber/Kernel-Objects.deploy',
     'amber/Kernel-Classes.deploy',
     'amber/Kernel-Methods.deploy',

js/lib/amber-full-devel.js

@@ -1,4 +1,5 @@
 define([
+    'jquery',
     'jquery-ui',
     'jQuery/jquery.textarea',
     'CodeMirror/codemirror',

js/lib/amber-in-browser.js

@@ -21,8 +21,7 @@ require = function (require) {
         paths: {
             'amber': '..',
             'jquery': 'jQuery/jquery-1.8.2.min',
-            'jquery-ui': 'jQuery/jquery-ui-1.8.16.custom.min',
-            'smalltalk': '../boot'
+            'jquery-ui': 'jQuery/jquery-ui-1.8.16.custom.min'
         },
         map: {
             '*': {
@@ -30,23 +29,118 @@ require = function (require) {
             }
         },
         shim: {
+            'jquery-ui': {
+                deps: [ 'jquery' ]
+            },
+            'jQuery/jquery.textarea': {
+                deps: [ 'jquery', 'jquery-ui' ]
+            },
             'CodeMirror/smalltalk': {
-                deps: [ 'CodeMirror/codemirror']
+                deps: [ 'CodeMirror/codemirror' ]
             },
             'CodeMirror/addon/hint/show-hint': {
-                deps: [ 'CodeMirror/codemirror']
+                deps: [ 'CodeMirror/codemirror' ]
+            },
+            'amber/boot': {
+                deps: [ 'es5-shim-2.0.2/es5-shim.min', 'es5-shim-2.0.2/es5-sham.min' ]
+            },
+            'amber/Kernel-Objects.deploy': {
+                deps: [ 'smalltalk', 'nil' ]
+            },
+            'amber/Kernel-Classes.deploy': {
+                deps: [ 'amber/Kernel-Objects.deploy' ]
+            },
+            'amber/Kernel-Methods.deploy': {
+                deps: [ 'amber/Kernel-Objects.deploy' ]
+            },
+            'amber/Kernel-Collections.deploy': {
+                deps: [ 'amber/Kernel-Objects.deploy' ]
+            },
+            'amber/Kernel-Exceptions.deploy': {
+                deps: [ 'amber/Kernel-Objects.deploy' ]
+            },
+            'amber/Kernel-Transcript.deploy': {
+                deps: [ 'amber/Kernel-Objects.deploy' ]
+            },
+            'amber/Kernel-Announcements.deploy': {
+                deps: [ 'amber/Kernel-Objects.deploy' ]
+            },
+            'amber/Canvas.deploy': {
+                deps: [ 'amber/Kernel-Objects.deploy' ]
+            },
+             'amber/Kernel-Objects': {
+                deps: [ 'smalltalk', 'nil' ]
+            },
+            'amber/Kernel-Classes': {
+                deps: [ 'amber/Kernel-Objects' ]
+            },
+            'amber/Kernel-Methods': {
+                deps: [ 'amber/Kernel-Objects' ]
+            },
+            'amber/Kernel-Collections': {
+                deps: [ 'amber/Kernel-Objects' ]
+            },
+            'amber/Kernel-Exceptions': {
+                deps: [ 'amber/Kernel-Objects' ]
+            },
+            'amber/Kernel-Transcript': {
+                deps: [ 'amber/Kernel-Objects' ]
             },
-            'smalltalk': {
-                exports: 'smalltalk'
+            'amber/Kernel-Announcements': {
+                deps: [ 'amber/Kernel-Objects' ]
             },
-            'nil': {
-                deps: [ 'smalltalk' ],
-                exports: 'nil'
+            'amber/Canvas': {
+                deps: [ 'amber/Kernel-Objects' ]
+            },
+            'amber/SUnit': {
+                deps: [ 'amber/Kernel-Objects' ]
+            },
+            'amber/Importer-Exporter': {
+                deps: [ 'amber/Kernel-Objects' ]
+            },
+            'amber/Compiler-Exceptions': {
+                deps: [ 'amber/Kernel-Exceptions' ]
+            },
+            'amber/Compiler-Core': {
+                deps: [ 'amber/Kernel-Objects' ]
+            },
+            'amber/Compiler-AST': {
+                deps: [ 'amber/Compiler-Core' ]
+            },
+            'amber/Compiler-Semantic': {
+                deps: [ 'amber/Compiler-Core' ]
+            },
+            'amber/Compiler-IR': {
+                deps: [ 'amber/Compiler-Core' ]
+            },
+            'amber/Compiler-Inlining': {
+                deps: [ 'amber/Compiler-IR' ]
+            },
+            'amber/Compiler-Interpreter': {
+                deps: [ 'amber/Compiler-Core' ]
+            },
+            'amber/parser': {
+                deps: [ 'smalltalk' ]
+            },
+            'amber/IDE': {
+                deps: [ 'amber/Canvas', 'amber/Kernel-Exceptions' ]
+            },
+            'amber/Examples': {
+                deps: [ 'amber/Canvas' ]
+            },
+            'amber/Benchfib': {
+                deps: [ 'amber/Kernel-Objects' ]
+            },
+            'amber/Kernel-Tests': {
+                deps: [ 'amber/SUnit' ]
+            },
+            'amber/Compiler-Tests': {
+                deps: [ 'amber/SUnit' ]
+            },
+            'amber/SUnit-Tests': {
+                deps: [ 'amber/SUnit' ]
             }
-        },
-        deps: [
-            'jquery', 'es5-shim-2.0.2/es5-shim.min', 'es5-shim-2.0.2/es5-sham.min', 'smalltalk'
-        ]
+        }
     };
 
     if (require) {

js/lib/nil.js

@@ -0,0 +1,3 @@
+define(['amber/boot'], function () {
+    return nil;
+});

js/lib/smalltalk.js

@@ -0,0 +1,3 @@
+define(['amber/boot'], function () {
+    return smalltalk;
+});