npm - app-bundler - Versions diffs - 0.1.5 → 0.1.8 - Mend

app-bundler 0.1.5 → 0.1.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/lib/bundler.js CHANGED Viewed

@@ -1285,16 +1285,19 @@ var Npm;
     function resolveAppUrl(path, currentLocation, base) {
         let name = /^(@?[^\\\/]+)/.exec(path)[0];
         let resource = path.substring(name.length + 1);
-        if (resource && hasExt(resource) === false) {
-            resource += '.js';
-        }
         while (path != null) {
             let dirname = (0, path_1.path_combine)(currentLocation, 'node_modules', name);
             let pckg = (0, path_1.path_combine)(dirname, 'package.json');
             if (global_1.io.File.exists(pckg)) {
-                let json = global_1.io.File.read(pckg);
-                if (json) {
-                    let filename = combineMain(dirname, json.main);
+                let main = resource;
+                if (main === '') {
+                    let json = global_1.io.File.read(pckg);
+                    if (json) {
+                        main = json.main;
+                    }
+                }
+                if (main) {
+                    let filename = combineMain(dirname, main);
                     if (base) {
                         if (base.endsWith('/') === false) {
                             // Base path must be a folder
@@ -1318,14 +1321,20 @@ var Npm;
         return null;
     }
     Npm.resolveAppUrl = resolveAppUrl;
-    function combineMain(cwd, filename) {
+    function combineMain(directory, filename) {
         if (filename == null) {
             filename = 'index.js';
         }
-        if (hasExt(filename) === false) {
-            filename += '.js';
+        let path = (0, path_1.path_combine)(directory, filename);
+        if (hasExt(path) === false) {
+            let likelyTs = path.includes('/src/');
+            if (likelyTs) {
+                if (global_1.io.File.exists(path + '.ts')) {
+                    return path + '.ts';
+                }
+            }
+            path += '.js';
         }
-        var path = (0, path_1.path_combine)(cwd, filename);
         if (global_1.io.File.exists(path)) {
             return path;
         }
@@ -2593,7 +2602,7 @@ class SolutionOpts extends SolutionOptsBase {
             varDefs: null,
             parserIgnoreDependencies: [
                 '\\/bower_components\\/',
-                '\\/node_modules\\/',
+                '\\/node_modules\\/(?!.+\\.ts\\b)',
                 '\\.min\\.'
             ],
             dynamicDependencies: [],
@@ -5285,9 +5294,9 @@ class CommonJsPathResolver extends BasePathResolver_1.BasePathResolver {
         return true;
     }
     resolve(includeData, parentResource) {
-        var filename = nodeModuleResolve(includeData.url, parentResource.directory);
+        let filename = nodeModuleResolve(includeData.url, parentResource.directory);
         if (filename) {
-            var url = this.solution.opts.toAppUrl(filename);
+            let url = this.solution.opts.toAppUrl(filename);
             this.solution.opts.mappings[includeData.url] = url;
         }
         return filename;
@@ -5302,32 +5311,39 @@ const nodeCoreModules = [
     'tls', 'tty', 'url', 'util', 'vm', 'zlib'
 ];
 function nodeModuleResolve(path, location_) {
-    var location = location_.replace(/[\\\/]+$/, '');
-    var name = /^([\w\-]+)/.exec(path)[0];
-    var resource = path.substring(name.length + 1);
-    if (resource && hasExt(resource) === false) {
-        resource += '.js';
-    }
-    var current = location;
-    var root_ = current + '/node_modules/' + name + '/';
+    let location = location_.replace(/[\\\/]+$/, '');
+    let name = /^([\w\-]+)/.exec(path)[0];
+    let resource = path.substring(name.length + 1);
+    let current = location;
+    let root_ = current + '/node_modules/' + name + '/';
     while (true) {
-        var nodeModules = (0, path_1.path_combine)(current, '/node_modules/' + name + '/');
-        var pckg = nodeModules + 'package.json';
+        let nodeModules = (0, path_1.path_combine)(current, '/node_modules/' + name + '/');
+        let pckg = nodeModules + 'package.json';
         if (global_1.io.File.exists(pckg) === false) {
-            var next = current.replace(/[^\/\\]+[\/\\]?$/, '');
+            let next = current.replace(/[^\/\\]+[\/\\]?$/, '');
             if (next === current) {
                 return root_ + 'package.json';
             }
             current = next;
             continue;
         }
-        var json = global_1.io.File.read(pckg);
+        if (resource) {
+            let path = nodeModules + resource;
+            if (hasExt(path) === false) {
+                let likelyTs = path.includes('/src/');
+                if (likelyTs) {
+                    if (global_1.io.File.exists(path + '.ts')) {
+                        return path + '.ts';
+                    }
+                }
+                return path + '.js';
+            }
+            return path;
+        }
+        let json = global_1.io.File.read(pckg);
         if (typeof json === 'string') {
             json = JSON.parse(json);
         }
-        if (resource) {
-            return nodeModules + resource;
-        }
         if (json.main) {
             return (0, path_1.path_combine)(nodeModules, json.main);
         }

package/lib/cli.js CHANGED Viewed

@@ -1287,16 +1287,19 @@ var Npm;
     function resolveAppUrl(path, currentLocation, base) {
         let name = /^(@?[^\\\/]+)/.exec(path)[0];
         let resource = path.substring(name.length + 1);
-        if (resource && hasExt(resource) === false) {
-            resource += '.js';
-        }
         while (path != null) {
             let dirname = (0, path_1.path_combine)(currentLocation, 'node_modules', name);
             let pckg = (0, path_1.path_combine)(dirname, 'package.json');
             if (global_1.io.File.exists(pckg)) {
-                let json = global_1.io.File.read(pckg);
-                if (json) {
-                    let filename = combineMain(dirname, json.main);
+                let main = resource;
+                if (main === '') {
+                    let json = global_1.io.File.read(pckg);
+                    if (json) {
+                        main = json.main;
+                    }
+                }
+                if (main) {
+                    let filename = combineMain(dirname, main);
                     if (base) {
                         if (base.endsWith('/') === false) {
                             // Base path must be a folder
@@ -1320,14 +1323,20 @@ var Npm;
         return null;
     }
     Npm.resolveAppUrl = resolveAppUrl;
-    function combineMain(cwd, filename) {
+    function combineMain(directory, filename) {
         if (filename == null) {
             filename = 'index.js';
         }
-        if (hasExt(filename) === false) {
-            filename += '.js';
+        let path = (0, path_1.path_combine)(directory, filename);
+        if (hasExt(path) === false) {
+            let likelyTs = path.includes('/src/');
+            if (likelyTs) {
+                if (global_1.io.File.exists(path + '.ts')) {
+                    return path + '.ts';
+                }
+            }
+            path += '.js';
         }
-        var path = (0, path_1.path_combine)(cwd, filename);
         if (global_1.io.File.exists(path)) {
             return path;
         }
@@ -2595,7 +2604,7 @@ class SolutionOpts extends SolutionOptsBase {
             varDefs: null,
             parserIgnoreDependencies: [
                 '\\/bower_components\\/',
-                '\\/node_modules\\/',
+                '\\/node_modules\\/(?!.+\\.ts\\b)',
                 '\\.min\\.'
             ],
             dynamicDependencies: [],
@@ -5287,9 +5296,9 @@ class CommonJsPathResolver extends BasePathResolver_1.BasePathResolver {
         return true;
     }
     resolve(includeData, parentResource) {
-        var filename = nodeModuleResolve(includeData.url, parentResource.directory);
+        let filename = nodeModuleResolve(includeData.url, parentResource.directory);
         if (filename) {
-            var url = this.solution.opts.toAppUrl(filename);
+            let url = this.solution.opts.toAppUrl(filename);
             this.solution.opts.mappings[includeData.url] = url;
         }
         return filename;
@@ -5304,32 +5313,39 @@ const nodeCoreModules = [
     'tls', 'tty', 'url', 'util', 'vm', 'zlib'
 ];
 function nodeModuleResolve(path, location_) {
-    var location = location_.replace(/[\\\/]+$/, '');
-    var name = /^([\w\-]+)/.exec(path)[0];
-    var resource = path.substring(name.length + 1);
-    if (resource && hasExt(resource) === false) {
-        resource += '.js';
-    }
-    var current = location;
-    var root_ = current + '/node_modules/' + name + '/';
+    let location = location_.replace(/[\\\/]+$/, '');
+    let name = /^([\w\-]+)/.exec(path)[0];
+    let resource = path.substring(name.length + 1);
+    let current = location;
+    let root_ = current + '/node_modules/' + name + '/';
     while (true) {
-        var nodeModules = (0, path_1.path_combine)(current, '/node_modules/' + name + '/');
-        var pckg = nodeModules + 'package.json';
+        let nodeModules = (0, path_1.path_combine)(current, '/node_modules/' + name + '/');
+        let pckg = nodeModules + 'package.json';
         if (global_1.io.File.exists(pckg) === false) {
-            var next = current.replace(/[^\/\\]+[\/\\]?$/, '');
+            let next = current.replace(/[^\/\\]+[\/\\]?$/, '');
             if (next === current) {
                 return root_ + 'package.json';
             }
             current = next;
             continue;
         }
-        var json = global_1.io.File.read(pckg);
+        if (resource) {
+            let path = nodeModules + resource;
+            if (hasExt(path) === false) {
+                let likelyTs = path.includes('/src/');
+                if (likelyTs) {
+                    if (global_1.io.File.exists(path + '.ts')) {
+                        return path + '.ts';
+                    }
+                }
+                return path + '.js';
+            }
+            return path;
+        }
+        let json = global_1.io.File.read(pckg);
         if (typeof json === 'string') {
             json = JSON.parse(json);
         }
-        if (resource) {
-            return nodeModules + resource;
-        }
         if (json.main) {
             return (0, path_1.path_combine)(nodeModules, json.main);
         }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
     "name": "app-bundler",
-    "version": "0.1.5",
+    "version": "0.1.8",
     "description": "",
     "main": "lib/bundler.js",
     "bin": {
@@ -33,7 +33,7 @@
     },
     "homepage": "https://github.com/atmajs/app-bundler",
     "dependencies": {
-        "alot": "^0.2.99",
+        "alot": "^0.3.0",
         "appcfg": "^0.4.64",
         "atma-class": "^1.1.83",
         "atma-io": "^1.2.60",
@@ -42,8 +42,8 @@
         "atma-utils": "^0.1.13",
         "axios": "^0.21.0",
         "cheerio": "^0.20.0",
-        "includejs": "^0.16.3",
-        "maskjs": "^0.72.36",
+        "includejs": "^0.16.7",
+        "maskjs": "^0.72.37",
         "memd": "^0.3.10",
         "uglify-js": "^3.13.10"
     },