This commit is contained in:
Phillip Thelen
2024-06-10 14:53:23 +02:00
parent 1f0a4dad23
commit 544d67e7e5
6 changed files with 13 additions and 11 deletions

View File

@@ -25,7 +25,7 @@ describe('datedMemoize', () => {
const datedMemoize = require('../../../website/common/script/fns/datedMemoize').default; const datedMemoize = require('../../../website/common/script/fns/datedMemoize').default;
const memoized = datedMemoize(stub); const memoized = datedMemoize(stub);
memoized({ identifier: 'a', memoizeConfig: true }, 1, 2); memoized({ identifier: 'a', memoizeConfig: true }, 1, 2);
memoized({ identifier: 'b', memoizeConfig: true }), 1, 2; memoized({ identifier: 'b', memoizeConfig: true }, 1, 2);
expect(stub).to.have.been.calledTwice; expect(stub).to.have.been.calledTwice;
}); });

View File

@@ -1,7 +1,7 @@
<template> <template>
<div <div
class="customize-options mb-4"
v-if="items.length > 1" v-if="items.length > 1"
class="customize-options mb-4"
> >
<div <div
v-for="option in items" v-for="option in items"

View File

@@ -235,8 +235,8 @@
</div> </div>
</div> </div>
<div <div
:key="`ttbg${timeTravelBackgrounds.length}`"
v-if="timeTravelBackgrounds.length > 0" v-if="timeTravelBackgrounds.length > 0"
:key="`ttbg${timeTravelBackgrounds.length}`"
> >
<div <div
class="row justify-content-center title-row mb-3" class="row justify-content-center title-row mb-3"
@@ -269,8 +269,8 @@
</div> </div>
</div> </div>
<div <div
:key="`monthly${monthlyBackgrounds.length}`"
v-if="monthlyBackgrounds.length > 0" v-if="monthlyBackgrounds.length > 0"
:key="`monthly${monthlyBackgrounds.length}`"
> >
<div <div
class="row text-center title-row mb-3" class="row text-center title-row mb-3"

View File

@@ -212,9 +212,9 @@
<!-- eslint-enable vue/no-use-v-if-with-v-for --> <!-- eslint-enable vue/no-use-v-if-with-v-for -->
<div <div
v-for="item in group" v-for="item in group"
class="pet-group"
v-show="show('mount', item)" v-show="show('mount', item)"
:key="item.key" :key="item.key"
class="pet-group"
> >
<mountItem <mountItem
:key="item.key" :key="item.key"

View File

@@ -586,8 +586,8 @@ import reduce from 'lodash/reduce';
import moment from 'moment'; import moment from 'moment';
import planGemLimits from '@/../../common/script/libs/planGemLimits'; import planGemLimits from '@/../../common/script/libs/planGemLimits';
import { drops as dropEggs } from '@/../../common/script/content/eggs'; import eggs from '@/../../common/script/content/eggs';
import { drops as dropPotions } from '@/../../common/script/content/hatching-potions'; import potions from '@/../../common/script/content/hatching-potions';
import { avatarEditorUtilities } from '@/mixins/avatarEditUtilities'; import { avatarEditorUtilities } from '@/mixins/avatarEditUtilities';
import numberInvalid from '@/mixins/numberInvalid'; import numberInvalid from '@/mixins/numberInvalid';
import spellsMixin from '@/mixins/spells'; import spellsMixin from '@/mixins/spells';
@@ -617,6 +617,8 @@ import EquipmentAttributesGrid from '../inventory/equipment/attributesGrid.vue';
import Item from '@/components/inventory/item'; import Item from '@/components/inventory/item';
import Avatar from '@/components/avatar'; import Avatar from '@/components/avatar';
const dropEggs = eggs.drops;
const dropPotions = potions.drops;
const dropEggKeys = keys(dropEggs); const dropEggKeys = keys(dropEggs);
const amountOfDropEggs = size(dropEggs); const amountOfDropEggs = size(dropEggs);

View File

@@ -3,9 +3,9 @@ const path = require('path');
const webpack = require('webpack'); const webpack = require('webpack');
const nconf = require('nconf'); const nconf = require('nconf');
const vueTemplateCompiler = require('vue-template-babel-compiler'); const vueTemplateCompiler = require('vue-template-babel-compiler');
const MomentLocalesPlugin = require('moment-locales-webpack-plugin');
const setupNconf = require('../server/libs/setupNconf'); const setupNconf = require('../server/libs/setupNconf');
const pkg = require('./package.json'); const pkg = require('./package.json');
const MomentLocalesPlugin = require('moment-locales-webpack-plugin');
const configFile = path.join(path.resolve(__dirname, '../../config.json')); const configFile = path.join(path.resolve(__dirname, '../../config.json'));
@@ -68,17 +68,17 @@ const webpackPlugins = [
'tr', 'tr',
'uk', 'uk',
'zh-cn', 'zh-cn',
'zh-tw' 'zh-tw',
], ],
}), }),
new webpack.IgnorePlugin({ new webpack.IgnorePlugin({
checkResource(resource, context) { checkResource (resource, context) {
if ((context.includes('sinon') || resource.includes('sinon') || context.includes('nise')) && nconf.get('TIME_TRAVEL_ENABLED') !== 'true') { if ((context.includes('sinon') || resource.includes('sinon') || context.includes('nise')) && nconf.get('TIME_TRAVEL_ENABLED') !== 'true') {
return true; return true;
} }
return false; return false;
}, },
}), }),
]; ];
module.exports = { module.exports = {