commonjs-everywhere - npm Package Compare versions

Comparing version 0.9.6 to 0.9.7

lib/bundle.js

 // Generated by CoffeeScript 2.0.0-beta8
 void function () {
-  var canonicalise, esprima, PRELUDE, PRELUDE_NODE, wrapFile;
+  var AMD_WRAPPER, amdWrap, ANONYMOUS_AMD_WRAPPER, canonicalise, esprima, exportAs, IIFE_WRAPPER, PRELUDE, PRELUDE_NODE, wrapFile;
   esprima = require('esprima');
   canonicalise = require('./canonicalise');
   PRELUDE_NODE = "\nvar process = function(){\n  var cwd = '/';\n  return {\n    title: 'browser',\n    version: '" + process.version + "',\n    browser: true,\n    env: {},\n    argv: [],\n    nextTick: global.setImmediate || function(fn){ setTimeout(fn, 0); },\n    cwd: function(){ return cwd; },\n    chdir: function(dir){ cwd = dir; }\n  };\n}();";
-  PRELUDE = "\nfunction require(file, parentModule){\n  if({}.hasOwnProperty.call(require.cache, file))\n    return require.cache[file];\n\n  var resolved = require.resolve(file);\n  if(!resolved) throw new Error('Failed to resolve module ' + file);\n\n  var module$ = {\n    id: file,\n    require: require,\n    filename: file,\n    exports: {},\n    loaded: false,\n    parent: parentModule,\n    children: []\n  };\n  if(parentModule) parentModule.children.push(module$);\n  var dirname = file.slice(0, file.lastIndexOf('/') + 1);\n\n  require.cache[file] = module$.exports;\n  resolved.call(module$.exports, module$, module$.exports, dirname, file);\n  module$.loaded = true;\n  return require.cache[file] = module$.exports;\n}\n\nrequire.modules = {};\nrequire.cache = {};\n\nrequire.resolve = function(file){\n  return {}.hasOwnProperty.call(require.modules, file) ? require.modules[file] : void 0;\n};\nrequire.define = function(file, fn){ require.modules[file] = fn; };";
+  PRELUDE = "function require(file, parentModule){\n  if({}.hasOwnProperty.call(require.cache, file))\n    return require.cache[file];\n\n  var resolved = require.resolve(file);\n  if(!resolved) throw new Error('Failed to resolve module ' + file);\n\n  var module$ = {\n    id: file,\n    require: require,\n    filename: file,\n    exports: {},\n    loaded: false,\n    parent: parentModule,\n    children: []\n  };\n  if(parentModule) parentModule.children.push(module$);\n  var dirname = file.slice(0, file.lastIndexOf('/') + 1);\n\n  require.cache[file] = module$.exports;\n  resolved.call(module$.exports, module$, module$.exports, dirname, file);\n  module$.loaded = true;\n  return require.cache[file] = module$.exports;\n}\n\nrequire.modules = {};\nrequire.cache = {};\n\nrequire.resolve = function(file){\n  return {}.hasOwnProperty.call(require.modules, file) ? require.modules[file] : void 0;\n};\nrequire.define = function(file, fn){ require.modules[file] = fn; };";
   wrapFile = function (name, program) {
@@ -19,4 +19,41 @@ var wrapper, wrapperProgram;
   };
+  ANONYMOUS_AMD_WRAPPER = "(function(exported) {\n  if (typeof define === 'function' && define.amd)\n    define([], function() { return exported; });\n  if (typeof exports === 'object')\n    module.exports = exported;\n}(_));";
+  AMD_WRAPPER = "(function(exported) {\n  if (typeof define === 'function' && define.amd)\n    define(_, [], function() { return exported; });\n  if (typeof exports === 'object')\n    module.exports = exported;\n  else\n    _;\n}(_));";
+  amdWrap = function (maybeExport, requireEntryPoint) {
+    var wrapper;
+    wrapper = esprima.parse(null != maybeExport ? AMD_WRAPPER : ANONYMOUS_AMD_WRAPPER);
+    wrapper.body[0].expression['arguments'][0] = requireEntryPoint;
+    if (null != maybeExport) {
+      wrapper.body[0].expression.callee.body.body[1].alternate.expression = exportAs(maybeExport, wrapper.body[0].expression.callee.params[0]);
+      wrapper.body[0].expression.callee.body.body[0].consequent.expression['arguments'][0] = {
+        type: 'Literal',
+        value: maybeExport
+      };
+    }
+    return wrapper;
+  };
+  IIFE_WRAPPER = '(function(global){ /* ... */ }).call(this, this);';
+  exportAs = function (exportString, requireEntryPoint) {
+    var exportExpression;
+    exportExpression = esprima.parse(exportString).body[0].expression;
+    return {
+      type: 'AssignmentExpression',
+      operator: '=',
+      right: requireEntryPoint,
+      left: exportExpression.type === 'Identifier' ? {
+        type: 'MemberExpression',
+        computed: false,
+        object: {
+          type: 'Identifier',
+          name: 'global'
+        },
+        property: {
+          type: 'Identifier',
+          name: exportExpression.name
+        }
+      } : exportExpression
+    };
+  };
   module.exports = function (processed, entryPoint, root, options) {
-    var ast, exportExpression, filename, iife, lhsExpression, prelude, program, requireEntryPoint;
+    var ast, filename, iife, prelude, program, requireEntryPoint;
     prelude = (null != options.node ? options.node : true) ? '' + PRELUDE + '\n' + PRELUDE_NODE : PRELUDE;
@@ -41,32 +78,11 @@ program = esprima.parse(prelude);
     };
-    if (null != options['export']) {
-      exportExpression = esprima.parse(options['export']).body[0].expression;
-      lhsExpression = exportExpression.type === 'Identifier' ? {
-        type: 'MemberExpression',
-        computed: false,
-        object: {
-          type: 'Identifier',
-          name: 'global'
-        },
-        property: {
-          type: 'Identifier',
-          name: exportExpression.name
-        }
-      } : exportExpression;
-      program.body.push({
-        type: 'ExpressionStatement',
-        expression: {
-          type: 'AssignmentExpression',
-          operator: '=',
-          left: lhsExpression,
-          right: requireEntryPoint
-        }
-      });
+    if (options.amd) {
+      program.body.push(amdWrap(options['export'], requireEntryPoint));
     } else {
       program.body.push({
         type: 'ExpressionStatement',
-        expression: requireEntryPoint
+        expression: null != options['export'] ? exportAs(options['export'], requireEntryPoint) : requireEntryPoint
       });
     }
-    iife = esprima.parse('(function(global){}).call(this, this);');
+    iife = esprima.parse(IIFE_WRAPPER);
     iife.body[0].expression.callee.object.body.body = program.body;
@@ -73,0 +89,0 @@ iife.leadingComments = [{

lib/command.js

 // Generated by CoffeeScript 2.0.0-beta8
 void function () {
-  var $0, _, aliasPair, btoa, build, cache$3, cache$4, CJSEverywhere, dep, deps, escodegen, escodegenFormat, fs, handlerPair, knownOpts, match, nopt, opt, optAliases, options, originalEntryPoint, path, positionalArgs, root, startBuild, stdinput;
+  var $0, _, aliasPair, btoa, build, cache$3, cache$4, CJSEverywhere, dep, deps, escodegen, escodegenFormat, fs, handlerPair, knownOpts, match, nopt, opt, optAliases, options, originalEntryPoint, path, positionalArgs, relativeResolve, root, startBuild, stdinput;
   fs = require('fs');
@@ -10,2 +10,3 @@ path = require('path');
   CJSEverywhere = require('./module');
+  relativeResolve = require('./relative-resolve');
   escodegenFormat = {
@@ -23,2 +24,3 @@ indent: {
   for (var cache$ = [
+        'amd',
         'deps',
@@ -116,2 +118,4 @@ 'help',
   delete options.alias;
+  root = options.root ? path.resolve(options.root) : process.cwd();
+  originalEntryPoint = positionalArgs[0];
   options.handlers = {};
@@ -123,3 +127,10 @@ for (var i$4 = 0, length$4 = options.handler.length; i$4 < length$4; ++i$4) {
       (function (ext, mod) {
-        return options.handlers[ext] = require(mod);
+        var resolved;
+        resolved = relativeResolve({
+          extensions: Object.keys(require.extensions),
+          root: root,
+          cwd: process.cwd(),
+          path: mod
+        });
+        return options.handlers[ext] = require(resolved.filename);
       }('.' + match[1], match[2]));
@@ -132,4 +143,2 @@ } else {
   delete options.handler;
-  root = options.root ? path.resolve(options.root) : process.cwd();
-  originalEntryPoint = positionalArgs[0];
   if (options.deps) {
@@ -136,0 +145,0 @@ deps = CJSEverywhere.traverseDependencies(originalEntryPoint, root, options);

package.json

 {
   "name": "commonjs-everywhere",
-  "version": "0.9.6",
+  "version": "0.9.7",
   "description": "CommonJS browser bundler with aliasing, extensibility, and source maps from the minified JS bundle",
@@ -35,7 +35,7 @@ "homepage": "https://github.com/michaelficarra/commonjs-everywhere",
   "dependencies": {
-    "Base64": "~0.1.2",
-    "coffee-script-redux": "2.0.0-beta7",
+    "Base64": "0.2.x",
+    "coffee-script-redux": "2.0.0-beta8",
     "esprima": "1.x.x",
-    "estraverse": "1.3.x",
-    "escodegen": "~1.1.0",
+    "estraverse": "1.5.x",
+    "escodegen": "1.2.x",
     "esmangle": "~1.0.0",
@@ -42,0 +42,0 @@ "MD5": "~1.2",

New alerts

Dynamic require

Supply chain risk

Dynamic require can indicate the package is performing dangerous or unsafe dynamic code execution.

Found 1 instance in 1 package

Fixed alerts

Dynamic require

Supply chain risk

Dynamic require can indicate the package is performing dangerous or unsafe dynamic code execution.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

1868789

increased by0.1%

Lines of code

18488

increased by0.14%

Dependency changes

• + Addedcoffee-script-redux@2.0.0-beta8(transitive)

• + Addedescodegen@1.2.0(transitive)

• - RemovedBase64@0.1.4(transitive)

• - Removedcoffee-script-redux@2.0.0-beta7(transitive)

• - Removedescodegen@1.1.0(transitive)

• UpdatedBase64@0.2.x

• Updatedcoffee-script-redux@2.0.0-beta8

• Updatedescodegen@1.2.x

• Updatedestraverse@1.5.x