npm - app-bundler - Versions diffs - 0.1.6 → 0.1.7 - Mend

app-bundler 0.1.6 → 0.1.7

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: [],

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: [],

package/package.json CHANGED Viewed

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