app-bundler 0.2.9 → 0.2.11

package/lib/bundler.js

@@ -5065,8 +5065,8 @@ const Resource_1 = _src_class_Resource;
 const Templates_1 = _src_handlers_script_common_js_templates_Templates;
 exports.CommonJsBuilderSimplified = {
     wrapModule(resource, outputItem, outputItems, setts) {
-        var varId = getVarId(resource);
-        var content = resource.content;
+        let varId = getVarId(resource);
+        let content = resource.content;
         content = replaceWithVarIds(content, resource, this.solution);
         content = Templates_1.Templates
             .ModuleSimplified
@@ -5074,7 +5074,7 @@ exports.CommonJsBuilderSimplified = {
             .replace(/[_]{3}MODULE[_]{3}/g, () => content)
             .replace(/[_]{3}FOOTER[_]{3}/g, () => { var _a, _b; return ((_b = (_a = setts === null || setts === void 0 ? void 0 : setts.partials) === null || _a === void 0 ? void 0 : _a.footer) !== null && _b !== void 0 ? _b : ''); });
         ;
-        var opts = this.solution.iteration;
+        let opts = this.solution.iteration;
         if (opts.commonjs == null) {
             opts.commonjs = {
                 addHeading: true,
@@ -5089,11 +5089,12 @@ exports.CommonJsBuilderSimplified = {
         return content;
     },
     getRootContent(root) {
-        var rootInput = this.solution.outputResources.rootInput, content = replaceWithVarIds(root.content, rootInput, this.solution);
+        let rootInput = this.solution.outputResources.rootInput;
+        let content = replaceWithVarIds(root.content, rootInput, this.solution);
         return content;
     },
     getHeaderContent() {
-        var resources = this
+        let resources = this
             .solution
             .outputResources
             .items
@@ -5103,10 +5104,13 @@ exports.CommonJsBuilderSimplified = {
     }
 };
 function replaceWithVarIds(content, resource, solution) {
-    var rgx_REQUIRE = /require\s*\(\s*['"]([^'"]+)['"]\s*\)/g;
+    let rgx_REQUIRE = /require\s*\(\s*['"]([^'"]+)['"]\s*\)/g;
+    if (typeof content !== 'string') {
+        return JSON.stringify(content);
+    }
     return content.replace(rgx_REQUIRE, (full, path) => {
-        var res = new Resource_1.Resource({ url: path, type: 'js' }, resource, solution);
-        var current = resource.resources.find(x => x.url === res.url);
+        let res = new Resource_1.Resource({ url: path, type: 'js' }, resource, solution);
+        let current = resource.resources.find(x => x.url === res.url);
         if (current == null) {
             return full;
         }
@@ -5114,11 +5118,11 @@ function replaceWithVarIds(content, resource, solution) {
     });
 }
 function getVarId(resource) {
-    var str = resource.url.replace(/\.\w+$/, '');
+    let str = resource.url.replace(/\.\w+$/, '');
     return str.replace(/[^\w\d]/g, '_');
 }
 function getModuleVars(resources) {
-    return resources.map(getVarId).sort().map(x => `var ${x} = {};`).join('\n') + '\n';
+    return resources.map(getVarId).sort().map(x => `let ${x} = {};`).join('\n') + '\n';
 }
 //# sourceMappingURL=CommonJsBuilderSimplified.js.map
 //# sourceMappingURL=CommonJsBuilderSimplified.ts.map;
@@ -8574,13 +8578,19 @@ class CopyJsBuilder extends BaseScriptBuilder_1.BaseScriptBuilder {
         let result = [
             createOutputItem(cloneWithExtension(resource, this.solution.opts.outputExtension))
         ];
-        let extra = [{
-                ext: 'ts.map',
-                output: 'js.map',
-            }, {
-                ext: 'd.ts',
-                output: 'd.ts',
-            }];
+        let extra = [];
+        if (resource.filename.endsWith('.ts')) {
+            extra = [
+                {
+                    ext: 'ts.map',
+                    output: 'js.map',
+                },
+                // {
+                //     ext: 'd.ts',
+                //     output: 'd.ts',
+                // }
+            ];
+        }
         let readFile = Configuration_1.Configuration.Instance.get('readFile');
         await (0, alot_1.default)(extra).forEachAsync(async (x) => {
             let cloned = cloneWithExtension(resource, x.ext);
@@ -12225,6 +12235,7 @@ const res_1 = _src_utils_res;
 const tree_1 = _src_utils_tree;
 const Builder_1 = _src_builder_Builder;
 const color_1 = _src_utils_color;
+const File_1 = _src_config_File;
 class Bundler extends atma_utils_1.class_EventEmitter {
     static clearCache() {
         Loader_1.Loader.clearCache();
@@ -12354,7 +12365,11 @@ class Bundler extends atma_utils_1.class_EventEmitter {
         let solution = bundler.solution;
         function builderComplete(resources) {
             resources.forEach(res => {
-                global_1.io.File.write(res.filename, res.content);
+                let content = res.content;
+                if (typeof content !== 'string') {
+                    content = JSON.stringify(content, null, 2);
+                }
+                File_1.FileActions.writeFile(res.filename, content, { skipHooks: true });
             });
             return solution
                 .assetsManager

package/lib/cli.js

@@ -5067,8 +5067,8 @@ const Resource_1 = _src_class_Resource;
 const Templates_1 = _src_handlers_script_common_js_templates_Templates;
 exports.CommonJsBuilderSimplified = {
     wrapModule(resource, outputItem, outputItems, setts) {
-        var varId = getVarId(resource);
-        var content = resource.content;
+        let varId = getVarId(resource);
+        let content = resource.content;
         content = replaceWithVarIds(content, resource, this.solution);
         content = Templates_1.Templates
             .ModuleSimplified
@@ -5076,7 +5076,7 @@ exports.CommonJsBuilderSimplified = {
             .replace(/[_]{3}MODULE[_]{3}/g, () => content)
             .replace(/[_]{3}FOOTER[_]{3}/g, () => { var _a, _b; return ((_b = (_a = setts === null || setts === void 0 ? void 0 : setts.partials) === null || _a === void 0 ? void 0 : _a.footer) !== null && _b !== void 0 ? _b : ''); });
         ;
-        var opts = this.solution.iteration;
+        let opts = this.solution.iteration;
         if (opts.commonjs == null) {
             opts.commonjs = {
                 addHeading: true,
@@ -5091,11 +5091,12 @@ exports.CommonJsBuilderSimplified = {
         return content;
     },
     getRootContent(root) {
-        var rootInput = this.solution.outputResources.rootInput, content = replaceWithVarIds(root.content, rootInput, this.solution);
+        let rootInput = this.solution.outputResources.rootInput;
+        let content = replaceWithVarIds(root.content, rootInput, this.solution);
         return content;
     },
     getHeaderContent() {
-        var resources = this
+        let resources = this
             .solution
             .outputResources
             .items
@@ -5105,10 +5106,13 @@ exports.CommonJsBuilderSimplified = {
     }
 };
 function replaceWithVarIds(content, resource, solution) {
-    var rgx_REQUIRE = /require\s*\(\s*['"]([^'"]+)['"]\s*\)/g;
+    let rgx_REQUIRE = /require\s*\(\s*['"]([^'"]+)['"]\s*\)/g;
+    if (typeof content !== 'string') {
+        return JSON.stringify(content);
+    }
     return content.replace(rgx_REQUIRE, (full, path) => {
-        var res = new Resource_1.Resource({ url: path, type: 'js' }, resource, solution);
-        var current = resource.resources.find(x => x.url === res.url);
+        let res = new Resource_1.Resource({ url: path, type: 'js' }, resource, solution);
+        let current = resource.resources.find(x => x.url === res.url);
         if (current == null) {
             return full;
         }
@@ -5116,11 +5120,11 @@ function replaceWithVarIds(content, resource, solution) {
     });
 }
 function getVarId(resource) {
-    var str = resource.url.replace(/\.\w+$/, '');
+    let str = resource.url.replace(/\.\w+$/, '');
     return str.replace(/[^\w\d]/g, '_');
 }
 function getModuleVars(resources) {
-    return resources.map(getVarId).sort().map(x => `var ${x} = {};`).join('\n') + '\n';
+    return resources.map(getVarId).sort().map(x => `let ${x} = {};`).join('\n') + '\n';
 }
 //# sourceMappingURL=CommonJsBuilderSimplified.js.map
 //# sourceMappingURL=CommonJsBuilderSimplified.ts.map;
@@ -8576,13 +8580,19 @@ class CopyJsBuilder extends BaseScriptBuilder_1.BaseScriptBuilder {
         let result = [
             createOutputItem(cloneWithExtension(resource, this.solution.opts.outputExtension))
         ];
-        let extra = [{
-                ext: 'ts.map',
-                output: 'js.map',
-            }, {
-                ext: 'd.ts',
-                output: 'd.ts',
-            }];
+        let extra = [];
+        if (resource.filename.endsWith('.ts')) {
+            extra = [
+                {
+                    ext: 'ts.map',
+                    output: 'js.map',
+                },
+                // {
+                //     ext: 'd.ts',
+                //     output: 'd.ts',
+                // }
+            ];
+        }
         let readFile = Configuration_1.Configuration.Instance.get('readFile');
         await (0, alot_1.default)(extra).forEachAsync(async (x) => {
             let cloned = cloneWithExtension(resource, x.ext);
@@ -12227,6 +12237,7 @@ const res_1 = _src_utils_res;
 const tree_1 = _src_utils_tree;
 const Builder_1 = _src_builder_Builder;
 const color_1 = _src_utils_color;
+const File_1 = _src_config_File;
 class Bundler extends atma_utils_1.class_EventEmitter {
     static clearCache() {
         Loader_1.Loader.clearCache();
@@ -12356,7 +12367,11 @@ class Bundler extends atma_utils_1.class_EventEmitter {
         let solution = bundler.solution;
         function builderComplete(resources) {
             resources.forEach(res => {
-                global_1.io.File.write(res.filename, res.content);
+                let content = res.content;
+                if (typeof content !== 'string') {
+                    content = JSON.stringify(content, null, 2);
+                }
+                File_1.FileActions.writeFile(res.filename, content, { skipHooks: true });
             });
             return solution
                 .assetsManager

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "app-bundler",
-    "version": "0.2.9",
+    "version": "0.2.11",
     "description": "",
     "main": "lib/bundler.js",
     "bin": {