Upgraded to Electron 10; upgraded dependencies
This commit is contained in:
parent
3f2d3bfcb1
commit
cf4acbae4d
|
@ -0,0 +1,3 @@
|
|||
{
|
||||
"reject": "keytar,@types/node,@f-list/fork-ts-checker-webpack-plugin,@f-list/vue-ts,typescript"
|
||||
}
|
|
@ -61,7 +61,7 @@ This repository contains a heavily customized version of the mainline F-Chat 3.0
|
|||
* Message search matches character names
|
||||
* PM list shows characters' online status as a colored icon
|
||||
* Technical Details for Nerds
|
||||
* Upgraded to Electron 9.x
|
||||
* Upgraded to Electron 10.x
|
||||
* Replaced `node-spellchecker` with the built-in spellchecker that ships with Electron 8+
|
||||
* Multi-language support for spell checking (Windows only – language is autodetected on MacOS)
|
||||
|
||||
|
|
|
@ -56,7 +56,7 @@
|
|||
readonly classes?: string;
|
||||
|
||||
@Prop
|
||||
readonly value?: string | undefined;
|
||||
readonly value?: string | undefined = undefined;
|
||||
|
||||
@Prop
|
||||
readonly disabled?: boolean;
|
||||
|
|
|
@ -210,7 +210,7 @@
|
|||
this.scoreWatcher
|
||||
);
|
||||
|
||||
delete this.scoreWatcher;
|
||||
this.scoreWatcher = null;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -84,7 +84,7 @@ export default class UserView extends Vue {
|
|||
if (this.scoreWatcher) {
|
||||
EventBus.$off('character-score', this.scoreWatcher);
|
||||
|
||||
delete this.scoreWatcher;
|
||||
this.scoreWatcher = null;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
|
|
@ -244,7 +244,7 @@ export class ImageDomMutator {
|
|||
// tslint:disable-next-line no-any
|
||||
(u.query as any).enterAgree = 1;
|
||||
|
||||
delete u.search;
|
||||
u.search = null;
|
||||
|
||||
return urlHelper.format(u);
|
||||
}
|
||||
|
|
|
@ -38,9 +38,9 @@
|
|||
@Prop({default: () => ((filter: RegExp, value: string) => filter.test(value))})
|
||||
readonly filterFunc!: (filter: RegExp, value: object) => boolean;
|
||||
@Prop
|
||||
readonly multiple?: true;
|
||||
readonly multiple?: true = undefined;
|
||||
@Prop
|
||||
readonly value?: object | object[];
|
||||
readonly value?: object | object[] = undefined;
|
||||
@Prop
|
||||
readonly title?: string;
|
||||
filter = '';
|
||||
|
@ -99,4 +99,4 @@
|
|||
margin-right: 5px;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
</style>
|
||||
|
|
|
@ -234,7 +234,17 @@
|
|||
const tray = new electron.remote.Tray(trayIcon);
|
||||
tray.setToolTip(l('title'));
|
||||
tray.on('click', (_e) => this.trayClicked(tab));
|
||||
const view = new electron.remote.BrowserView({webPreferences: {webviewTag: true, nodeIntegration: true, spellcheck: true}});
|
||||
|
||||
const view = new electron.remote.BrowserView(
|
||||
{
|
||||
webPreferences: {
|
||||
webviewTag: true,
|
||||
nodeIntegration: true,
|
||||
spellcheck: true,
|
||||
enableRemoteModule: true
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
// tab devtools
|
||||
// view.webContents.openDevTools();
|
||||
|
|
|
@ -179,7 +179,7 @@ function createWindow(): Electron.BrowserWindow | undefined {
|
|||
const lastState = windowState.getSavedWindowState();
|
||||
const windowProperties: Electron.BrowserWindowConstructorOptions & {maximized: boolean} = {
|
||||
...lastState, center: lastState.x === undefined, show: false,
|
||||
webPreferences: { webviewTag: true, nodeIntegration: true, spellcheck: true }
|
||||
webPreferences: { webviewTag: true, nodeIntegration: true, spellcheck: true, enableRemoteModule: true }
|
||||
};
|
||||
|
||||
if(process.platform === 'darwin') {
|
||||
|
|
|
@ -81,8 +81,8 @@ const mainConfig = {
|
|||
{test: /\.svg(\?v=\d+\.\d+\.\d+)?$/, loader: 'file-loader'},
|
||||
{test: /\.(wav|mp3|ogg)$/, loader: 'file-loader?name=sounds/[name].[ext]'},
|
||||
{test: /\.(png|html)$/, loader: 'file-loader?name=[name].[ext]'},
|
||||
{test: /\.vue\.scss/, loader: ['vue-style-loader','css-loader','sass-loader']},
|
||||
{test: /\.vue\.css/, loader: ['vue-style-loader','css-loader']},
|
||||
{test: /\.vue\.scss/, loader: ['vue-style-loader', {loader: 'css-loader', options: {esModule: false}},'sass-loader']},
|
||||
{test: /\.vue\.css/, loader: ['vue-style-loader', {loader: 'css-loader', options: {esModule: false}}]},
|
||||
{test: /\.raw\.js$/, loader: 'raw-loader'}
|
||||
]
|
||||
},
|
||||
|
@ -126,11 +126,11 @@ module.exports = function(mode) {
|
|||
if(!theme.endsWith('.scss')) continue;
|
||||
const absPath = path.join(themesDir, theme);
|
||||
rendererConfig.entry.chat.push(absPath);
|
||||
rendererConfig.module.rules.unshift({test: absPath, loader: ['file-loader?name=themes/[name].css', 'extract-loader', 'css-loader', 'sass-loader']});
|
||||
rendererConfig.module.rules.unshift({test: absPath, loader: ['file-loader?name=themes/[name].css', 'extract-loader', {loader: 'css-loader', options: {esModule: false}}, 'sass-loader']});
|
||||
}
|
||||
const faPath = path.join(themesDir, '../../fa.scss');
|
||||
rendererConfig.entry.chat.push(faPath);
|
||||
rendererConfig.module.rules.unshift({test: faPath, loader: ['file-loader?name=fa.css', 'extract-loader', 'css-loader', 'sass-loader']});
|
||||
rendererConfig.module.rules.unshift({test: faPath, loader: ['file-loader?name=fa.css', 'extract-loader', {loader: 'css-loader', options: {esModule: false}}, 'sass-loader']});
|
||||
if(mode === 'production') {
|
||||
process.env.NODE_ENV = 'production';
|
||||
mainConfig.devtool = rendererConfig.devtool = 'source-map';
|
||||
|
|
|
@ -131,7 +131,10 @@ export default class Connection implements Interfaces.Connection {
|
|||
this.reconnectTimer = undefined;
|
||||
this.cleanClose = true;
|
||||
if(this.socket !== undefined) this.socket.close();
|
||||
if(!keepState) this.character = '';
|
||||
|
||||
if(!keepState) {
|
||||
this.character = '';
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
56
package.json
56
package.json
|
@ -7,46 +7,46 @@
|
|||
"devDependencies": {
|
||||
"@f-list/fork-ts-checker-webpack-plugin": "^3.1.1",
|
||||
"@f-list/vue-ts": "^1.0.3",
|
||||
"@fortawesome/fontawesome-free": "^5.13.1",
|
||||
"@fortawesome/fontawesome-free": "^5.15.0",
|
||||
"@types/bluebird": "^3.5.32",
|
||||
"@types/lodash": "^4.14.157",
|
||||
"@types/lodash": "^4.14.161",
|
||||
"@types/node": "^12.12.47",
|
||||
"@types/node-fetch": "^2.5.7",
|
||||
"@types/qs": "^6.9.3",
|
||||
"@types/sortablejs": "^1.10.4",
|
||||
"@types/qs": "^6.9.5",
|
||||
"@types/sortablejs": "^1.10.6",
|
||||
"@vue/devtools": "^5.3.3",
|
||||
"axios": "^0.19.2",
|
||||
"bootstrap": "^4.5.0",
|
||||
"copy-webpack-plugin": "^6.0.2",
|
||||
"css-loader": "^3.6.0",
|
||||
"date-fns": "^2.14.0",
|
||||
"electron": "^9.0.5",
|
||||
"electron-log": "^4.2.2",
|
||||
"electron-packager": "^15.0.0",
|
||||
"electron-rebuild": "^1.11.0",
|
||||
"axios": "^0.20.0",
|
||||
"bootstrap": "^4.5.2",
|
||||
"copy-webpack-plugin": "^6.2.0",
|
||||
"css-loader": "^4.3.0",
|
||||
"date-fns": "^2.16.1",
|
||||
"electron": "^10.1.3",
|
||||
"electron-log": "^4.2.4",
|
||||
"electron-packager": "^15.1.0",
|
||||
"electron-rebuild": "^2.2.0",
|
||||
"extract-loader": "^5.1.0",
|
||||
"file-loader": "^6.0.0",
|
||||
"lodash": "^4.17.15",
|
||||
"file-loader": "^6.1.0",
|
||||
"lodash": "^4.17.20",
|
||||
"node-sass": "^4.14.1",
|
||||
"optimize-css-assets-webpack-plugin": "^5.0.3",
|
||||
"optimize-css-assets-webpack-plugin": "^5.0.4",
|
||||
"qs": "^6.9.4",
|
||||
"raven-js": "^3.27.2",
|
||||
"raw-loader": "^4.0.1",
|
||||
"sass-loader": "^8.0.2",
|
||||
"sortablejs": "^1.10.2",
|
||||
"style-loader": "^1.2.1",
|
||||
"sass-loader": "^10.0.2",
|
||||
"sortablejs": "^1.12.0",
|
||||
"style-loader": "^1.3.0",
|
||||
"throat": "^5.0.0",
|
||||
"ts-loader": "^7.0.5",
|
||||
"tslib": "^2.0.0",
|
||||
"tslint": "^6.1.2",
|
||||
"typescript": "^3.9.5",
|
||||
"vue": "^2.6.11",
|
||||
"ts-loader": "^8.0.4",
|
||||
"tslib": "^2.0.1",
|
||||
"tslint": "^6.1.3",
|
||||
"typescript": "^3.9.7",
|
||||
"vue": "^2.6.12",
|
||||
"vue-loader": "^15.9.3",
|
||||
"vue-template-compiler": "^2.6.11",
|
||||
"webpack": "^4.43.0"
|
||||
"vue-template-compiler": "^2.6.12",
|
||||
"webpack": "^4.44.2"
|
||||
},
|
||||
"dependencies": {
|
||||
"@cliqz/adblocker-electron": "^1.16.1",
|
||||
"@cliqz/adblocker-electron": "^1.18.3",
|
||||
"bluebird": "^3.7.2",
|
||||
"jquery": "^3.5.1",
|
||||
"keytar": "^5.4.0",
|
||||
|
@ -55,7 +55,7 @@
|
|||
"optionalDependencies": {
|
||||
"appdmg": "^0.6.0",
|
||||
"electron-squirrel-startup": "^1.0.0",
|
||||
"electron-winstaller": "^4.0.0"
|
||||
"electron-winstaller": "^4.0.1"
|
||||
},
|
||||
"scripts": {
|
||||
"postinstall": "electron-rebuild --prebuild-tag-prefix=ignoreprebuilds -f -o keytar"
|
||||
|
|
Loading…
Reference in New Issue