Merge pull request #131 from GrabarzUndPartner/release

Release

Author: ThornWalli

Diff for: .branchlintrc

@@ -1,20 +1,33 @@
 {
   "branchNameLinter": {
-    "prefixes": ["feature", "hotfix", "release"],
+    "prefixes": [
+      "feature",
+      "hotfix",
+      "release",
+      "renovate"
+    ],
     "suggestions": {
       "features": "feature",
       "feat": "feature",
       "fix": "hotfix",
       "releases": "release"
     },
-    "banned": ["wip"],
-    "skip": ["skip-ci"],
-    "disallowed": ["master", "develop", "staging"],
+    "banned": [
+      "wip"
+    ],
+    "skip": [
+      "skip-ci"
+    ],
+    "disallowed": [
+      "master",
+      "develop",
+      "staging"
+    ],
     "seperator": "/",
     "msgBranchBanned": "Branches with the name \"%s\" are not allowed.",
     "msgBranchDisallowed": "Pushing to \"%s\" is not allowed, use git-flow.",
     "msgPrefixNotAllowed": "Branch prefix \"%s\" is not allowed.",
     "msgPrefixSuggestion": "Instead of \"%s\" try \"%s\".",
     "msgSeperatorRequired": "Branch \"%s\" must contain a seperator \"%s\"."
   }
-}
+}

Diff for: lib/module.js

@@ -71,6 +71,11 @@ function addTemplates (moduleScope, fonts, options) {
       fonts
     }
   })
+  moduleScope.addTemplate({
+    src: resolve(__dirname, 'utils/index.js'),
+    fileName: 'nuxt-font-loader-strategy/utils/index.js',
+    options: { }
+  })
   moduleScope.addTemplate({
     src: resolve(__dirname, 'utils/fontFace.js'),
     fileName: 'nuxt-font-loader-strategy/utils/fontFace.js',

Diff for: lib/utils/fontFace.js

@@ -1,5 +1,6 @@
 import { extname } from 'path'
 import { paramCase, snakeCase } from 'change-case'
+import { arrayFlat } from './index'
 
 // Font-Face
 
@@ -35,7 +36,7 @@ export function getFontClasses (pattern, set, properties) {
 
 export async function prepareFonts (options, resolve, kebabCaseProps = true) {
   const { fonts, classPattern } = options
-  return (await Promise.all(fonts.map((font) => {
+  const preparedFonts = (await Promise.all(fonts.map((font) => {
     const fileExtensions = getFileExtensions(font)
     return font.fontFaces.map((face) => {
       const sources = prepareSrc(face.src, fileExtensions, resolve)
@@ -53,7 +54,8 @@ export async function prepareFonts (options, resolve, kebabCaseProps = true) {
         local: [].concat(face.local || [])
       }
     })
-  }))).flat()
+  })))
+  return arrayFlat(preparedFonts)
 }
 
 export function createFontFace (font, baseUrl) {

Diff for: lib/utils/fontLoader.js

@@ -1,3 +1,5 @@
+import { arrayFlat } from './index'
+
 export function loadFonts (options) {
   options = Object.assign({
     ignoredEffectiveTypes: [],
@@ -74,7 +76,7 @@ export function isSlowConnection (ignoredEffectiveTypes) {
  * @return Boolean
  */
 export function isLighthouse () {
-  return new RegExp('(Speed Insights)|(Chrome-Lighthouse)').test(window.navigator.userAgent)
+  return /(Speed Insights)|(Chrome-Lighthouse)/.test(window.navigator.userAgent)
 }
 
 export function linkFeaturePrefetch () {
@@ -101,14 +103,6 @@ async function prefetchFonts (fonts, options, classList = []) {
   }
 }
 
-function arrayFlat (array) {
-  if ('flat' in Array.prototype) {
-    return array.flat()
-  } else {
-    return [].concat.apply([], array)
-  }
-}
-
 export function unlockClasses (classList, unlockDelay) {
   const cb = () => {
     document.documentElement.classList.add(...arrayFlat(classList))

Diff for: lib/utils/index.js

@@ -0,0 +1,8 @@
+
+export function arrayFlat (array) {
+  if ('flat' in Array.prototype) {
+    return array.flat()
+  } else {
+    return [].concat.apply([], array)
+  }
+}

Diff for: lib/worker/index.js

@@ -1,4 +1,5 @@
 import { resolve } from 'path'
+import { arrayFlat } from '../utils/index'
 
 export function addWebWorker (moduleScope, fonts, options) {
   const preparedFonts = prepareFonts(fonts)
@@ -47,7 +48,7 @@ function prepareFonts (fonts) {
     result.sources.push(sources[0].path)
     return result
   }, {
-    classes: fonts.map(font => font.classes).flat(),
+    classes: arrayFlat(fonts.map(font => font.classes)),
     sources: []
   })
 }