|
@@ -25,12 +25,6 @@ module.exports = function (grunt) {
|
|
|
return "define(" + JSON.stringify(deps) + "," + cb + ");"
|
|
|
}
|
|
|
|
|
|
- var cbRequireAndPromiseMain = function (require) {
|
|
|
- return new Promise(function (resolve, reject) {
|
|
|
- require(["app/main"], resolve, reject);
|
|
|
- });
|
|
|
- };
|
|
|
-
|
|
|
var lambdaExports = function (amberPromised) {
|
|
|
return function (className) {
|
|
|
var worker, workerPromise = amberPromised.then(function (amber) {
|
|
@@ -89,8 +83,7 @@ module.exports = function (grunt) {
|
|
|
options: {
|
|
|
rawText: {
|
|
|
"helios/index": "",
|
|
|
- "app": mkDefine(["require"], cbRequireAndPromiseMain),
|
|
|
- "app/main": mkDefine(["deploy", "amber/core/Platform-Browser"], id)
|
|
|
+ "app": mkDefine(["deploy", "amber/core/Platform-Browser"], id)
|
|
|
},
|
|
|
pragmas: {
|
|
|
excludeIdeData: true,
|
|
@@ -107,10 +100,9 @@ module.exports = function (grunt) {
|
|
|
devel: {
|
|
|
options: {
|
|
|
rawText: {
|
|
|
- "app": mkDefine(["require"], cbRequireAndPromiseMain),
|
|
|
- "app/main": mkDefine(["devel", "amber/core/Platform-Browser"], id)
|
|
|
+ "app": mkDefine(["devel", "amber/core/Platform-Browser"], id)
|
|
|
},
|
|
|
- include: ['config', 'node_modules/requirejs/require', 'es6-promise/auto', 'app', 'app/main'],
|
|
|
+ include: ['config', 'node_modules/requirejs/require', 'es6-promise/auto', 'app'],
|
|
|
insertRequire: ['es6-promise/auto'],
|
|
|
exclude: ['devel', 'amber/core/Platform-Browser'],
|
|
|
out: "the.js"
|
|
@@ -120,8 +112,7 @@ module.exports = function (grunt) {
|
|
|
options: {
|
|
|
rawText: {
|
|
|
"helios/index": "",
|
|
|
- "app": mkDefine(["app/promise"], lambdaExports),
|
|
|
- "app/promise": mkDefine(["require"], cbRequireAndPromiseMain),
|
|
|
+ "app": mkDefine(["app/main"], lambdaExports),
|
|
|
"app/main": mkDefine(["lambda", "amber/core/Platform-Node"], function (amber) {
|
|
|
return amber.initialize().then(function () {
|
|
|
return amber;
|
|
@@ -144,12 +135,11 @@ module.exports = function (grunt) {
|
|
|
options: {
|
|
|
rawText: {
|
|
|
"jquery": "/* do not load in node test runner */",
|
|
|
- "app/main": mkDefine(["testing", "amber/core/Platform-Node", "amber_devkit/NodeTestRunner"], function (amber) {
|
|
|
+ "app": mkDefine(["testing", "amber/core/Platform-Node", "amber_devkit/NodeTestRunner"], function (amber) {
|
|
|
amber.initialize().then(function () {
|
|
|
amber.globals.NodeTestRunner._main();
|
|
|
});
|
|
|
- }),
|
|
|
- "app": mkDefine(["require"], cbRequireAndPromiseMain)
|
|
|
+ })
|
|
|
},
|
|
|
paths: {"amber_devkit": helpers.libPath},
|
|
|
pragmas: {
|