migration to amber 0.14.17

.gitignore

@@ -11,4 +11,5 @@ node_modules/
 bower_components/
 
 # Ignores autogenerated files
-config.js
+config.js
+test_runner.js

Gruntfile.js

@@ -13,18 +13,19 @@ function findAmberPath(options) {
 }
 
 module.exports = function (grunt) {
-    var path = require('path');
+    var helpers = require('amber-dev/lib/helpers');
 
     // These plugins provide necessary tasks.
     grunt.loadNpmTasks('grunt-execute');
     grunt.loadNpmTasks('grunt-contrib-clean');
     grunt.loadNpmTasks('grunt-contrib-less');
+    grunt.loadNpmTasks('grunt-contrib-requirejs');
     grunt.loadNpmTasks('grunt-contrib-watch');
     grunt.loadNpmTasks('amber-dev');
 
     // Default task.
-    grunt.registerTask('default', ['less', 'amberc:all']);
-    grunt.registerTask('test', ['amberc:test_runner', 'execute:test_runner', 'clean:test_runner']);
+    grunt.registerTask('default', ['amdconfig:helios', 'less', 'amberc:all']);
+    grunt.registerTask('test', ['amdconfig:helios', 'requirejs:test_runner', 'execute:test_runner', 'clean:test_runner']);
     grunt.registerTask('devel', ['amdconfig:helios']);
 
     // Project configuration.
@@ -48,7 +49,7 @@ module.exports = function (grunt) {
         amberc: {
             options: {
                 amber_dir: findAmberPath(['../..', 'bower_components/amber']),
-                library_dirs: ['src', 'bower_components/amber-contrib-web/src']
+                configFile: "config.js"
             },
             all: {
                 output_dir: 'src',
@@ -64,20 +65,36 @@ 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: ['Web', 'SUnit'],
+                libraries: ['amber_core/SUnit', 'amber/web/Web'],
                 amd_namespace: 'helios',
                 jsGlobals: ['navigator']
+            }
+        },
+        requirejs: {
+            options: {
+                useStrict: true
             },
             test_runner: {
-                src: ['node_modules/amber-dev/lib/Test.st'],
-                libraries: [
-                    /* add dependencies packages here */
-                    /* add other code-to-test packages here */
-                    'SUnit',
-                    /* add other test packages here */
-                ],
-                main_class: 'NodeTestRunner',
-                output_name: 'test_runner'
+                options: {
+                    mainConfigFile: "config.js",
+                    rawText: {
+                        "app": "(" + function () {
+                            define(["amber/deploy", "helios/all", "amber_devkit/NodeTestRunner"], function (amber) {
+                                amber.initialize();
+                                amber.globals.NodeTestRunner._main();
+                            });
+                        } + "());"
+                    },
+                    paths: {"amber_devkit": helpers.libPath},
+                    pragmas: {
+                        excludeIdeData: true
+                    },
+                    include: ['config-node', 'app'],
+                    insertRequire: ['app'],
+                    optimize: "none",
+                    wrap: helpers.nodeWrapperWithShebang,
+                    out: "test_runner.js"
+                }
             }
         },
 

bower.json

@@ -1,5 +1,6 @@
 {
   "name": "helios",
+  "description": "Helios IDE for Amber Smalltalk",
   "version": "0.5.3",
   "ignore": [
     "**/.*",
@@ -8,6 +9,18 @@
     "test",
     "tests"
   ],
+  "homepage": "https://github.com/amber-smalltalk/helios",
+  "keywords": [
+    "Amber",
+    "Smalltalk",
+    "IDE"
+  ],
+  "license": [
+    "MIT"
+  ],
+  "devDependencies": {
+    "amber": ">=0.14.17"
+  },
   "dependencies": {
     "amber": ">=0.14.14",
     "amber-contrib-web": ">=0.1.0",

config-node.js

@@ -0,0 +1,7 @@
+// This file is used to make additional changes
+// when building an app to run in node.js.
+// Free to edit. You can break tests (cli test runner uses
+// this to build itself - it is a node executable).
+define("amber/Platform", ["amber_core/Platform-Node"], {});
+define("amber/browser-compatibility", {});
+define("jquery", {});

package.json

@@ -24,12 +24,13 @@
     "test": "grunt test"
   },
   "devDependencies": {
-    "amber-dev": "^0.6.0",
+    "amber-dev": "^0.8.0",
     "grunt": "^0.4.5",
     "grunt-contrib-clean": "^0.6.0",
     "grunt-contrib-less": "^1.0.1",
+    "grunt-contrib-requirejs": "^0.4.4",
     "grunt-contrib-watch": "^0.6.1",
-    "grunt-execute": "^0.2.1",
+    "grunt-execute": "^0.2.2",
     "requirejs": "^2.1.15"
   },
   "keywords": [