Upgrade some more dependencies
This commit is contained in:
Generated
+2842
-2667
File diff suppressed because it is too large
Load Diff
+8
-9
@@ -9,9 +9,9 @@
|
||||
"prettier": "prettier \"src/**/*.{js,vue}\"",
|
||||
"prettier:write": "npm run prettier -- --write",
|
||||
"prettier:check": "prettier --check \"src/**/*.{js,vue}\"",
|
||||
"build": "cross-env NODE_ENV=production webpack --hide-modules",
|
||||
"build:beta": "cross-env NODE_ENV=production BETA=1 webpack --hide-modules",
|
||||
"build:dev": "cross-env NODE_ENV=development BETA=1 webpack --hide-modules",
|
||||
"build": "cross-env NODE_ENV=production webpack",
|
||||
"build:beta": "cross-env NODE_ENV=production BETA=1 webpack",
|
||||
"build:dev": "cross-env NODE_ENV=development BETA=1 webpack",
|
||||
"build-zip": "node scripts/build-zip.js",
|
||||
"watch": "npm run build -- --watch",
|
||||
"watch:dev": "cross-env HMR=true npm run build:dev -- --watch",
|
||||
@@ -32,7 +32,6 @@
|
||||
"vue-js-modal": "^1.3.35",
|
||||
"vue-js-toggle-button": "^1.3.3",
|
||||
"vue-router": "^3.5.2",
|
||||
"vue-textarea-autosize": "^1.1.1",
|
||||
"vue-toasted": "^1.1.28",
|
||||
"webextension-polyfill": "^0.9.0"
|
||||
},
|
||||
@@ -44,21 +43,21 @@
|
||||
"@babel/runtime-corejs3": "^7.4.0",
|
||||
"archiver": "^3.0.0",
|
||||
"babel-loader": "^8.0.2",
|
||||
"copy-webpack-plugin": "^4.5.3",
|
||||
"core-js": "^3.0.1",
|
||||
"copy-webpack-plugin": "^6.4.1",
|
||||
"core-js": "^3.22.7",
|
||||
"cross-env": "^5.2.0",
|
||||
"css-loader": "^2.1.1",
|
||||
"ejs": "^3.1.8",
|
||||
"file-loader": "^1.1.11",
|
||||
"file-loader": "^6.2.0",
|
||||
"mini-css-extract-plugin": "^0.4.4",
|
||||
"prettier": "^2.0.5",
|
||||
"prettier": "^2.6.2",
|
||||
"sass": "^1.52.1",
|
||||
"sass-loader": "^10.1.1",
|
||||
"vue-loader": "^15.4.2",
|
||||
"vue-template-compiler": "^2.6.14",
|
||||
"web-ext-types": "^2.1.0",
|
||||
"webpack": "^4.46.0",
|
||||
"webpack-cli": "^3.3.12",
|
||||
"webpack-cli": "^4.9.2",
|
||||
"webpack-extension-reloader": "^1.1.4"
|
||||
}
|
||||
}
|
||||
|
||||
+1
-4
@@ -10,7 +10,6 @@ import * as Integrations from "@sentry/integrations";
|
||||
import VModal from "vue-js-modal";
|
||||
import VueRouter from "vue-router";
|
||||
import ToggleButton from "vue-js-toggle-button";
|
||||
import TextareaAutosize from "vue-textarea-autosize";
|
||||
|
||||
import { library } from "@fortawesome/fontawesome-svg-core";
|
||||
import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
|
||||
@@ -60,8 +59,7 @@ async function initApp() {
|
||||
process.env.NODE_ENV !== "development"
|
||||
) {
|
||||
Sentry.init({
|
||||
dsn:
|
||||
"https://0e2d03e61f194df9ba85a791d364088b@o336535.ingest.sentry.io/5341174",
|
||||
dsn: "https://0e2d03e61f194df9ba85a791d364088b@o336535.ingest.sentry.io/5341174",
|
||||
integrations: [
|
||||
new Integrations.Vue({ Vue, attachProps: true, logErrors: true }),
|
||||
],
|
||||
@@ -75,7 +73,6 @@ async function initApp() {
|
||||
Vue.use(VModal, { dialog: true });
|
||||
Vue.use(VueRouter);
|
||||
Vue.use(ToggleButton);
|
||||
Vue.use(TextareaAutosize);
|
||||
Vue.component("font-awesome-icon", FontAwesomeIcon);
|
||||
|
||||
/* eslint-disable no-new */
|
||||
|
||||
+23
-14
@@ -7,9 +7,16 @@ const { VueLoaderPlugin } = require('vue-loader');
|
||||
const { version, betaRev } = require('./package.json');
|
||||
const fs = require('fs');
|
||||
|
||||
const devConfig = fs.existsSync('./.dev.json')
|
||||
? JSON.parse(fs.readFileSync('./.dev.json').toString())
|
||||
: JSON.parse(fs.readFileSync('./.dev.sample.json').toString());
|
||||
|
||||
const loadDevConfig = () => {
|
||||
if (fs.existsSync('./.dev.json')) {
|
||||
return JSON.parse(fs.readFileSync('./.dev.json').toString());
|
||||
} else {
|
||||
return JSON.parse(fs.readFileSync('./.dev.sample.json').toString());
|
||||
}
|
||||
};
|
||||
|
||||
const devConfig = loadDevConfig();
|
||||
|
||||
const config = {
|
||||
mode: process.env.NODE_ENV,
|
||||
@@ -29,7 +36,7 @@ const config = {
|
||||
rules: [
|
||||
{
|
||||
test: /\.vue$/,
|
||||
loaders: 'vue-loader',
|
||||
use: 'vue-loader',
|
||||
},
|
||||
{
|
||||
test: /\.js$/,
|
||||
@@ -82,8 +89,9 @@ const config = {
|
||||
new MiniCssExtractPlugin({
|
||||
filename: '[name].css',
|
||||
}),
|
||||
new CopyWebpackPlugin([
|
||||
{ from: 'icons', to: 'icons', ignore: ['icon.xcf'] },
|
||||
new CopyWebpackPlugin({
|
||||
patterns: [
|
||||
{ from: 'icons', to: 'icons', globOptions: { ignoreFiles: ['icon.xcf'] } },
|
||||
{ from: 'images', to: 'images' },
|
||||
{ from: 'content_script', to: 'content_script' },
|
||||
{ from: 'popup/popup.html', to: 'popup/popup.html', transform: transformHtml },
|
||||
@@ -95,25 +103,26 @@ const config = {
|
||||
jsonContent.version = version;
|
||||
|
||||
if (config.mode === 'development') {
|
||||
jsonContent['content_security_policy'] = "script-src 'self' 'unsafe-eval'; object-src 'self'";
|
||||
jsonContent['permissions'] = jsonContent['permissions'].concat(devConfig.permissions);
|
||||
jsonContent.content_security_policy = "script-src 'self' 'unsafe-eval'; object-src 'self'";
|
||||
jsonContent.permissions = jsonContent.permissions.concat(devConfig.permissions);
|
||||
}
|
||||
|
||||
if (process.env.BETA) {
|
||||
const geckoId = jsonContent['browser_specific_settings'].gecko.id;
|
||||
jsonContent['name'] = jsonContent['name'].replace('SimpleLogin', 'SimpleLogin (BETA)');
|
||||
jsonContent['icons'] = {
|
||||
const geckoId = jsonContent.browser_specific_settings.gecko.id;
|
||||
jsonContent.name = jsonContent.name.replace('SimpleLogin', 'SimpleLogin (BETA)');
|
||||
jsonContent.icons = {
|
||||
'48': 'icons/icon_beta_48.png',
|
||||
'128': 'icons/icon_beta_128.png'
|
||||
};
|
||||
jsonContent['version'] = version + '.' + betaRev;
|
||||
jsonContent['browser_specific_settings'].gecko.id = geckoId.replace('@', '-beta@');
|
||||
jsonContent.version = version + '.' + betaRev;
|
||||
jsonContent.browser_specific_settings.gecko.id = geckoId.replace('@', '-beta@');
|
||||
}
|
||||
|
||||
return JSON.stringify(jsonContent, null, 2);
|
||||
},
|
||||
},
|
||||
]),
|
||||
]
|
||||
}),
|
||||
],
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user