Browse Source

bump amber-dev, use grunt amdconfig

Herbert Vojčík 9 years ago
parent
commit
c9a9ec8901
3 changed files with 24 additions and 26 deletions
  1. 2 0
      Gruntfile.js
  2. 21 25
      config.js
  3. 1 1
      package.json

+ 2 - 0
Gruntfile.js

@@ -31,6 +31,8 @@ module.exports = function(grunt) {
       }
     },
 
+    amdconfig: {amber: {dest: 'config.js'}},
+
     amberc: {
       options: {
         amber_dir: process.cwd(),

+ 21 - 25
config.js

@@ -4,64 +4,60 @@ var require;
 if (!require) require = {config: function (x) {require = x;}};
 require.config({
   "paths": {
-    "require-css": "bower_components/require-css",
+    "amber_lib/showdown": "my/helios/bower_components/showdown",
+    "requireJS": "node_modules/requirejs/require",
     "jquery": "bower_components/jquery/jquery.min",
     "jquery-ui": "bower_components/jquery-ui/jquery-ui.min",
+    "bootstrap2.3.2": "my/helios/bower_components/bootstrap2.3.2/bootstrap",
+    "require-css": "bower_components/require-css",
     "amber_lib/es5-shim": "bower_components/es5-shim",
     "amber_lib/codemirror": "bower_components/codemirror",
-    "amber_lib/showdown": "my/helios/bower_components/showdown",
-    "requireJS": "node_modules/requirejs/require",
-    "bootstrap2.3.2": "my/helios/bower_components/bootstrap2.3.2/bootstrap",
-    "amber": "support",
-    "amber_vm": "support/deprecated-vm-files",
-    "amber_vm/_st": "support/deprecated-vm-files/as-receiver",
-    "amber_css": "support/resources",
-    "amber_core": "src",
     "helios": "my/helios/src",
     "helios/set": "my/helios/set",
     "helios/resources": "my/helios/resources",
     "helios/index": "my/helios/index",
-    "amber_cli": "external/amber-cli/src"
-  },
-  "map": {
-    "*": {
-      "css": "require-css/css"
-    }
+    "amber_cli": "external/amber-cli/src",
+    "amber": "support",
+    "amber_vm": "support/deprecated-vm-files",
+    "amber_vm/_st": "support/deprecated-vm-files/as-receiver",
+    "amber_css": "support/resources",
+    "amber_core": "src"
   },
   "shim": {
     "jquery-ui": {
       "deps": [
-        "jquery",
         "jquery",
         "jquery"
       ]
     },
+    "bootstrap2.3.2/js/bootstrap": {
+      "deps": [
+        "jquery",
+        "css!bootstrap2.3.2/css/bootstrap"
+      ]
+    },
     "amber_lib/codemirror/lib/codemirror": {
       "deps": [
-        "css!amber_lib/codemirror/lib/codemirror",
         "css!amber_lib/codemirror/lib/codemirror"
       ]
     },
     "amber_lib/codemirror/mode/smalltalk/smalltalk": {
       "deps": [
-        "../../lib/codemirror",
         "../../lib/codemirror"
       ]
     },
     "amber_lib/codemirror/addon/hint/show-hint": {
       "deps": [
-        "../../lib/codemirror",
         "../../lib/codemirror"
       ]
     },
-    "bootstrap2.3.2/js/bootstrap": {
-      "deps": [
-        "jquery",
-        "css!bootstrap2.3.2/css/bootstrap"
-      ]
-    },
     "ensure-console": {
       "exports": "console"
     }
+  },
+  "map": {
+    "*": {
+      "css": "require-css/css"
+    }
   }
 });

+ 1 - 1
package.json

@@ -29,7 +29,7 @@
     "test": "grunt test"
   },
   "devDependencies": {
-    "amber-dev": "^0.2.0",
+    "amber-dev": "^0.2.1",
     "grunt": "^0.4.0",
     "grunt-contrib-clean": "^0.6.0",
     "grunt-contrib-jshint": "^0.10.0",