Skip to content

M
mycard
Commit dd21d890 authored by 神楽坂玲奈's avatar 神楽坂玲奈
Browse files
Options

fix

parent bea6f798
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 113 additions and 184 deletions
angular.json
View file @ dd21d890
......@@ -58,7 +58,12 @@
"tsConfig": "tsconfig.app.json",
"assets": [
"src/favicon.ico",
"src/assets"
"src/assets",
{
"glob": "**/*",
"input": "./node_modules/candy/res/",
"output": "./candy/res/"
}
],
"styles": [
"src/styles.scss"
......
main.js
View file @ dd21d890
......@@ -154,7 +154,7 @@ async function createWindow() {
minWidth: 1024,
minHeight: 640,
frame: process.platform === 'darwin',
webPreferences: { nodeIntegration: true, contextIsolation: false, enableRemoteModule: true, webviewTag: true },
webPreferences: { nodeIntegration: true, contextIsolation: false, enableRemoteModule: true, webviewTag: true, webSecurity: false },
titleBarStyle: process.platform === 'darwin' ? 'hidden' : undefined
});
......
package-lock.json
View file @ dd21d890
This diff is collapsed.
src/app/ygopro/ygopro.component.ts
View file @ dd21d890
......@@ -23,7 +23,7 @@ import { App } from '../shared/app';
import { AppsService } from '../apps.service';
import { LoginService } from '../login/login.service';
import { SettingsService } from '../settings.service';
import _ from 'lodash';
import _ from 'lodash-es';
import fg from 'fast-glob';
import { HttpClient } from '@angular/common/http';
import WillNavigateEvent = Electron.WillNavigateEvent;
......@@ -708,9 +708,9 @@ export class YGOProComponent implements OnInit, OnDestroy {
data.arena_rank = data2.arena_rank;
data.exp_rank_ex = exp_rank_ex;
data.arena_rank_ex = arena_rank_ex;
if (start_time !== data.start_time) {
// if (start_time !== data.start_time) {
this.appsService.showResult('projects/ygopro-result/end_YGOPro_single.html', data, 202, 222);
}
// }
});
} catch (error) {
console.log(error);
......
webpack.config.js
View file @ dd21d890
const CopyPlugin = require('copy-webpack-plugin');
module.exports = {
target: 'electron-renderer',
externals: {
bufferutil: 'commonjs2 bufferutil',
'utf-8-validate': 'commonjs2 utf-8-validate',
'raw-socket': 'commonjs2 raw-socket',
'electron-store': 'commonjs2 electron-store',
},
plugins: [
new CopyPlugin({
patterns: [{ from: 'node_modules/candy/res', to: 'candy/res' }],
}),
],
module: {
rules: [
{
test: require.resolve('candy'),
use: [
{
loader: 'imports-loader',
options: {
imports: ['default jquery jQuery', 'default mustache Mustache'],
},
},
{
loader: 'exports-loader',
options: {
exports: ['Candy'],
},
},
{ loader: 'imports-loader', options: { imports: ['default jquery jQuery', 'default mustache Mustache'] } },
{ loader: 'exports-loader', options: { exports: ['Candy'] } },
],
},
{
test: require.resolve('jquery-i18n/jquery.i18n.js'),
loader: 'imports-loader',
options: {
type: 'commonjs',
imports: 'single jquery jQuery',
},
use: [{ loader: 'imports-loader', options: { type: 'commonjs', imports: 'single jquery jQuery' } }],
},
{
test: require.resolve('candy-shop/notifyme/candy.js'),
use: [
{
loader: 'imports-loader',
options: {
imports: ['default jquery jQuery', 'named candy Candy'],
},
},
{
loader: 'exports-loader',
options: {
exports: ['default CandyShop.NotifyMe'],
},
},
{ loader: 'imports-loader', options: { imports: ['default jquery jQuery', 'named candy Candy'] } },
{ loader: 'exports-loader', options: { exports: ['default CandyShop.NotifyMe'] } },
],
},
{
test: require.resolve('candy-shop/namecomplete/candy.js'),
use: [
{
loader: 'imports-loader',
options: {
imports: ['default jquery jQuery', 'named candy Candy'],
},
},
{
loader: 'exports-loader',
options: {
exports: ['default CandyShop.NameComplete'],
},
},
{ loader: 'imports-loader', options: { imports: ['default jquery jQuery', 'named candy Candy'] } },
{ loader: 'exports-loader', options: { exports: ['default CandyShop.NameComplete'] } },
],
},
{
test: require.resolve('candy-shop/modify-role/candy.js'),
use: [
{
loader: 'imports-loader',
options: {
imports: ['default jquery jQuery', 'named candy Candy'],
},
},
{
loader: 'exports-loader',
options: {
exports: ['default CandyShop.ModifyRole'],
},
},
{ loader: 'imports-loader', options: { imports: ['default jquery jQuery', 'named candy Candy'] } },
{ loader: 'exports-loader', options: { exports: ['default CandyShop.ModifyRole'] } },
],
},
{
test: require.resolve('candy-shop/me-does/candy.js'),
use: [
{
loader: 'imports-loader',
options: {
imports: ['default jquery jQuery', 'named candy Candy'],
},
},
{
loader: 'exports-loader',
options: {
exports: ['default CandyShop.MeDoes'],
},
},
{ loader: 'imports-loader', options: { imports: ['default jquery jQuery', 'named candy Candy'] } },
{ loader: 'exports-loader', options: { exports: ['default CandyShop.MeDoes'] } },
],
},
{
test: require.resolve('candy-shop/notifications/candy.js'),
use: [
{
loader: 'imports-loader',
options: {
imports: ['default jquery jQuery', 'named candy Candy'],
},
},
{
loader: 'exports-loader',
options: {
exports: ['default CandyShop.Notifications'],
},
},
{ loader: 'imports-loader', options: { imports: ['default jquery jQuery', 'named candy Candy'] } },
{ loader: 'exports-loader', options: { exports: ['default CandyShop.Notifications'] } },
],
},
{
test: require.resolve('candy-shop/refocus/candy.js'),
use: [
{
loader: 'imports-loader',
options: {
imports: ['default jquery jQuery', 'named candy Candy'],
},
},
{
loader: 'exports-loader',
options: {
exports: ['default CandyShop.Refocus'],
},
},
{ loader: 'imports-loader', options: { imports: ['default jquery jQuery', 'named candy Candy'] } },
{ loader: 'exports-loader', options: { exports: ['default CandyShop.Refocus'] } },
],
},
],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment