vue-i18n 9.1.2 → 9.1.6

package/dist/vue-i18n.cjs.js

@@ -1,5 +1,5 @@
 /*!
-  * vue-i18n v9.1.2
+  * vue-i18n v9.1.6
   * (c) 2021 kazuya kawaguchi
   * Released under the MIT License.
   */
@@ -19,7 +19,7 @@ var vue = require('vue');
  *
  * @VueI18nGeneral
  */
-const VERSION = '9.1.2';
+const VERSION = '9.1.6';
 
 const warnMessages = {
     [6 /* FALLBACK_TO_ROOT */]: `Fall back to {type} '{key}' with root locale.`,
@@ -56,7 +56,7 @@ const NumberPartsSymbol = shared.makeSymbol('__numberParts');
 const EnableEmitter = shared.makeSymbol('__enableEmitter');
 const DisableEmitter = shared.makeSymbol('__disableEmitter');
 const SetPluralRulesSymbol = shared.makeSymbol('__setPluralRules');
-const DevToolsMetaSymbol = shared.makeSymbol('__intlifyMeta');
+shared.makeSymbol('__intlifyMeta');
 let composerID = 0;
 function defineCoreMissingHandler(missing) {
     return ((ctx, locale, key, type) => {
@@ -115,13 +115,20 @@ function deepCopy(src, des) {
         }
     }
 }
+// for Intlify DevTools
+const getMetaInfo = /* #__PURE__*/ () => {
+    const instance = vue.getCurrentInstance();
+    return instance && instance.type[DEVTOOLS_META] // eslint-disable-line @typescript-eslint/no-explicit-any
+        ? { [DEVTOOLS_META]: instance.type[DEVTOOLS_META] } // eslint-disable-line @typescript-eslint/no-explicit-any
+        : null;
+};
 /**
  * Create composer interface factory
  *
  * @internal
  */
 function createComposer(options = {}) {
-    const { __root, __meta } = options;
+    const { __root } = options;
     const _isGlobal = __root === undefined;
     let _inheritLocale = shared.isBoolean(options.inheritLocale)
         ? options.inheritLocale
@@ -198,6 +205,7 @@ function createComposer(options = {}) {
     let _context;
     function getCoreContext() {
         return coreBase.createCoreContext({
+            version: VERSION,
             locale: _locale.value,
             fallbackLocale: _fallbackLocale.value,
             messages: _messages.value,
@@ -222,7 +230,7 @@ function createComposer(options = {}) {
             __v_emitter: shared.isPlainObject(_context)
                 ? _context.__v_emitter
                 : undefined,
-            __meta: Object.assign({ framework: 'vue' }, __meta || {})
+            __meta: { framework: 'vue' }
         });
     }
     _context = getCoreContext();
@@ -287,7 +295,17 @@ function createComposer(options = {}) {
     }
     function wrapWithDeps(fn, argumentParser, warnType, fallbackSuccess, fallbackFail, successCondition) {
         trackReactivityValues(); // track reactive dependency
-        const ret = fn(_context);
+        // NOTE: experimental !!
+        let ret;
+        {
+            try {
+                coreBase.setAdditionalMeta(getMetaInfo());
+                ret = fn(_context);
+            }
+            finally {
+                coreBase.setAdditionalMeta(null);
+            }
+        }
         if (shared.isNumber(ret) && ret === coreBase.NOT_REOSLVED) {
             const [key, arg2] = argumentParser();
             if (__root &&
@@ -336,7 +354,7 @@ function createComposer(options = {}) {
         if (arg3 && !shared.isObject(arg3)) {
             throw createI18nError(15 /* INVALID_ARGUMENT */);
         }
-        return t(...[arg1, arg2, Object.assign({ resolvedMessage: true }, arg3 || {})]);
+        return t(...[arg1, arg2, shared.assign({ resolvedMessage: true }, arg3 || {})]);
     }
     // d
     function d(...args) {
@@ -445,7 +463,7 @@ function createComposer(options = {}) {
     }
     // mergeDateTimeFormat
     function mergeDateTimeFormat(locale, format) {
-        _datetimeFormats.value[locale] = Object.assign(_datetimeFormats.value[locale] || {}, format);
+        _datetimeFormats.value[locale] = shared.assign(_datetimeFormats.value[locale] || {}, format);
         _context.datetimeFormats = _datetimeFormats.value;
         coreBase.clearDateTimeFormat(_context, locale, format);
     }
@@ -461,7 +479,7 @@ function createComposer(options = {}) {
     }
     // mergeNumberFormat
     function mergeNumberFormat(locale, format) {
-        _numberFormats.value[locale] = Object.assign(_numberFormats.value[locale] || {}, format);
+        _numberFormats.value[locale] = shared.assign(_numberFormats.value[locale] || {}, format);
         _context.numberFormats = _numberFormats.value;
         coreBase.clearNumberFormat(_context, locale, format);
     }
@@ -578,8 +596,7 @@ function createComposer(options = {}) {
         [TransrateVNodeSymbol]: transrateVNode,
         [NumberPartsSymbol]: numberParts,
         [DatetimePartsSymbol]: datetimeParts,
-        [SetPluralRulesSymbol]: setPluralRules,
-        [DevToolsMetaSymbol]: __meta
+        [SetPluralRulesSymbol]: setPluralRules
     };
     // for vue-devtools timeline event
     {
@@ -641,11 +658,11 @@ function convertComposerOptions(options) {
         const locales = Object.keys(sharedMessages);
         messages = locales.reduce((messages, locale) => {
             const message = messages[locale] || (messages[locale] = {});
-            Object.assign(message, sharedMessages[locale]);
+            shared.assign(message, sharedMessages[locale]);
             return messages;
         }, (messages || {}));
     }
-    const { __i18n, __root, __meta } = options;
+    const { __i18n, __root } = options;
     const datetimeFormats = options.datetimeFormats;
     const numberFormats = options.numberFormats;
     const flatJson = options.flatJson;
@@ -668,8 +685,7 @@ function convertComposerOptions(options) {
         escapeParameter,
         inheritLocale,
         __i18n,
-        __root,
-        __meta
+        __root
     };
 }
 /**
@@ -960,6 +976,9 @@ const baseFormatProps = {
         type: String,
         validator: (val) => val === 'parent' || val === 'global',
         default: 'parent'
+    },
+    i18n: {
+        type: Object
     }
 };
 
@@ -971,7 +990,7 @@ const baseFormatProps = {
  *
  * @VueI18nSee [TranslationProps](component#translationprops)
  * @VueI18nSee [BaseFormatProps](component#baseformatprops)
- * @VueI18nSee [Component Interpolation](../../guide/advanced/component)
+ * @VueI18nSee [Component Interpolation](../guide/advanced/component)
  *
  * @example
  * ```html
@@ -1029,7 +1048,8 @@ const Translation = {
     /* eslint-enable */
     setup(props, context) {
         const { slots, attrs } = context;
-        const i18n = useI18n({ useScope: props.scope });
+        const i18n = props.i18n ||
+            useI18n({ useScope: props.scope });
         const keys = Object.keys(slots).filter(key => key !== '_');
         return () => {
             const options = {};
@@ -1089,7 +1109,7 @@ function renderFormatter(props, context, slotKeys, partFormatter) {
             // Filter out number format options only
             overrides = Object.keys(props.format).reduce((options, prop) => {
                 return slotKeys.includes(prop)
-                    ? Object.assign({}, options, { [prop]: props.format[prop] }) // eslint-disable-line @typescript-eslint/no-explicit-any
+                    ? shared.assign({}, options, { [prop]: props.format[prop] }) // eslint-disable-line @typescript-eslint/no-explicit-any
                     : options;
             }, {});
         }
@@ -1141,7 +1161,7 @@ const NUMBER_FORMAT_KEYS = [
  *
  * @VueI18nSee [FormattableProps](component#formattableprops)
  * @VueI18nSee [BaseFormatProps](component#baseformatprops)
- * @VueI18nSee [Custom Formatting](../../guide/essentials/number#custom-formatting)
+ * @VueI18nSee [Custom Formatting](../guide/essentials/number#custom-formatting)
  *
  * @VueI18nDanger
  * Not supported IE, due to no support `Intl.NumberFormat#formatToParts` in [IE](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/NumberFormat/formatToParts)
@@ -1164,7 +1184,8 @@ const NumberFormat = {
     }, baseFormatProps),
     /* eslint-enable */
     setup(props, context) {
-        const i18n = useI18n({ useScope: 'parent' });
+        const i18n = props.i18n ||
+            useI18n({ useScope: 'parent' });
         return renderFormatter(props, context, NUMBER_FORMAT_KEYS, (...args) => 
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         i18n[NumberPartsSymbol](...args));
@@ -1201,7 +1222,7 @@ const DATETIME_FORMAT_KEYS = [
  *
  * @VueI18nSee [FormattableProps](component#formattableprops)
  * @VueI18nSee [BaseFormatProps](component#baseformatprops)
- * @VueI18nSee [Custom Formatting](../../guide/essentials/datetime#custom-formatting)
+ * @VueI18nSee [Custom Formatting](../guide/essentials/datetime#custom-formatting)
  *
  * @VueI18nDanger
  * Not supported IE, due to no support `Intl.DateTimeFormat#formatToParts` in [IE](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/formatToParts)
@@ -1224,7 +1245,8 @@ const DatetimeFormat = {
     }, baseFormatProps),
     /* eslint-enable */
     setup(props, context) {
-        const i18n = useI18n({ useScope: 'parent' });
+        const i18n = props.i18n ||
+            useI18n({ useScope: 'parent' });
         return renderFormatter(props, context, DATETIME_FORMAT_KEYS, (...args) => 
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         i18n[DatetimePartsSymbol](...args));
@@ -1329,9 +1351,6 @@ function defineMixin(vuei18n, composer, i18n) {
                 if (options.__i18n) {
                     optionsI18n.__i18n = options.__i18n;
                 }
-                optionsI18n.__meta = options[DEVTOOLS_META]
-                    ? { [DEVTOOLS_META]: options[DEVTOOLS_META] }
-                    : {};
                 optionsI18n.__root = composer;
                 if (this === this.$root) {
                     this.$i18n = mergeToRoot(vuei18n, optionsI18n);
@@ -1347,9 +1366,6 @@ function defineMixin(vuei18n, composer, i18n) {
                 else {
                     this.$i18n = createVueI18n({
                         __i18n: options.__i18n,
-                        __meta: options[DEVTOOLS_META]
-                            ? { [DEVTOOLS_META]: options[DEVTOOLS_META] }
-                            : {},
                         __root: composer
                     });
                 }
@@ -1405,14 +1421,6 @@ function mergeToRoot(root, options) {
         options.escapeParameterHtml || root.escapeParameterHtml;
     root.sync = options.sync || root.sync;
     root.__composer[SetPluralRulesSymbol](options.pluralizationRules || root.pluralizationRules);
-    /* eslint-disable @typescript-eslint/no-explicit-any */
-    if (options[DEVTOOLS_META] &&
-        !root.__composer[DevToolsMetaSymbol]) {
-        root.__composer[DevToolsMetaSymbol] = {
-            [DEVTOOLS_META]: options[DEVTOOLS_META]
-        };
-    }
-    /* eslint-enable @typescript-eslint/no-explicit-any */
     const messages = getLocaleMessages(root.locale, {
         messages: options.messages,
         __i18n: options.__i18n
@@ -1439,8 +1447,8 @@ function mergeToRoot(root, options) {
  *
  * If you use composition API mode, you need to specify {@link ComposerOptions}.
  *
- * @VueI18nSee [Getting Started](../../guide/)
- * @VueI18nSee [Composition API](../../guide/advanced/composition)
+ * @VueI18nSee [Getting Started](../guide/)
+ * @VueI18nSee [Composition API](../guide/advanced/composition)
  *
  * @example
  * case: for Legacy API
@@ -1689,16 +1697,10 @@ function useI18n(options = {}) {
     let composer = i18nInternal.__getInstance(instance);
     if (composer == null) {
         const type = instance.type;
-        const composerOptions = {
-            ...options
-        };
+        const composerOptions = shared.assign({}, options);
         if (type.__i18n) {
             composerOptions.__i18n = type.__i18n;
         }
-        if (type[DEVTOOLS_META]) {
-            composerOptions.__meta = composerOptions.__meta || {};
-            composerOptions.__meta[DEVTOOLS_META] = type[DEVTOOLS_META];
-        }
         if (global) {
             composerOptions.__root = global;
         }
@@ -1774,7 +1776,7 @@ function injectGlobalFields(app, composer) {
     app.config.globalProperties.$i18n = i18n;
     globalExportMethods.forEach(method => {
         const desc = Object.getOwnPropertyDescriptor(composer, method);
-        if (!desc) {
+        if (!desc || !desc.value) {
             throw createI18nError(22 /* UNEXPECTED_ERROR */);
         }
         Object.defineProperty(app.config.globalProperties, `$${method}`, desc);

package/dist/vue-i18n.cjs.prod.js

@@ -1,5 +1,5 @@
 /*!
-  * vue-i18n v9.1.2
+  * vue-i18n v9.1.6
   * (c) 2021 kazuya kawaguchi
   * Released under the MIT License.
   */
@@ -19,20 +19,19 @@ var shared = require('@intlify/shared');
  *
  * @VueI18nGeneral
  */
-const VERSION = '9.1.2';
+const VERSION = '9.1.6';
 
 function createI18nError(code, ...args) {
     return coreBase.createCompileError(code, null, undefined);
 }
 
-const DEVTOOLS_META = '__INTLIFY_META__';
 const TransrateVNodeSymbol = shared.makeSymbol('__transrateVNode');
 const DatetimePartsSymbol = shared.makeSymbol('__datetimeParts');
 const NumberPartsSymbol = shared.makeSymbol('__numberParts');
 shared.makeSymbol('__enableEmitter');
 shared.makeSymbol('__disableEmitter');
 const SetPluralRulesSymbol = shared.makeSymbol('__setPluralRules');
-const DevToolsMetaSymbol = shared.makeSymbol('__intlifyMeta');
+shared.makeSymbol('__intlifyMeta');
 let composerID = 0;
 function defineCoreMissingHandler(missing) {
     return ((ctx, locale, key, type) => {
@@ -97,7 +96,7 @@ function deepCopy(src, des) {
  * @internal
  */
 function createComposer(options = {}) {
-    const { __root, __meta } = options;
+    const { __root } = options;
     const _isGlobal = __root === undefined;
     let _inheritLocale = shared.isBoolean(options.inheritLocale)
         ? options.inheritLocale
@@ -174,6 +173,7 @@ function createComposer(options = {}) {
     let _context;
     function getCoreContext() {
         return coreBase.createCoreContext({
+            version: VERSION,
             locale: _locale.value,
             fallbackLocale: _fallbackLocale.value,
             messages: _messages.value,
@@ -198,7 +198,7 @@ function createComposer(options = {}) {
             __v_emitter: shared.isPlainObject(_context)
                 ? _context.__v_emitter
                 : undefined,
-            __meta: Object.assign({ framework: 'vue' }, __meta || {})
+            __meta: { framework: 'vue' }
         });
     }
     _context = getCoreContext();
@@ -259,7 +259,11 @@ function createComposer(options = {}) {
     }
     function wrapWithDeps(fn, argumentParser, warnType, fallbackSuccess, fallbackFail, successCondition) {
         trackReactivityValues(); // track reactive dependency
-        const ret = fn(_context);
+        // NOTE: experimental !!
+        let ret;
+        {
+            ret = fn(_context);
+        }
         if (shared.isNumber(ret) && ret === coreBase.NOT_REOSLVED) {
             const [key, arg2] = argumentParser();
             return __root && _fallbackRoot
@@ -284,7 +288,7 @@ function createComposer(options = {}) {
         if (arg3 && !shared.isObject(arg3)) {
             throw createI18nError(15 /* INVALID_ARGUMENT */);
         }
-        return t(...[arg1, arg2, Object.assign({ resolvedMessage: true }, arg3 || {})]);
+        return t(...[arg1, arg2, shared.assign({ resolvedMessage: true }, arg3 || {})]);
     }
     // d
     function d(...args) {
@@ -393,7 +397,7 @@ function createComposer(options = {}) {
     }
     // mergeDateTimeFormat
     function mergeDateTimeFormat(locale, format) {
-        _datetimeFormats.value[locale] = Object.assign(_datetimeFormats.value[locale] || {}, format);
+        _datetimeFormats.value[locale] = shared.assign(_datetimeFormats.value[locale] || {}, format);
         _context.datetimeFormats = _datetimeFormats.value;
         coreBase.clearDateTimeFormat(_context, locale, format);
     }
@@ -409,7 +413,7 @@ function createComposer(options = {}) {
     }
     // mergeNumberFormat
     function mergeNumberFormat(locale, format) {
-        _numberFormats.value[locale] = Object.assign(_numberFormats.value[locale] || {}, format);
+        _numberFormats.value[locale] = shared.assign(_numberFormats.value[locale] || {}, format);
         _context.numberFormats = _numberFormats.value;
         coreBase.clearNumberFormat(_context, locale, format);
     }
@@ -526,8 +530,7 @@ function createComposer(options = {}) {
         [TransrateVNodeSymbol]: transrateVNode,
         [NumberPartsSymbol]: numberParts,
         [DatetimePartsSymbol]: datetimeParts,
-        [SetPluralRulesSymbol]: setPluralRules,
-        [DevToolsMetaSymbol]: __meta
+        [SetPluralRulesSymbol]: setPluralRules
     };
     return composer;
 }
@@ -574,11 +577,11 @@ function convertComposerOptions(options) {
         const locales = Object.keys(sharedMessages);
         messages = locales.reduce((messages, locale) => {
             const message = messages[locale] || (messages[locale] = {});
-            Object.assign(message, sharedMessages[locale]);
+            shared.assign(message, sharedMessages[locale]);
             return messages;
         }, (messages || {}));
     }
-    const { __i18n, __root, __meta } = options;
+    const { __i18n, __root } = options;
     const datetimeFormats = options.datetimeFormats;
     const numberFormats = options.numberFormats;
     const flatJson = options.flatJson;
@@ -601,8 +604,7 @@ function convertComposerOptions(options) {
         escapeParameter,
         inheritLocale,
         __i18n,
-        __root,
-        __meta
+        __root
     };
 }
 /**
@@ -875,6 +877,9 @@ const baseFormatProps = {
         type: String,
         validator: (val) => val === 'parent' || val === 'global',
         default: 'parent'
+    },
+    i18n: {
+        type: Object
     }
 };
 
@@ -886,7 +891,7 @@ const baseFormatProps = {
  *
  * @VueI18nSee [TranslationProps](component#translationprops)
  * @VueI18nSee [BaseFormatProps](component#baseformatprops)
- * @VueI18nSee [Component Interpolation](../../guide/advanced/component)
+ * @VueI18nSee [Component Interpolation](../guide/advanced/component)
  *
  * @example
  * ```html
@@ -944,7 +949,8 @@ const Translation = {
     /* eslint-enable */
     setup(props, context) {
         const { slots, attrs } = context;
-        const i18n = useI18n({ useScope: props.scope });
+        const i18n = props.i18n ||
+            useI18n({ useScope: props.scope });
         const keys = Object.keys(slots).filter(key => key !== '_');
         return () => {
             const options = {};
@@ -1004,7 +1010,7 @@ function renderFormatter(props, context, slotKeys, partFormatter) {
             // Filter out number format options only
             overrides = Object.keys(props.format).reduce((options, prop) => {
                 return slotKeys.includes(prop)
-                    ? Object.assign({}, options, { [prop]: props.format[prop] }) // eslint-disable-line @typescript-eslint/no-explicit-any
+                    ? shared.assign({}, options, { [prop]: props.format[prop] }) // eslint-disable-line @typescript-eslint/no-explicit-any
                     : options;
             }, {});
         }
@@ -1056,7 +1062,7 @@ const NUMBER_FORMAT_KEYS = [
  *
  * @VueI18nSee [FormattableProps](component#formattableprops)
  * @VueI18nSee [BaseFormatProps](component#baseformatprops)
- * @VueI18nSee [Custom Formatting](../../guide/essentials/number#custom-formatting)
+ * @VueI18nSee [Custom Formatting](../guide/essentials/number#custom-formatting)
  *
  * @VueI18nDanger
  * Not supported IE, due to no support `Intl.NumberFormat#formatToParts` in [IE](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/NumberFormat/formatToParts)
@@ -1079,7 +1085,8 @@ const NumberFormat = {
     }, baseFormatProps),
     /* eslint-enable */
     setup(props, context) {
-        const i18n = useI18n({ useScope: 'parent' });
+        const i18n = props.i18n ||
+            useI18n({ useScope: 'parent' });
         return renderFormatter(props, context, NUMBER_FORMAT_KEYS, (...args) => 
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         i18n[NumberPartsSymbol](...args));
@@ -1116,7 +1123,7 @@ const DATETIME_FORMAT_KEYS = [
  *
  * @VueI18nSee [FormattableProps](component#formattableprops)
  * @VueI18nSee [BaseFormatProps](component#baseformatprops)
- * @VueI18nSee [Custom Formatting](../../guide/essentials/datetime#custom-formatting)
+ * @VueI18nSee [Custom Formatting](../guide/essentials/datetime#custom-formatting)
  *
  * @VueI18nDanger
  * Not supported IE, due to no support `Intl.DateTimeFormat#formatToParts` in [IE](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/formatToParts)
@@ -1139,7 +1146,8 @@ const DatetimeFormat = {
     }, baseFormatProps),
     /* eslint-enable */
     setup(props, context) {
-        const i18n = useI18n({ useScope: 'parent' });
+        const i18n = props.i18n ||
+            useI18n({ useScope: 'parent' });
         return renderFormatter(props, context, DATETIME_FORMAT_KEYS, (...args) => 
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         i18n[DatetimePartsSymbol](...args));
@@ -1236,9 +1244,6 @@ function defineMixin(vuei18n, composer, i18n) {
                 if (options.__i18n) {
                     optionsI18n.__i18n = options.__i18n;
                 }
-                optionsI18n.__meta = options[DEVTOOLS_META]
-                    ? { [DEVTOOLS_META]: options[DEVTOOLS_META] }
-                    : {};
                 optionsI18n.__root = composer;
                 if (this === this.$root) {
                     this.$i18n = mergeToRoot(vuei18n, optionsI18n);
@@ -1254,9 +1259,6 @@ function defineMixin(vuei18n, composer, i18n) {
                 else {
                     this.$i18n = createVueI18n({
                         __i18n: options.__i18n,
-                        __meta: options[DEVTOOLS_META]
-                            ? { [DEVTOOLS_META]: options[DEVTOOLS_META] }
-                            : {},
                         __root: composer
                     });
                 }
@@ -1312,14 +1314,6 @@ function mergeToRoot(root, options) {
         options.escapeParameterHtml || root.escapeParameterHtml;
     root.sync = options.sync || root.sync;
     root.__composer[SetPluralRulesSymbol](options.pluralizationRules || root.pluralizationRules);
-    /* eslint-disable @typescript-eslint/no-explicit-any */
-    if (options[DEVTOOLS_META] &&
-        !root.__composer[DevToolsMetaSymbol]) {
-        root.__composer[DevToolsMetaSymbol] = {
-            [DEVTOOLS_META]: options[DEVTOOLS_META]
-        };
-    }
-    /* eslint-enable @typescript-eslint/no-explicit-any */
     const messages = getLocaleMessages(root.locale, {
         messages: options.messages,
         __i18n: options.__i18n
@@ -1346,8 +1340,8 @@ function mergeToRoot(root, options) {
  *
  * If you use composition API mode, you need to specify {@link ComposerOptions}.
  *
- * @VueI18nSee [Getting Started](../../guide/)
- * @VueI18nSee [Composition API](../../guide/advanced/composition)
+ * @VueI18nSee [Getting Started](../guide/)
+ * @VueI18nSee [Composition API](../guide/advanced/composition)
  *
  * @example
  * case: for Legacy API
@@ -1593,16 +1587,10 @@ function useI18n(options = {}) {
     let composer = i18nInternal.__getInstance(instance);
     if (composer == null) {
         const type = instance.type;
-        const composerOptions = {
-            ...options
-        };
+        const composerOptions = shared.assign({}, options);
         if (type.__i18n) {
             composerOptions.__i18n = type.__i18n;
         }
-        if (type[DEVTOOLS_META]) {
-            composerOptions.__meta = composerOptions.__meta || {};
-            composerOptions.__meta[DEVTOOLS_META] = type[DEVTOOLS_META];
-        }
         if (global) {
             composerOptions.__root = global;
         }
@@ -1678,7 +1666,7 @@ function injectGlobalFields(app, composer) {
     app.config.globalProperties.$i18n = i18n;
     globalExportMethods.forEach(method => {
         const desc = Object.getOwnPropertyDescriptor(composer, method);
-        if (!desc) {
+        if (!desc || !desc.value) {
             throw createI18nError(22 /* UNEXPECTED_ERROR */);
         }
         Object.defineProperty(app.config.globalProperties, `$${method}`, desc);