From 63d86befd3431fe8e1500e22f4f115a3762d000a Mon Sep 17 00:00:00 2001
From: falsandtru <falsandtru@users.noreply.github.com>
Date: Tue, 13 Sep 2022 20:48:30 +0900
Subject: [PATCH] fix: pass integrity value

---
 docs/config/02-files.md  |  4 ++--
 lib/config.js            |  2 +-
 test/unit/config.spec.js | 16 ++++++++++++++--
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/docs/config/02-files.md b/docs/config/02-files.md
index 0bab8256c..21b719036 100644
--- a/docs/config/02-files.md
+++ b/docs/config/02-files.md
@@ -15,7 +15,7 @@ The `files` array determines which files are included in the browser, watched, a
 * **Default.** Will attempt to determine type based on file extension. If that fails, defaults to `js`.
 * **Possible Values:**
   * `css` - Include using `<link rel="stylesheet">` tag.
-  * `html` - Include using [HTML Imports](https://developer.mozilla.org/en-US/docs/Web/Web_Components/HTML_Imports). Note that this feature is obsolete and does not work in the modern browsers. 
+  * `html` - Include using [HTML Imports](https://developer.mozilla.org/en-US/docs/Web/Web_Components/HTML_Imports). Note that this feature is obsolete and does not work in the modern browsers.
   * `js` - Include using `<script></script>` tag.
   * `module` - Include using `<script type="module"></script>` tag.
   * `dom` - Inline content of the file in the page. This can be used, for example, to test components combining HTML and JS.
@@ -57,7 +57,7 @@ The `files` array determines which files are included in the browser, watched, a
 ### `integrity`
 * **Type.** String
 * **Default.** `undefined`
-* **Description.** Set the `integrity` HTML attribute value to the `<script>` or the `<link>` tag to load the resource that matches the given pattern if the pattern is an absolute URL.
+* **Description.** Set the `integrity` HTML attribute value to the `<script>` or the `<link>` tag loading the resource that matches the given pattern if the pattern is an absolute URL.
 
 ## Pattern matching and `basePath`
 - All of the relative patterns will get resolved using the `basePath` first.
diff --git a/lib/config.js b/lib/config.js
index 0dff33c99..f98a34ccb 100644
--- a/lib/config.js
+++ b/lib/config.js
@@ -62,7 +62,7 @@ function createPatternObject (pattern) {
       : new Pattern(pattern)
   } else if (helper.isObject(pattern) && pattern.pattern && helper.isString(pattern.pattern)) {
     return helper.isUrlAbsolute(pattern.pattern)
-      ? new UrlPattern(pattern.pattern, pattern.type)
+      ? new UrlPattern(pattern.pattern, pattern.type, pattern.integrity)
       : new Pattern(pattern.pattern, pattern.served, pattern.included, pattern.watched, pattern.nocache, pattern.type)
   } else {
     log.warn(`Invalid pattern ${pattern}!\n\tExpected string or object with "pattern" property.`)
diff --git a/test/unit/config.spec.js b/test/unit/config.spec.js
index ddab67910..55e6780dd 100644
--- a/test/unit/config.spec.js
+++ b/test/unit/config.spec.js
@@ -453,13 +453,18 @@ describe('config', () => {
     it('should convert patterns to objects and set defaults', () => {
       const config = normalizeConfigWithDefaults({
         basePath: '/base',
-        files: ['a/*.js', { pattern: 'b.js', watched: false, included: false }, { pattern: 'c.js' }],
+        files: [
+          'a/*.js',
+          { pattern: 'b.js', watched: false, included: false },
+          { pattern: 'c.js' },
+          { pattern: 'http://localhost/d.js', integrity: 'sha256-XXX' }
+        ],
         customContextFile: 'context.html',
         customDebugFile: 'debug.html',
         customClientContextFile: 'client_with_context.html'
       })
 
-      expect(config.files.length).to.equal(3)
+      expect(config.files.length).to.equal(4)
 
       let file = config.files.shift()
       expect(file.pattern).to.equal(resolveWinPath('/base/a/*.js'))
@@ -479,6 +484,13 @@ describe('config', () => {
       expect(file.served).to.equal(true)
       expect(file.watched).to.equal(true)
 
+      file = config.files.shift()
+      expect(file.pattern).to.equal('http://localhost/d.js')
+      expect(file.included).to.equal(true)
+      expect(file.served).to.equal(false)
+      expect(file.watched).to.equal(false)
+      expect(file.integrity).to.equal('sha256-XXX')
+
       expect(config.customContextFile).to.equal(resolveWinPath('/base/context.html'))
       expect(config.customDebugFile).to.equal(resolveWinPath('/base/debug.html'))
       expect(config.customClientContextFile).to.equal(resolveWinPath('/base/client_with_context.html'))