Update parser to treat file extensions as case-insensitive (#743)

brandon93s · devongovett · commit ab713a32a505 · 2018-02-04T19:25:34.000-08:00
diff --git a/src/Parser.js b/src/Parser.js
@@ -49,15 +49,15 @@ class Parser {
       ext = '.' + ext;
     }
 
-    this.extensions[ext] = parser;
+    this.extensions[ext.toLowerCase()] = parser;
   }
 
   findParser(filename) {
     if (glob.hasMagic(filename)) {
       return GlobAsset;
     }
 
-    let extension = path.extname(filename);
+    let extension = path.extname(filename).toLowerCase();
     let parser = this.extensions[extension] || RawAsset;
     if (typeof parser === 'string') {
       parser = this.extensions[extension] = require(parser);
diff --git a/test/integration/parser-case-insensitive-ext/icons.SVG b/test/integration/parser-case-insensitive-ext/icons.SVG
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <symbol viewBox="0 0 14 16" id="icon-code" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M9.5 3L8 4.5 11.5 8 8 11.5 9.5 13 14 8 9.5 3zm-5 0L0 8l4.5 5L6 11.5 2.5 8 6 4.5 4.5 3z"/></symbol>
+  <symbol viewBox="0 0 12 16" id="icon-gist" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M7.5 5L10 7.5 7.5 10l-.75-.75L8.5 7.5 6.75 5.75 7.5 5zm-3 0L2 7.5 4.5 10l.75-.75L3.5 7.5l1.75-1.75L4.5 5zM0 13V2c0-.55.45-1 1-1h10c.55 0 1 .45 1 1v11c0 .55-.45 1-1 1H1c-.55 0-1-.45-1-1zm1 0h10V2H1v11z"/></symbol>
+</svg>
diff --git a/test/integration/parser-case-insensitive-ext/index.cSs b/test/integration/parser-case-insensitive-ext/index.cSs
@@ -0,0 +1,3 @@
+body {
+  background: red;
+}
diff --git a/test/integration/parser-case-insensitive-ext/index.html b/test/integration/parser-case-insensitive-ext/index.html
@@ -0,0 +1,17 @@
+<!doctype html>
+<html>
+<head>
+  <link rel="stylesheet" href="index.cSs" />
+</head>
+<body>
+  <h1>Hello world</h1>
+  <p>Linking to <a href="other.HTM">another page</a></p>
+  <a href="#hash_link">Hash link</a>
+  <a href="mailto:someone@acme.com">Mailto link</a>
+  <a href="tel:+33636757575">Tel link</a>
+  <script src="index.js"></script>
+  <script src="https://unpkg.com/parcel-bundler"></script>
+  <i>hello</i> <i>world</i>
+  <svg><use xlink:href="icons.SVG#icon-repo-pull"></use></svg>
+</body>
+</html>
diff --git a/test/integration/parser-case-insensitive-ext/index.js b/test/integration/parser-case-insensitive-ext/index.js
@@ -0,0 +1 @@
+alert('Hi');
diff --git a/test/integration/parser-case-insensitive-ext/other.HTM b/test/integration/parser-case-insensitive-ext/other.HTM
@@ -0,0 +1,10 @@
+<!doctype html>
+<html>
+<head>
+  <link rel="stylesheet" href="index.cSs" />
+</head>
+<body>
+  <h1>Other page</h1>
+  <script src="index.js"></script>
+</body>
+</html>
diff --git a/test/parser.js b/test/parser.js
@@ -0,0 +1,66 @@
+const assert = require('assert');
+const fs = require('fs');
+const {bundle, assertBundleTree} = require('./utils');
+
+describe('parser', function() {
+  it('should support case-insensitive file extension', async function() {
+    let b = await bundle(
+      __dirname + '/integration/parser-case-insensitive-ext/index.html'
+    );
+
+    assertBundleTree(b, {
+      name: 'index.html',
+      assets: ['index.html'],
+      childBundles: [
+        {
+          type: 'svg',
+          assets: ['icons.SVG'],
+          childBundles: []
+        },
+        {
+          type: 'css',
+          assets: ['index.cSs'],
+          childBundles: []
+        },
+        {
+          type: 'js',
+          assets: ['index.js'],
+          childBundles: [
+            {
+              type: 'map'
+            }
+          ]
+        },
+        {
+          type: 'html',
+          assets: ['other.HTM'],
+          childBundles: [
+            {
+              type: 'css',
+              assets: ['index.cSs'],
+              childBundles: []
+            },
+            {
+              type: 'js',
+              assets: ['index.js'],
+              childBundles: [
+                {
+                  type: 'map'
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    });
+
+    let files = fs.readdirSync(__dirname + '/dist');
+    let html = fs.readFileSync(__dirname + '/dist/index.html');
+    for (let file of files) {
+      let ext = file.match(/\.([0-9a-z]+)(?:[?#]|$)/i)[0];
+      if (file !== 'index.html' && ext !== '.map') {
+        assert(html.includes(file));
+      }
+    }
+  });
+});
diff --git a/test/utils.js b/test/utils.js
@@ -147,7 +147,7 @@ function assertBundleTree(bundle, tree) {
   }
 
   if (tree.type) {
-    assert.equal(bundle.type, tree.type);
+    assert.equal(bundle.type.toLowerCase(), tree.type.toLowerCase());
   }
 
   if (tree.assets) {

Original file line number	Diff line number	Diff line change
`@@ -49,15 +49,15 @@ class Parser {`
`49`	`49`	`ext = '.' + ext;`
`50`	`50`	`}`
`51`	`51`
`52`		`- this.extensions[ext] = parser;`
	`52`	`+ this.extensions[ext.toLowerCase()] = parser;`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`findParser(filename) {`
`56`	`56`	`if (glob.hasMagic(filename)) {`
`57`	`57`	`return GlobAsset;`
`58`	`58`	`}`
`59`	`59`
`60`		`- let extension = path.extname(filename);`
	`60`	`+ let extension = path.extname(filename).toLowerCase();`
`61`	`61`	`let parser = this.extensions[extension] \|\| RawAsset;`
`62`	`62`	`if (typeof parser === 'string') {`
`63`	`63`	`parser = this.extensions[extension] = require(parser);`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ function assertBundleTree(bundle, tree) {`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`if (tree.type) {`
`150`		`- assert.equal(bundle.type, tree.type);`
	`150`	`+ assert.equal(bundle.type.toLowerCase(), tree.type.toLowerCase());`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`if (tree.assets) {`