Merge pull request #3104 from omnivore-app/fix/macos-update-extension

Fix build on MacOS

pkg/extension/src/styles/cta-popup.css

@@ -1,101 +0,0 @@
-/**
- * Fonts
- */
-
-@font-face {
-  font-style: normal;
-  font-weight: 400;
-  font-family: Inter;
-  src:
-    local(""),
-    url("/fonts/inter-v3-latin-400.woff2") format("woff2");
-}
-
-@font-face {
-  font-style: normal;
-  font-weight: 600;
-  font-family: Inter;
-  src:
-    local(""),
-    url("/fonts/inter-v3-latin-600.woff2") format("woff2");
-}
-
-@font-face {
-  font-style: normal;
-  font-weight: 700;
-  font-family: Inter;
-  src:
-    local(""),
-    url("/fonts/inter-v3-latin-700.woff2") format("woff2");
-}
-
-/**
- * Other
- */
-
-html,
-body {
-  width: 100%;
-  height: 100%;
-}
-
-body {
-  margin: 0;
-}
-
-.cta-container {
-  position: relative;
-  overflow: hidden;
-  box-sizing: border-box;
-  width: 100%;
-  height: 100%;
-  padding: 24px 12px;
-  background: linear-gradient(150deg, #fff 55%, #ffde8c 55%);
-  background-color: #fff;
-  color: #3d3d3d;
-  font-family: Inter, sans-serif;
-  text-align: center;
-}
-
-.cta-container__wrapper {
-  position: relative;
-  z-index: 1;
-}
-
-.cta-container__title {
-  padding: 0 24px 24px;
-  font-weight: 600;
-  font-size: 16px;
-}
-
-.cta-container__icon {
-  vertical-align: unset;
-  margin-bottom: -4px;
-  fill: none;
-}
-
-.cta-container__link {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: 184px;
-  height: 34px;
-  margin: 36px auto 14px;
-  border-radius: 40px;
-  background-color: #fff;
-  color: inherit;
-  font-weight: 700;
-  font-size: 12px;
-  text-decoration: none;
-  cursor: pointer;
-}
-
-.cta-container__text {
-  margin: 0;
-  font-size: 12px;
-}
-
-.cta-container__textlink {
-  color: inherit;
-  font-weight: 700;
-}

pkg/extension/src/views/cta-popup.html

@@ -7,33 +7,6 @@
 
   <meta name="viewport" content="width=device-width,initial-scale=1">
 
-  <style>
- @font-face {
-  font-style: normal;
-  font-weight: 400;
-  font-family: Inter;
-  src:
-    local(""),
-    url("/fonts/inter-v3-latin-400.woff2") format("woff2");
-}
-
-@font-face {
-  font-style: normal;
-  font-weight: 600;
-  font-family: Inter;
-  src:
-    local(""),
-    url("/fonts/inter-v3-latin-600.woff2") format("woff2");
-}
-
-@font-face {
-  font-style: normal;
-  font-weight: 700;
-  font-family: Inter;
-  src:
-    local(""),
-    url("/fonts/inter-v3-latin-700.woff2") format("woff2");
-}
 
 html,
 body {
@@ -55,7 +28,7 @@ body {
   background: linear-gradient(150deg, #fff 55%, #ffde8c 55%);
   background-color: #fff;
   color: #3d3d3d;
-  font-family: Inter, sans-serif;
+  font-family: sans-serif;
   text-align: center;
 }
 

pkg/extension/src/views/toast.html

@@ -14,7 +14,7 @@
     border-radius: 4px;
     color: #3D3D3D;
     background: #fff;
-    font: 400 12px Inter, sans-serif;
+    font: 400 12px sans-serif;
     line-height: 20px;
     box-shadow: 0px 5px 20px rgba(32, 31, 29, 0.12);
     transition: all 300ms ease;
@@ -304,6 +304,7 @@
       fill: #898989;
     }
     .omnivore-save-button button {
+      margin-top: 10px;
       color: #333333;
     }
     #omnivore-toast-container #omnivore-edit-labels-list button {

pkg/extension/webpack.js

@@ -1,48 +1,42 @@
 /* Credit: https://github.com/paulmwatson/web-ext-environments.git */
-const CopyPlugin = require('copy-webpack-plugin');
-const DotenvPlugin = require('dotenv-webpack');
-const replaceWithProcessEnv = require('./replace-with-process-env.js');
-const { CleanWebpackPlugin } = require('clean-webpack-plugin');
-const path = require('path');
+const CopyPlugin = require('copy-webpack-plugin')
+const DotenvPlugin = require('dotenv-webpack')
+const replaceWithProcessEnv = require('./replace-with-process-env.js')
+const { CleanWebpackPlugin } = require('clean-webpack-plugin')
+const path = require('path')
 
-const env = process.env.EXT_ENV || 'local';
+const env = process.env.EXT_ENV || 'local'
 
 module.exports = () => {
-  const dotenvPath = __dirname + '/.env.' + env;
-  const envVars = require('dotenv').config({ path: dotenvPath }).parsed;
+  const dotenvPath = __dirname + '/.env.' + env
+  const envVars = require('dotenv').config({ path: dotenvPath }).parsed
   return {
     entry: path.resolve(__dirname, 'src') + '/scripts/background.js',
-    mode: (process.env.EXT_ENV === 'production') ? 'production' : 'development',
-    devtool: (process.env.EXT_ENV === 'production') ? undefined : 'source-map',
+    mode: process.env.EXT_ENV === 'production' ? 'production' : 'development',
+    devtool: process.env.EXT_ENV === 'production' ? undefined : 'source-map',
     output: {
       filename: 'scripts/background.js',
-      path: path.resolve(__dirname, 'dist')
+      path: path.resolve(__dirname, 'dist'),
     },
     plugins: [
       new CleanWebpackPlugin(),
-      new DotenvPlugin(
-        {
-          path: dotenvPath
-        }
-      ),
-      new CopyPlugin(
-        {
-          patterns: [
-            {
-              from: 'src/manifest.json',
-              transform (content) {
-                return replaceWithProcessEnv(content.toString(), envVars);
-              }
+      new DotenvPlugin({
+        path: dotenvPath,
+      }),
+      new CopyPlugin({
+        patterns: [
+          {
+            from: 'src/manifest.json',
+            transform(content) {
+              return replaceWithProcessEnv(content.toString(), envVars)
             },
-            { from: 'src/images', to: 'images' },
-            { from: 'src/scripts', to: 'scripts' },
-            { from: 'src/styles', to: 'styles' },
-            { from: 'src/fonts', to: 'fonts' },
-            { from: 'src/views', to: 'views' },
-            { from: 'src/_locales', to: '_locales' }
-          ]
-        }
-      )
-    ]
-  };
-};
+          },
+          { from: 'src/images', to: 'images' },
+          { from: 'src/scripts', to: 'scripts' },
+          { from: 'src/views', to: 'views' },
+          { from: 'src/_locales', to: '_locales' },
+        ],
+      }),
+    ],
+  }
+}