Browse Source

migration to amber 0.14.17

Herbert Vojčík 8 years ago
parent
commit
7665f8eac1
5 changed files with 29 additions and 12 deletions
  1. 24 7
      Gruntfile.js
  2. 2 2
      bower.json
  3. 1 1
      config-node.js
  4. 1 1
      devel.js
  5. 1 1
      package.json

+ 24 - 7
Gruntfile.js

@@ -11,7 +11,7 @@ module.exports = function (grunt) {
     grunt.loadNpmTasks('amber-dev');
 
     // Default task.
-    grunt.registerTask('default', ['amberc:all', 'amberc:counter', 'amberc:todo']);
+    grunt.registerTask('default', ['amdconfig:app', 'amberc:axon', 'amberc:all', 'amberc:counter', 'amberc:todo']);
     grunt.registerTask('test', ['amdconfig:app', 'requirejs:test_runner', 'execute:test_runner', 'clean:test_runner']);
     grunt.registerTask('devel', ['amdconfig:app', 'requirejs:devel']);
     grunt.registerTask('deploy', ['amdconfig:app', 'requirejs:deploy']);
@@ -29,7 +29,15 @@ module.exports = function (grunt) {
         amberc: {
             options: {
                 amber_dir: path.join(__dirname, "bower_components", "amber"),
-                library_dirs: ['src']
+                configFile: "config.js"
+            },
+            axon: {
+                src: [
+                    'src/Axon.st',  // list all sources in dependency order
+                    // list all tests in dependency order
+                ],
+                amd_namespace: 'axon',
+                libraries: ['amber_core/SUnit']
             },
             all: {
                 src: [
@@ -37,31 +45,37 @@ module.exports = function (grunt) {
                     'src/Trapped-Tests.st' // list all tests in dependency order
                 ],
                 amd_namespace: 'trapped',
-                libraries: ['SUnit', 'Web']
+                libraries: ['axon/Axon', 'amber_core/SUnit', 'amber/web/Web']
             },
             counter: {
                 src: [
                     'example-counter/src/Trapped-Counter.st'
                 ],
                 amd_namespace: 'trapped-counter',
-                libraries: ['SUnit', 'Web', 'Trapped-Backend']
+                libraries: ['amber_core/SUnit', 'amber/web/Web', 'trapped/Trapped-Backend']
             },
             todo: {
                 src: [
                     'example-todo/src/Trapped-Todo.st'
                 ],
                 amd_namespace: 'trapped-todo',
-                libraries: ['SUnit', 'Web', 'Trapped-Frontend', 'Trapped-Backend']
+                libraries: ['amber_core/SUnit', 'amber/web/Web', 'trapped/Trapped-Frontend', 'trapped/Trapped-Backend']
             }
         },
 
         amdconfig: {app: {dest: 'config.js'}},
 
         requirejs: {
+            options: {
+                useStrict: true
+            },
             deploy: {
                 options: {
                     mainConfigFile: "config.js",
-                    rawText: {"app": 'define(["deploy"],function(x){return x});'},
+                    rawText: {
+                        "amber/Platform": '/*stub*/',
+                        "app": 'define(["deploy"],function(x){return x});define("amber/Platform",["amber_core/Platform-Browser"],{});'
+                    },
                     pragmas: {
                         excludeIdeData: true,
                         excludeDebugContexts: true
@@ -73,7 +87,10 @@ module.exports = function (grunt) {
             devel: {
                 options: {
                     mainConfigFile: "config.js",
-                    rawText: {"app": 'define(["devel"],function(x){return x});'},
+                    rawText: {
+                        "amber/Platform": '/*stub*/',
+                        "app": 'define(["devel"],function(x){return x});define("amber/Platform",["amber_core/Platform-Browser"],{});'
+                    },
                     include: ['config', 'node_modules/requirejs/require', 'app'],
                     exclude: ['devel'],
                     out: "the.js"

+ 2 - 2
bower.json

@@ -24,13 +24,13 @@
     "tests"
   ],
   "dependencies": {
-    "amber": ">=0.14.15",
+    "amber": ">=0.14.17",
     "lyst": "^0.1.2",
     "xontent": "^0.1.0"
   },
   "devDependencies": {
     "amber-ide-starter-dialog": "^0.1.0",
     "amber-contrib-legacy": "^0.2.1",
-    "helios": ">=0.5.0"
+    "helios": ">=0.5.3"
   }
 }

+ 1 - 1
config-node.js

@@ -2,6 +2,6 @@
 // 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_core/Platform-Browser", ["amber_core/Platform-Node"], {});
+define("amber/Platform", ["amber_core/Platform-Node"], {});
 define("amber/browser-compatibility", {});
 define("jquery", {});

+ 1 - 1
devel.js

@@ -2,7 +2,7 @@ define([
     './testing',
     'amber/devel',
     // --- packages used only during development begin here ---
-    'amber-attic/IDE'
+    'amber/legacy/IDE'
     // --- packages used only during development end here ---
 ], function (amber) {
     return amber;

+ 1 - 1
package.json

@@ -28,7 +28,7 @@
     "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-requirejs": "^0.4.4",