production condition, trailing paths slash

systemjs · Jan 17, 2016 · 48733d5 · 48733d5
1 parent d3b97d2
commit 48733d5
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 8 deletions.
diff --git a/compilers/cjs.js b/compilers/cjs.js
@@ -185,7 +185,7 @@ exports.compile = function(load, opts, loader) {
   for (var g in load.metadata.globals) {
     globals[g] = normalize && load.depMap[load.metadata.globals[g]] || load.metadata.globals[g];
   }
-  transformer = new CJSRegisterTransformer(!opts.anonymous && load.name, deps, load.path, opts.minify, globals, opts.systemGlobal);
+  transformer = new CJSRegisterTransformer(!opts.anonymous && load.name, deps, load.path, opts.production, globals, opts.systemGlobal);
   tree = transformer.transformAny(tree);
 
   var output = compiler.write(tree, load.path);

diff --git a/lib/builder.js b/lib/builder.js
@@ -331,6 +331,7 @@ function processTraceOpts(options, defaults) {
     // conditional tracing options
     browser: undefined,
     node: undefined,
+    production: true,
     traceAllConditionals: true,
     conditions: {},
     traceConditionsOnly: false,
@@ -364,6 +365,9 @@ function processTraceOpts(options, defaults) {
     opts.conditions['~@system-env|browser'] = opts.browser === true ? opts.node : !opts.browser;
     opts.conditions['@system-env|node'] = opts.node;
     opts.conditions['~@system-env|node'] = opts.node === true ? opts.browser : !opts.node;
+
+    opts.conditions['@system-env|production'] = opts.production;
+    opts.conditions['~@system-env|production'] = !opts.production;
   }
 
   return opts;
@@ -422,9 +426,9 @@ function processCompileOpts(options, defaults) {
     // conditionalResolutions: {}, 
     // can add a special object here that matches condition predicates to direct module names to use for sfx
 
-    // this shouldn't strictly be a compile option,
+    // this shouldn't strictly be a compile option (its a trace option)
     // but the cjs compiler needs it to do NODE_ENV optimization
-    minify: false,
+    production: true,
 
     // use rollup optimizations
     rollup: true

diff --git a/lib/utils.js b/lib/utils.js
@@ -157,11 +157,13 @@ function getCanonicalNamePlain(loader, normalized, isPlugin) {
 
     var curPath = normalizePath(loader, p, isPlugin);
 
-    if (normalized === curPath) {
-      // always stop on first exact match
-      pathMatch = p;
-      break;
-    }
+    // always stop on first exact match
+    if (normalized === curPath)
+      return p;
+
+    // support trailing / in paths rules
+    else if (normalized.substr(0, curPath.length - 1) == curPath.substr(0, curPath.length - 1) && (normalized.length < curPath.length || normalized[curPath.length - 1] == curPath[curPath.length - 1]) && curPath[curPath.length - 1] == '/')
+      return p.substr(0, p.length - 1) + (normalized.length > curPath.length ? '/' + normalized.substr(curPath.length) : '');
   }
 
   // then wildcard matches

diff --git a/test/canonicals.js b/test/canonicals.js
@@ -29,4 +29,16 @@ suite('Canonical Names', function() {
     assert.equal(builder.getCanonicalName('cjs'), 'cjs');
     assert.equal(builder.getCanonicalName(baseURL + 'test/dummy/file.jade!' + baseURL + 'test/fixtures/test-tree/jade.js'), 'file.jade!jade');
   });
+
+  test('Trailing / canonical', function() {
+    builder.loader.defaultJSExtensions = false;
+    builder.config({
+      paths: {
+        'trailing/': 'src/'
+      }
+    });
+    assert.equal(builder.getCanonicalName(baseURL + 'src/asdf'), 'trailing/asdf');
+    assert.equal(builder.getCanonicalName(baseURL + 'src/'), 'trailing/');
+    assert.equal(builder.getCanonicalName(baseURL + 'src'), 'trailing');
+  })
 });