From 176c2a6edd4e4eed906711e2e5208748ea611a93 Mon Sep 17 00:00:00 2001 From: antelle Date: Sun, 18 Aug 2019 07:58:23 +0200 Subject: [PATCH] moved the loader --- app/scripts/comp/updater.js | 2 +- app/scripts/util/signature-verifier.js | 2 +- webpack.config.js | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/scripts/comp/updater.js b/app/scripts/comp/updater.js index 7d2599ca..7541e39e 100644 --- a/app/scripts/comp/updater.js +++ b/app/scripts/comp/updater.js @@ -7,7 +7,7 @@ const UpdateModel = require('../models/update-model'); const Transport = require('../comp/transport'); const Logger = require('../util/logger'); const SemVer = require('../util/semver'); -const publicKey = require('raw-loader!../../resources/public-key.pem').default; +const publicKey = require('public-key.pem').default; const logger = new Logger('updater'); diff --git a/app/scripts/util/signature-verifier.js b/app/scripts/util/signature-verifier.js index 1958fdb6..7e040148 100644 --- a/app/scripts/util/signature-verifier.js +++ b/app/scripts/util/signature-verifier.js @@ -1,5 +1,5 @@ const Logger = require('./logger'); -const publicKey = require('raw-loader!../../resources/public-key.pem').default; +const publicKey = require('public-key.pem').default; const kdbxweb = require('kdbxweb'); const SignatureVerifier = { diff --git a/webpack.config.js b/webpack.config.js index 984e06fa..e3cd5504 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -65,7 +65,8 @@ function config(grunt, mode = 'production') { argon2: 'argon2-browser/dist/argon2.min.js', hbs: 'handlebars/runtime.js', 'argon2-wasm': 'argon2-browser/dist/argon2.wasm', - templates: path.join(__dirname, 'app/templates') + templates: path.join(__dirname, 'app/templates'), + 'public-key.pem': path.join(__dirname, 'app/resources/public-key.pem') } }, module: { @@ -116,7 +117,8 @@ function config(grunt, mode = 'production') { test: /fonts\/.*\.(woff2|ttf|eot|svg)/, use: ['url-loader', 'ignore-loader'] }, - { test: /\.woff$/, loader: 'url-loader' } + { test: /\.woff$/, loader: 'url-loader' }, + { test: /\.pem$/, loader: 'raw-loader' } ] }, optimization: {