0.3alpha21 - preliminary dependencies.noWeb

anodynos · Feb 12, 2013 · ce46ce4 · ce46ce4
1 parent 72019fe
commit ce46ce4
Show file tree

Hide file tree

Showing 21 changed files with 160 additions and 77 deletions.
diff --git a/build/code/NodeRequirer.js b/build/code/NodeRequirer.js
diff --git a/build/code/config/uRequireConfigMasterDefaults.js b/build/code/config/uRequireConfigMasterDefaults.js
diff --git a/build/code/moduleManipulation/ModuleManipulator.js b/build/code/moduleManipulation/ModuleManipulator.js
diff --git a/build/code/moduleManipulation/seekr.js b/build/code/moduleManipulation/seekr.js
diff --git a/build/code/paths/upath.js b/build/code/paths/upath.js
diff --git a/build/code/process/Bundle.js b/build/code/process/Bundle.js
diff --git a/build/code/process/BundleBase.js b/build/code/process/BundleBase.js
diff --git a/build/code/process/UModule.js b/build/code/process/UModule.js
diff --git a/build/code/templates/AlmondOptimizationTemplate.js b/build/code/templates/AlmondOptimizationTemplate.js
diff --git a/build/code/urequireCmd.js b/build/code/urequireCmd.js
@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 
 /*!
-* urequire - version 0.3.0alpha20
-* Compiled on 2013-02-05
+* urequire - version 0.3.0alpha21
+* Compiled on 2013-02-13
 * git://github.com/anodynos/urequire
 * Copyright(c) 2013 Agelos Pikoulas (agelos.pikoulas@gmail.com )
 * Licensed MIT http://www.opensource.org/licenses/mit-license.php

diff --git a/build/code/utils/Logger.js b/build/code/utils/Logger.js
@@ -1,4 +1,4 @@
-var VERSION = '0.3.0alpha20'; //injected by grunt:concat
+var VERSION = '0.3.0alpha21'; //injected by grunt:concat
 
 // Generated by CoffeeScript 1.4.0
 var Logger, _,

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "urequire",
  "description": "Module converter: write modular code once, convert to UMD and run/test on AMD (browser/requirejs) & nodejs.",
- "version": "0.3.0alpha20",
+ "version": "0.3.0alpha21",
  "homepage": "https://github.com/anodynos/urequire",
  "author": {
   "name": "Agelos Pikoulas",
@@ -41,7 +41,7 @@
   "node": "*"
  },
  "dependencies": {
-  "lodash": "0.10.x",
+  "lodash": "*",
   "underscore.string":"*",
   "uberscore": ">=0.0.5",
   "commander": "1.1.x",

diff --git a/source/code/NodeRequirer.coffee b/source/code/NodeRequirer.coffee
@@ -169,7 +169,7 @@ class NodeRequirer extends BundleBase
       if @getRequireJSConfig().paths
         requireJsConf.paths = {}
         for pathName, pathEntries of @getRequireJSConfig().paths
-          if not _(pathEntries).isArray()
+          if not _.isArray(pathEntries)
             pathEntries = [ pathEntries ]
 
           requireJsConf.paths[pathName] or= []
@@ -224,7 +224,7 @@ class NodeRequirer extends BundleBase
           try
             loadedModule = @nodeRequire _modulePath
           catch err
-            if err1 is undefined or not _(err.toString()).startsWith "Error: Cannot find module" # prefer to keep 'generic' errors in err1
+            if err1 is undefined or not _.startsWith(err.toString(), "Error: Cannot find module") # prefer to keep 'generic' errors in err1
               err1 = err
 
             l.debug 35, "FAILED: @nodeRequire '#{_modulePath}' \n err=\n", err
@@ -327,10 +327,10 @@ class NodeRequirer extends BundleBase
       strDeps # type: [ 'String', '[]<String>' ]
       callback  # type: '()->'
   )=>
-    if _(strDeps).isString() # String - synchronous call
+    if _.isString strDeps # String - synchronous call
       return @loadModule new Dependency strDeps, @moduleNameBR
     else
-      if _(strDeps).isArray() # we have an []<String>:
+      if _.isArray strDeps # we have an []<String>:
         deps = [] # []<Dependency>
 
         #isAllCached = true # not needed anymore
@@ -348,7 +348,7 @@ class NodeRequirer extends BundleBase
 
           # todo: should we check cb, before wasting time requiring modules ?
           #       Or maybe it was intentional, for caching modules asynchronously.
-          if _(callback).isFunction()
+          if _.isFunction callback
             callback.apply null, loadedDeps
 
 #            if isAllCached #load *synchronously* (matching RequireJS's behaviour, when all modules are already loaded/cached!)