fix: fix false error on stub module

Author: 3cp

spec/bundler.spec.js

@@ -328,7 +328,7 @@ test('Bundler traces files, sorts shim', t => {
             {path: 'node_modules/jquery/dist/jquery.js', contents: 'define("jquery",[],1);', sourceMap: undefined},
             {path: 'node_modules/bootstrap/dist/bootstrap.js', contents: "define('bootstrap/dist/bootstrap',[\"jquery\"],function(){return jQuery;});define('bootstrap',['bootstrap/dist/bootstrap'],function(m){return m;});", sourceMap: undefined},
             // mockTrace didn't touch fs stub, it is different in real usage
-            {path: '__stub__/fs', contents: "define(function(){return {};});", sourceMap: undefined},
+            {path: '__stub__/fs.js', contents: "define(function(){return {};});", sourceMap: undefined},
             {contents: 'define.switchToUserSpace();'},
           ],
           config: {

spec/trace.spec.js

@@ -14,6 +14,35 @@ test('trace rejects not-matching packageName and moduleId', t => {
   })
 });
 
+test('trace does not reject moduleId which is same as packageName', t => {
+  const unit = {
+    path: '__stub__/fs.js',
+    contents: "define(function(){});",
+    moduleId: 'fs',
+    packageName: 'fs'
+  }
+  trace(unit).then(
+    traced => {
+      t.deepEqual(traced, {
+        path: '__stub__/fs.js',
+        contents: "define('fs',function(){});",
+        sourceMap: undefined,
+        moduleId: 'fs',
+        defined: 'fs',
+        deps: [],
+        packageName: 'fs',
+        shimed: undefined
+      });
+      t.end();
+    },
+    err => {
+      console.log(err.stack);
+      t.fail(err);
+      t.end();
+    }
+  );
+});
+
 test('trace traces js', t => {
   const unit = {
     path: 'src/foo/bar.js',

src/index.js

@@ -279,7 +279,7 @@ export default class Bundler {
         if (typeof stub === 'string') {
           p = p.then(() => this.capture({
             // not a real file path
-            path:'__stub__/' + bareId,
+            path:'__stub__/' + bareId + '.js',
             contents: stub,
             moduleId: bareId,
             packageName

src/trace.js

@@ -22,7 +22,7 @@ export default function (unit, opts = {}) {
   let shim = unit.shim;
   let shimed;
 
-  if (packageName && !moduleId.startsWith(packageName + '/')) {
+  if (packageName && (moduleId !== packageName && !moduleId.startsWith(packageName + '/'))) {
     return Promise.reject(new Error('module "' + moduleId + '" is not in package "' + packageName + '"'));
   }
 
@@ -117,7 +117,7 @@ export default function (unit, opts = {}) {
       const {parts, cleanId} = parse(unit.moduleId);
       let toSkip = 0;
 
-      if (DIST_FOLDERS.indexOf(parts[1].toLowerCase()) !== -1) {
+      if (parts.length > 2 && DIST_FOLDERS.indexOf(parts[1].toLowerCase()) !== -1) {
         toSkip = 1;
         if (parts.length > 3 && DIST_FAVORS.indexOf(parts[2].toLowerCase()) !== -1) {
           toSkip = 2;