Browse Source

migration to amber 0.14.17

Herbert Vojčík 5 years ago
parent
commit
2bd7cf0035
8 changed files with 85 additions and 49 deletions
  1. 63 42
      Gruntfile.js
  2. 2 2
      bower.json
  3. 7 0
      config-node.js
  4. 1 2
      devel.js
  5. 2 2
      package.json
  6. 1 1
      src/DOMite-Tests.js
  7. 0 0
      src/DOMite.js
  8. 9 0
      testing.js

+ 63 - 42
Gruntfile.js

@@ -1,7 +1,8 @@
 'use strict';
 
 module.exports = function (grunt) {
-    var path = require('path');
+    var path = require('path'),
+        helpers = require('amber-dev/lib/helpers');
 
     // These plugins provide necessary tasks.
     grunt.loadNpmTasks('grunt-contrib-clean');
@@ -10,8 +11,8 @@ module.exports = function (grunt) {
     grunt.loadNpmTasks('amber-dev');
 
     // Default task.
-    grunt.registerTask('default', ['amberc:all']);
-    grunt.registerTask('test', ['amberc:test_runner', 'execute:test_runner', 'clean:test_runner']);
+    grunt.registerTask('default', ['amdconfig:app', 'amberc:all']);
+    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']);
 
@@ -20,61 +21,81 @@ module.exports = function (grunt) {
         // Metadata.
         // pkg: grunt.file.readJSON(''),
         banner: '/*! <%= pkg.title || pkg.name %> - v<%= pkg.version %> - ' +
-            '<%= grunt.template.today("yyyy-mm-dd") %>\n' +
-            '<%= pkg.homepage ? "* " + pkg.homepage + "\\n" : "" %>' +
-            '* Copyright (c) <%= grunt.template.today("yyyy") %> <%= pkg.author.name %>;' +
-            ' Licensed <%= _.pluck(pkg.licenses, "type").join(", ") %> */\n',
+        '<%= grunt.template.today("yyyy-mm-dd") %>\n' +
+        '<%= pkg.homepage ? "* " + pkg.homepage + "\\n" : "" %>' +
+        '* Copyright (c) <%= grunt.template.today("yyyy") %> <%= pkg.author.name %>;' +
+        ' Licensed <%= _.pluck(pkg.licenses, "type").join(", ") %> */\n',
         // task configuration
         amberc: {
             options: {
                 amber_dir: path.join(__dirname, "bower_components", "amber"),
-                library_dirs: ['src', 'bower_components/amber/contrib/src'],
-                closure_jar: ''
+                configFile: "config.js"
             },
             all: {
                 src: [
                     'src/DOMite.st', // list all sources in dependency order
                     'src/DOMite-Tests.st' // list all tests in dependency order
                 ],
-                amd_namespace: 'domite',
-                libraries: ['SUnit']
-            },
-            test_runner: {
-                src: ['node_modules/amber-dev/lib/Test.st'],
-                libraries: [
-                    /* add dependencies packages here */
-                    'DOMite', /* add other code-to-test packages here */
-                    'SUnit',
-                    'DOMite-Tests' /* add other test packages here */
-                ],
-                main_class: 'NodeTestRunner',
-                output_name: 'test_runner'
+                amd_namespace: 'amber/domite',
+                libraries: ['amber_core/SUnit']
             }
         },
 
         amdconfig: {app: {dest: 'config.js'}},
 
         requirejs: {
-            deploy: {options: {
-                mainConfigFile: "config.js",
-                onBuildWrite: function (moduleName, path, contents) {
-                    return moduleName === "config" ? contents + "\nrequire.config({map:{'*':{app:'deploy'}}});" : contents;
-                },
-                pragmas: {
-                    excludeIdeData: true,
-                    excludeDebugContexts: true
-                },
-                include: ['config', 'node_modules/requirejs/require', 'deploy'],
-                out: "the.js"
-            }},
-            devel: {options: {
-                mainConfigFile: "config.js",
-                onBuildWrite: function (moduleName, path, contents) {
-                    return moduleName === "config" ? contents + "\nrequire.config({map:{'*':{app:'devel'}}});" : contents;
-                },
-                include: ['config', 'node_modules/requirejs/require'],
-                out: "the.js"
-            }}
+            options: {
+                useStrict: true
+            },
+            deploy: {
+                options: {
+                    mainConfigFile: "config.js",
+                    rawText: {
+                        "amber/Platform": '/*stub*/',
+                        "app": 'define(["deploy"],function(x){return x});define("amber/Platform",["amber_core/Platform-Browser"],{});'
+                    },
+                    pragmas: {
+                        excludeIdeData: true,
+                        excludeDebugContexts: true
+                    },
+                    include: ['config', 'node_modules/requirejs/require', 'app'],
+                    out: "the.js"
+                }
+            },
+            devel: {
+                options: {
+                    mainConfigFile: "config.js",
+                    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"
+                }
+            },
+            test_runner: {
+                options: {
+                    mainConfigFile: "config.js",
+                    rawText: {
+                        "app": "(" + function () {
+                            define(["testing", "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"
+                }
+            }
         },
 
         execute: {

+ 2 - 2
bower.json

@@ -27,11 +27,11 @@
   ],
   "private": false,
   "dependencies": {
-    "amber": ">=0.14.13"
+    "amber": ">=0.14.17"
   },
   "devDependencies": {
     "amber-contrib-legacy": "^0.2.0",
     "amber-ide-starter-dialog": "^0.1.0",
-    "helios": ">=0.5.2"
+    "helios": ">=0.5.3"
   }
 }

+ 7 - 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", {});

+ 1 - 2
devel.js

@@ -1,8 +1,7 @@
 define([
+    './testing',
     'amber/devel',
-    './deploy',
     // --- packages used only during development begin here ---
-    'amber/domite/DOMite-Tests',
     'amber/legacy/Benchfib',
     'amber/legacy/Examples',
     'amber/legacy/IDE'

+ 2 - 2
package.json

@@ -22,13 +22,13 @@
     }
   ],
   "engines": {
-    "node": ">=0.10.0"
+    "node": "0.10.x || 0.12.x || >=4.0.0"
   },
   "scripts": {
     "test": "grunt test"
   },
   "devDependencies": {
-    "amber-dev": "^0.4.0",
+    "amber-dev": "^0.8.0",
     "grunt": "^0.4.5",
     "grunt-contrib-clean": "^0.6.0",
     "grunt-contrib-requirejs": "^0.4.4",

+ 1 - 1
src/DOMite-Tests.js

@@ -1,4 +1,4 @@
-define("amber/domite/DOMite-Tests", ["amber/boot", "amber_core/SUnit"], function($boot){
+define("amber/domite/DOMite-Tests", ["amber/boot", "amber_core/SUnit"], function($boot){"use strict";
 var $core=$boot.api,nil=$boot.nil,$recv=$boot.asReceiver,$globals=$boot.globals;
 $core.addPackage('DOMite-Tests');
 $core.packages["DOMite-Tests"].innerEval = function (expr) { return eval(expr); };

File diff suppressed because it is too large
+ 0 - 0
src/DOMite.js


+ 9 - 0
testing.js

@@ -0,0 +1,9 @@
+define([
+    './deploy',
+    'amber_core/SUnit',
+    // --- packages used only during automated testing begin here ---
+    'amber/domite/DOMite-Tests'
+    // --- packages used only during automated testing end here ---
+], function (amber) {
+    return amber;
+});

Some files were not shown because too many files changed in this diff