diff --git a/src/shared/constants.js b/src/shared/constants.js index af65ceb..ead0b93 100644 --- a/src/shared/constants.js +++ b/src/shared/constants.js @@ -44,6 +44,15 @@ export const metaTemplateKeyName = 'template' // This is the key name for the content-holding property export const contentKeyName = 'content' +export const defaultOptions = { + keyName, + attribute, + ssrAttribute, + tagIDKeyName, + contentKeyName, + metaTemplateKeyName +} + // List of metaInfo property keys which are configuration options (and dont generate html) export const metaInfoOptionKeys = [ 'titleChunk', diff --git a/src/shared/options.js b/src/shared/options.js index 8547fd4..ce0687a 100644 --- a/src/shared/options.js +++ b/src/shared/options.js @@ -1,23 +1,5 @@ import { isObject, isFunction } from './is-type' - -import { - keyName, - attribute, - ssrAttribute, - tagIDKeyName, - metaTemplateKeyName, - contentKeyName -} from './constants' - -// set some default options -const defaultOptions = { - keyName, - contentKeyName, - metaTemplateKeyName, - attribute, - ssrAttribute, - tagIDKeyName -} +import { defaultOptions } from './constants' export default function setOptions(options) { // combine options diff --git a/test/unit/components.test.js b/test/unit/components.test.js index 5f56f35..07b76e0 100644 --- a/test/unit/components.test.js +++ b/test/unit/components.test.js @@ -1,6 +1,6 @@ import _getMetaInfo from '../../src/shared/getMetaInfo' import { mount, loadVueMetaPlugin, vmTick } from '../utils' -import { defaultOptions } from '../utils/constants' +import { defaultOptions } from '../../src/shared/constants' import GoodbyeWorld from '../components/goodbye-world.vue' import HelloWorld from '../components/hello-world.vue' diff --git a/test/unit/escaping.test.js b/test/unit/escaping.test.js index 2ed0b86..f9c26f0 100644 --- a/test/unit/escaping.test.js +++ b/test/unit/escaping.test.js @@ -1,6 +1,6 @@ import _getMetaInfo from '../../src/shared/getMetaInfo' import { loadVueMetaPlugin } from '../utils' -import { defaultOptions } from '../utils/constants' +import { defaultOptions } from '../../src/shared/constants' const getMetaInfo = (component, escapeSequences) => _getMetaInfo(defaultOptions, component, escapeSequences) diff --git a/test/unit/generators.test.js b/test/unit/generators.test.js index 33aa4b2..5692242 100644 --- a/test/unit/generators.test.js +++ b/test/unit/generators.test.js @@ -1,5 +1,5 @@ import _generateServerInjector from '../../src/server/generateServerInjector' -import { defaultOptions } from '../utils/constants' +import { defaultOptions } from '../../src/shared/constants' import metaInfoData from '../utils/meta-info-data' const generateServerInjector = (type, data) => _generateServerInjector(defaultOptions, type, data) diff --git a/test/unit/getMetaInfo.test.js b/test/unit/getMetaInfo.test.js index ba79c23..0ae0e2c 100644 --- a/test/unit/getMetaInfo.test.js +++ b/test/unit/getMetaInfo.test.js @@ -1,6 +1,6 @@ import _getMetaInfo from '../../src/shared/getMetaInfo' import { loadVueMetaPlugin } from '../utils' -import { defaultOptions } from '../utils/constants' +import { defaultOptions } from '../../src/shared/constants' const getMetaInfo = component => _getMetaInfo(defaultOptions, component) diff --git a/test/unit/plugin-browser.test.js b/test/unit/plugin-browser.test.js index 6ec044c..606a2b1 100644 --- a/test/unit/plugin-browser.test.js +++ b/test/unit/plugin-browser.test.js @@ -1,7 +1,7 @@ import triggerUpdate from '../../src/client/triggerUpdate' import batchUpdate from '../../src/client/batchUpdate' import { mount, vmTick, VueMetaBrowserPlugin, loadVueMetaPlugin } from '../utils' -import { defaultOptions } from '../utils/constants' +import { defaultOptions } from '../../src/shared/constants' jest.mock('../../src/client/triggerUpdate') jest.mock('../../src/client/batchUpdate') diff --git a/test/unit/plugin-server.test.js b/test/unit/plugin-server.test.js index fa6a113..d0f35db 100644 --- a/test/unit/plugin-server.test.js +++ b/test/unit/plugin-server.test.js @@ -1,5 +1,5 @@ import { mount, VueMetaServerPlugin, loadVueMetaPlugin } from '../utils' -import { defaultOptions } from '../utils/constants' +import { defaultOptions } from '../../src/shared/constants' jest.mock('../../package.json', () => ({ version: 'test-version' diff --git a/test/unit/shared.test.js b/test/unit/shared.test.js index 61fa92d..70668f6 100644 --- a/test/unit/shared.test.js +++ b/test/unit/shared.test.js @@ -4,7 +4,7 @@ import { ensureIsArray } from '../../src/shared/ensure' import setOptions from '../../src/shared/options' import { hasGlobalWindowFn } from '../../src/shared/window' -import { defaultOptions } from '../utils/constants' +import { defaultOptions } from '../../src/shared/constants' const noop = () => {} diff --git a/test/unit/updaters.test.js b/test/unit/updaters.test.js index 1453887..e24d136 100644 --- a/test/unit/updaters.test.js +++ b/test/unit/updaters.test.js @@ -1,5 +1,5 @@ import _updateClientMetaInfo from '../../src/client/updateClientMetaInfo' -import { defaultOptions } from '../utils/constants' +import { defaultOptions } from '../../src/shared/constants' import metaInfoData from '../utils/meta-info-data' const updateClientMetaInfo = (type, data) => _updateClientMetaInfo(defaultOptions, { [type]: data }) diff --git a/test/utils/constants.js b/test/utils/constants.js deleted file mode 100644 index a1b60bb..0000000 --- a/test/utils/constants.js +++ /dev/null @@ -1,17 +0,0 @@ -import { - keyName, - attribute, - ssrAttribute, - tagIDKeyName, - metaTemplateKeyName, - contentKeyName -} from '../../src/shared/constants' - -export const defaultOptions = { - keyName, - attribute, - ssrAttribute, - tagIDKeyName, - metaTemplateKeyName, - contentKeyName -} diff --git a/test/utils/index.js b/test/utils/index.js index 0087c4e..1fb19c0 100644 --- a/test/utils/index.js +++ b/test/utils/index.js @@ -1,8 +1,8 @@ import { mount, createLocalVue } from '@vue/test-utils' import { renderToString } from '@vue/server-test-utils' +import { defaultOptions } from '../../src/shared/constants' import VueMetaBrowserPlugin from '../../src/browser' import VueMetaServerPlugin from '../../src' -import { defaultOptions } from './constants' export { mount, diff --git a/test/utils/meta-info-data.js b/test/utils/meta-info-data.js index 8ac912b..67d1593 100644 --- a/test/utils/meta-info-data.js +++ b/test/utils/meta-info-data.js @@ -1,4 +1,4 @@ -import { defaultOptions } from './constants' +import { defaultOptions } from '../../src/shared/constants' const metaInfoData = { title: {