Merge branch 'embed-fonts' into 'master'

embed fonts See merge request platform-one/private/bullhorn/platform1-site!20

Merge branch 'embed-fonts' into 'master'
fed40d75 · graham.smith · 986d84d4 · 96a3e121 · fed40d75 · fed40d75
Commit fed40d75 authored 4 years ago by graham.smith
--- a/package-lock.json
+++ b/package-lock.json
@@ -1014,6 +1014,18 @@
        "to-fast-properties": "^2.0.0"
      }
    },
+    "@beyonk/google-fonts-webpack-plugin": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/@beyonk/google-fonts-webpack-plugin/-/google-fonts-webpack-plugin-1.2.3.tgz",
+      "integrity": "sha512-QtWDQJmfqJrIuC6tZNNKYV9/+upRlGnu+11ycrSS22MutpSYeeqDzsSHUc0qKxfaiOAn4ASg13tj7EED5Wy68A==",
+      "dev": true,
+      "requires": {
+        "lodash": "^4.17.4",
+        "node-fetch": "^2.1.2",
+        "webpack-sources": "^1.1.0",
+        "yauzl": "^2.8.0"
+      }
+    },
    "@cnakazawa/watch": {
      "version": "1.0.4",
      "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz",

--- a/package.json
+++ b/package.json
@@ -24,6 +24,7 @@
  },
  "devDependencies": {
    "@babel/plugin-transform-strict-mode": "^7.8.3",
+    "@beyonk/google-fonts-webpack-plugin": "^1.2.3",
    "@vue/cli-plugin-babel": "~4.3.0",
    "@vue/cli-plugin-e2e-cypress": "~4.3.0",
    "@vue/cli-plugin-eslint": "~4.3.0",

--- a/public/index.html
+++ b/public/index.html
@@ -8,19 +8,6 @@
      content="width=device-width,initial-scale=1.0,shrink-to-fit=no"
    />
    <link rel="icon" type="image/png" sizes="502x498" href="./static/p1-logo.png" />
-    <link
-      href="//fonts.googleapis.com/css2?family=Open+Sans:wght@400;600;800&display=swap"
-      rel="stylesheet"
-    />
-    <link
-      rel="stylesheet"
-      type="text/css"
-      href="//fonts.googleapis.com/css2?family=Catamaran&display=swap"
-    />
-    <link
-      href="https://fonts.googleapis.com/css2?family=Anton&display=swap"
-      rel="stylesheet"
-    />
  </head>
  <body>
    <noscript>

--- a/src/App.vue
+++ b/src/App.vue
@@ -71,7 +71,6 @@ body {
  h4,
  h5,
  h6 {
-    // font-family: "Catamaran", sans-serif;
    font-family: "Open Sans", sans-serif;
    text-transform: uppercase;
    font-weight: 800;

--- a/vue.config.js
+++ b/vue.config.js
+const GoogleFontsPlugin = require("@beyonk/google-fonts-webpack-plugin");
+
 module.exports = {
  publicPath: ".",
  chainWebpack: config => {
@@ -15,7 +17,28 @@ module.exports = {
      .loader("vue-svg-loader");
  },
  configureWebpack: {
-    devtool: "source-map"
+    devtool: "source-map",
+    plugins: [
+      new GoogleFontsPlugin({
+        fonts: [
+          {
+            family: "Open Sans",
+            variants: [
+              "400",
+              "600",
+              "800",
+            ],
+          },
+          {
+            family: "Anton",
+            variants: [
+              "400",
+            ],
+          },
+        ],
+      }),
+    ],
+
  },
  css: {
    loaderOptions: {