|
@@ -87,7 +87,6 @@ var createDefaultConfiguration = function() {
|
|
return {
|
|
return {
|
|
'load': [],
|
|
'load': [],
|
|
'stFiles': [],
|
|
'stFiles': [],
|
|
- 'jsFiles': [],
|
|
|
|
'jsGlobals': [],
|
|
'jsGlobals': [],
|
|
'amd_namespace': 'amber_core',
|
|
'amd_namespace': 'amber_core',
|
|
'libraries': [],
|
|
'libraries': [],
|
|
@@ -131,7 +130,6 @@ AmberCompiler.prototype.main = function(configuration, finished_callback) {
|
|
|
|
|
|
check_configuration(configuration)
|
|
check_configuration(configuration)
|
|
.then(collect_st_files)
|
|
.then(collect_st_files)
|
|
- .then(collect_js_files)
|
|
|
|
.then(resolve_kernel)
|
|
.then(resolve_kernel)
|
|
.then(create_compiler)
|
|
.then(create_compiler)
|
|
.then(compile)
|
|
.then(compile)
|
|
@@ -159,8 +157,8 @@ function check_configuration(configuration) {
|
|
reject(Error('AmberCompiler.check_configuration_ok(): missing configuration object'));
|
|
reject(Error('AmberCompiler.check_configuration_ok(): missing configuration object'));
|
|
}
|
|
}
|
|
|
|
|
|
- if (0 === configuration.jsFiles.length && 0 === configuration.stFiles.length) {
|
|
|
|
- reject(Error('AmberCompiler.check_configuration_ok(): no files to compile/link specified in configuration object'));
|
|
|
|
|
|
+ if (0 === configuration.stFiles.length) {
|
|
|
|
+ reject(Error('AmberCompiler.check_configuration_ok(): no files to compile specified in configuration object'));
|
|
}
|
|
}
|
|
|
|
|
|
resolve(configuration);
|
|
resolve(configuration);
|
|
@@ -244,23 +242,6 @@ function collect_st_files(configuration) {
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
-/**
|
|
|
|
- * Resolve js files given by jsFiles and add them to configuration.libraries.
|
|
|
|
- * Returns a Promise which resolves into the configuration object.
|
|
|
|
- */
|
|
|
|
-function collect_js_files(configuration) {
|
|
|
|
- return Promise.all(
|
|
|
|
- configuration.jsFiles.map(function(file) {
|
|
|
|
- return resolve_js(file, configuration);
|
|
|
|
- })
|
|
|
|
- )
|
|
|
|
- .then(function(data) {
|
|
|
|
- configuration.libraries = configuration.libraries.concat(data);
|
|
|
|
- return configuration;
|
|
|
|
- });
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
-
|
|
|
|
/**
|
|
/**
|
|
* Resolve .js files needed by kernel.
|
|
* Resolve .js files needed by kernel.
|
|
* Returns a Promise which resolves into the configuration object.
|
|
* Returns a Promise which resolves into the configuration object.
|