@umijs/plugins 4.0.7 → 4.0.10

package/dist/utils/modelUtils.js

@@ -1,251 +1,230 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ModelUtils = exports.Model = exports.getNamespace = void 0;
-const parser = __importStar(require("@umijs/bundler-utils/compiled/babel/parser"));
-const traverse_1 = __importDefault(require("@umijs/bundler-utils/compiled/babel/traverse"));
-const t = __importStar(require("@umijs/bundler-utils/compiled/babel/types"));
-const esbuild_1 = require("@umijs/bundler-utils/compiled/esbuild");
-const fs_1 = require("fs");
-const path_1 = require("path");
-const plugin_utils_1 = require("umi/plugin-utils");
-const astUtils_1 = require("./astUtils");
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/utils/modelUtils.ts
+var modelUtils_exports = {};
+__export(modelUtils_exports, {
+  Model: () => Model,
+  ModelUtils: () => ModelUtils,
+  getNamespace: () => getNamespace
+});
+module.exports = __toCommonJS(modelUtils_exports);
+var parser = __toESM(require("@umijs/bundler-utils/compiled/babel/parser"));
+var import_traverse = __toESM(require("@umijs/bundler-utils/compiled/babel/traverse"));
+var t = __toESM(require("@umijs/bundler-utils/compiled/babel/types"));
+var import_esbuild = require("@umijs/bundler-utils/compiled/esbuild");
+var import_fs = require("fs");
+var import_path = require("path");
+var import_plugin_utils = require("umi/plugin-utils");
+var import_astUtils = require("./astUtils");
 function getNamespace(absFilePath, absSrcPath) {
-    const relPath = (0, plugin_utils_1.winPath)((0, path_1.relative)((0, plugin_utils_1.winPath)(absSrcPath), (0, plugin_utils_1.winPath)(absFilePath)));
-    const parts = relPath.split('/');
-    const dirs = parts.slice(0, -1);
-    const file = parts[parts.length - 1];
-    // src/pages/foo/models/bar > foo/bar
-    const validDirs = dirs.filter((dir) => !['src', 'pages', 'models'].includes(dir));
-    let normalizedFile = file;
-    normalizedFile = (0, path_1.basename)(file, (0, path_1.extname)(file));
-    // foo.model > foo
-    if (normalizedFile.endsWith('.model')) {
-        normalizedFile = normalizedFile.split('.').slice(0, -1).join('.');
-    }
-    return [...validDirs, normalizedFile].join('.');
+  const relPath = (0, import_plugin_utils.winPath)((0, import_path.relative)((0, import_plugin_utils.winPath)(absSrcPath), (0, import_plugin_utils.winPath)(absFilePath)));
+  const parts = relPath.split("/");
+  const dirs = parts.slice(0, -1);
+  const file = parts[parts.length - 1];
+  const validDirs = dirs.filter((dir) => !["src", "pages", "models"].includes(dir));
+  let normalizedFile = file;
+  normalizedFile = (0, import_path.basename)(file, (0, import_path.extname)(file));
+  if (normalizedFile.endsWith(".model")) {
+    normalizedFile = normalizedFile.split(".").slice(0, -1).join(".");
+  }
+  return [...validDirs, normalizedFile].join(".");
 }
-exports.getNamespace = getNamespace;
-class Model {
-    constructor(file, absSrcPath, sort, id) {
-        let namespace;
-        let exportName;
-        const [_file, meta] = file.split('#');
-        if (meta) {
-            const metaObj = JSON.parse(meta);
-            namespace = metaObj.namespace;
-            exportName = metaObj.exportName;
-        }
-        this.file = _file;
-        this.id = `model_${id}`;
-        this.namespace = namespace || getNamespace(_file, absSrcPath);
-        this.exportName = exportName || 'default';
-        this.deps = sort ? this.findDeps(sort) : [];
+var Model = class {
+  constructor(file, absSrcPath, sort, id) {
+    let namespace;
+    let exportName;
+    const [_file, meta] = file.split("#");
+    if (meta) {
+      const metaObj = JSON.parse(meta);
+      namespace = metaObj.namespace;
+      exportName = metaObj.exportName;
     }
-    findDeps(sort) {
-        const content = (0, fs_1.readFileSync)(this.file, 'utf-8');
-        // transform with esbuild first
-        // to reduce unexpected ast problem
-        const loader = (0, path_1.extname)(this.file).slice(1);
-        const result = (0, esbuild_1.transformSync)(content, {
-            loader,
-            sourcemap: false,
-            minify: false,
-        });
-        // transform with babel
-        const deps = new Set();
-        const ast = parser.parse(result.code, {
-            sourceType: 'module',
-            sourceFilename: this.file,
-            plugins: [],
-        });
-        // TODO: use sort
-        sort;
-        (0, traverse_1.default)(ast, {
-            CallExpression: (path) => {
-                if (t.isIdentifier(path.node.callee, { name: 'useModel' }) &&
-                    t.isStringLiteral(path.node.arguments[0])) {
-                    deps.add(path.node.arguments[0].value);
-                }
-            },
-        });
-        return [...deps];
+    this.file = _file;
+    this.id = `model_${id}`;
+    this.namespace = namespace || getNamespace(_file, absSrcPath);
+    this.exportName = exportName || "default";
+    this.deps = sort ? this.findDeps(sort) : [];
+  }
+  findDeps(sort) {
+    const content = (0, import_fs.readFileSync)(this.file, "utf-8");
+    const loader = (0, import_path.extname)(this.file).slice(1);
+    const result = (0, import_esbuild.transformSync)(content, {
+      loader,
+      sourcemap: false,
+      minify: false
+    });
+    const deps = /* @__PURE__ */ new Set();
+    const ast = parser.parse(result.code, {
+      sourceType: "module",
+      sourceFilename: this.file,
+      plugins: []
+    });
+    sort;
+    (0, import_traverse.default)(ast, {
+      CallExpression: (path) => {
+        if (t.isIdentifier(path.node.callee, { name: "useModel" }) && t.isStringLiteral(path.node.arguments[0])) {
+          deps.add(path.node.arguments[0].value);
+        }
+      }
+    });
+    return [...deps];
+  }
+};
+var ModelUtils = class {
+  constructor(api, opts) {
+    this.opts = {};
+    this.count = 1;
+    this.api = api;
+    this.opts = opts;
+  }
+  getAllModels(opts) {
+    this.count = 1;
+    const models = [
+      ...this.getModels({
+        base: (0, import_path.join)(this.api.paths.absSrcPath, "models"),
+        pattern: "**/*.{ts,tsx,js,jsx}"
+      }),
+      ...this.getModels({
+        base: (0, import_path.join)(this.api.paths.absPagesPath),
+        pattern: "**/models/**/*.{ts,tsx,js,jsx}"
+      }),
+      ...this.getModels({
+        base: (0, import_path.join)(this.api.paths.absPagesPath),
+        pattern: "**/model.{ts,tsx,js,jsx}"
+      }),
+      ...opts.extraModels
+    ].map((file) => {
+      return new Model(file, this.api.paths.absSrcPath, opts.sort, this.count++);
+    });
+    const namespaces = models.map((model) => model.namespace);
+    if (new Set(namespaces).size !== namespaces.length) {
+      throw new Error(`Duplicate namespace in models: ${namespaces.sort().join(", ")}`);
     }
-}
-exports.Model = Model;
-class ModelUtils {
-    constructor(api, opts) {
-        this.opts = {};
-        this.count = 1;
-        this.api = api;
-        this.opts = opts;
+    if (opts.sort) {
+      const namespaces2 = this.getSortedNamespaces(models);
+      models.sort((a, b) => namespaces2.indexOf(a.namespace) - namespaces2.indexOf(b.namespace));
     }
-    getAllModels(opts) {
-        // reset count
-        this.count = 1;
-        const models = [
-            ...this.getModels({
-                base: (0, path_1.join)(this.api.paths.absSrcPath, 'models'),
-                pattern: '**/*.{ts,tsx,js,jsx}',
-            }),
-            ...this.getModels({
-                base: (0, path_1.join)(this.api.paths.absPagesPath),
-                pattern: '**/models/**/*.{ts,tsx,js,jsx}',
-            }),
-            ...this.getModels({
-                base: (0, path_1.join)(this.api.paths.absPagesPath),
-                pattern: '**/model.{ts,tsx,js,jsx}',
-            }),
-            ...opts.extraModels,
-        ].map((file) => {
-            return new Model(file, this.api.paths.absSrcPath, opts.sort, this.count++);
-        });
-        // check duplicate
-        const namespaces = models.map((model) => model.namespace);
-        if (new Set(namespaces).size !== namespaces.length) {
-            throw new Error(`Duplicate namespace in models: ${namespaces.sort().join(', ')}`);
+    return models;
+  }
+  getSortedNamespaces(models) {
+    let final = [];
+    models.forEach((model, index) => {
+      const { deps, namespace } = model;
+      if (deps && deps.length) {
+        const itemGroup = [...deps, namespace];
+        const cannotUse = [namespace];
+        for (let i = 0; i <= index; i += 1) {
+          if (models[i].deps.filter((v) => cannotUse.includes(v)).length) {
+            if (!cannotUse.includes(models[i].namespace)) {
+              cannotUse.push(models[i].namespace);
+              i = -1;
+            }
+          }
         }
-        // sort models by deps
-        if (opts.sort) {
-            const namespaces = this.getSortedNamespaces(models);
-            models.sort((a, b) => namespaces.indexOf(a.namespace) - namespaces.indexOf(b.namespace));
+        const errorList = deps.filter((v) => cannotUse.includes(v));
+        if (errorList.length) {
+          throw Error(`Circular dependencies: ${namespace} can't use ${errorList.join(", ")}`);
         }
-        return models;
-    }
-    getSortedNamespaces(models) {
-        let final = [];
-        models.forEach((model, index) => {
-            const { deps, namespace } = model;
-            if (deps && deps.length) {
-                const itemGroup = [...deps, namespace];
-                const cannotUse = [namespace];
-                for (let i = 0; i <= index; i += 1) {
-                    if (models[i].deps.filter((v) => cannotUse.includes(v)).length) {
-                        if (!cannotUse.includes(models[i].namespace)) {
-                            cannotUse.push(models[i].namespace);
-                            i = -1;
-                        }
-                    }
-                }
-                const errorList = deps.filter((v) => cannotUse.includes(v));
-                if (errorList.length) {
-                    throw Error(`Circular dependencies: ${namespace} can't use ${errorList.join(', ')}`);
-                }
-                const intersection = final.filter((v) => itemGroup.includes(v));
-                if (intersection.length) {
-                    // first intersection
-                    const finalIndex = final.indexOf(intersection[0]);
-                    // replace with groupItem
-                    final = final
-                        .slice(0, finalIndex)
-                        .concat(itemGroup)
-                        .concat(final.slice(finalIndex + 1));
-                }
-                else {
-                    final.push(...itemGroup);
-                }
-            }
-            if (!final.includes(namespace)) {
-                // first occurrence append to the end
-                final.push(namespace);
-            }
-        });
-        return [...new Set(final)];
-    }
-    getModels(opts) {
-        return plugin_utils_1.glob
-            .sync(opts.pattern || '**/*.{ts,js}', {
-            cwd: opts.base,
-            absolute: true,
-        })
-            .map(plugin_utils_1.winPath)
-            .filter((file) => {
-            if (/\.d.ts$/.test(file))
-                return false;
-            if (/\.(test|e2e|spec).([jt])sx?$/.test(file))
-                return false;
-            const content = (0, fs_1.readFileSync)(file, 'utf-8');
-            return this.isModelValid({ content, file });
-        });
-    }
-    isModelValid(opts) {
-        const { file, content } = opts;
-        if (this.opts.contentTest && this.opts.contentTest(content)) {
-            return true;
+        const intersection = final.filter((v) => itemGroup.includes(v));
+        if (intersection.length) {
+          const finalIndex = final.indexOf(intersection[0]);
+          final = final.slice(0, finalIndex).concat(itemGroup).concat(final.slice(finalIndex + 1));
+        } else {
+          final.push(...itemGroup);
         }
-        // transform with esbuild first
-        // to reduce unexpected ast problem
-        const loader = (0, path_1.extname)(file).slice(1);
-        const result = (0, esbuild_1.transformSync)(content, {
-            loader,
-            sourcemap: false,
-            minify: false,
-        });
-        // transform with babel
-        let ret = false;
-        const ast = parser.parse(result.code, {
-            sourceType: 'module',
-            sourceFilename: file,
-            plugins: [],
-        });
-        (0, traverse_1.default)(ast, {
-            ExportDefaultDeclaration: (path) => {
-                let node = path.node.declaration;
-                node = (0, astUtils_1.getIdentifierDeclaration)(node, path);
-                if (this.opts.astTest && this.opts.astTest({ node, content })) {
-                    ret = true;
-                }
-            },
-        });
-        return ret;
+      }
+      if (!final.includes(namespace)) {
+        final.push(namespace);
+      }
+    });
+    return [...new Set(final)];
+  }
+  getModels(opts) {
+    return import_plugin_utils.glob.sync(opts.pattern || "**/*.{ts,js}", {
+      cwd: opts.base,
+      absolute: true
+    }).map(import_plugin_utils.winPath).filter((file) => {
+      if (/\.d.ts$/.test(file))
+        return false;
+      if (/\.(test|e2e|spec).([jt])sx?$/.test(file))
+        return false;
+      const content = (0, import_fs.readFileSync)(file, "utf-8");
+      return this.isModelValid({ content, file });
+    });
+  }
+  isModelValid(opts) {
+    const { file, content } = opts;
+    if (this.opts.contentTest && this.opts.contentTest(content)) {
+      return true;
     }
-    static getModelsContent(models) {
-        const imports = [];
-        const modelProps = [];
-        models.forEach((model) => {
-            const fileWithoutExt = (0, plugin_utils_1.winPath)((0, path_1.format)({
-                dir: (0, path_1.dirname)(model.file),
-                base: (0, path_1.basename)(model.file, (0, path_1.extname)(model.file)),
-            }));
-            if (model.exportName !== 'default') {
-                imports.push(`import { ${model.exportName} as ${model.id} } from '${fileWithoutExt}';`);
-            }
-            else {
-                imports.push(`import ${model.id} from '${fileWithoutExt}';`);
-            }
-            modelProps.push(`${model.id}: { namespace: '${model.namespace}', model: ${model.id} },`);
-        });
-        return `
-${imports.join('\n')}
+    const loader = (0, import_path.extname)(file).slice(1);
+    const result = (0, import_esbuild.transformSync)(content, {
+      loader,
+      sourcemap: false,
+      minify: false
+    });
+    let ret = false;
+    const ast = parser.parse(result.code, {
+      sourceType: "module",
+      sourceFilename: file,
+      plugins: []
+    });
+    (0, import_traverse.default)(ast, {
+      ExportDefaultDeclaration: (path) => {
+        let node = path.node.declaration;
+        node = (0, import_astUtils.getIdentifierDeclaration)(node, path);
+        if (this.opts.astTest && this.opts.astTest({ node, content })) {
+          ret = true;
+        }
+      }
+    });
+    return ret;
+  }
+  static getModelsContent(models) {
+    const imports = [];
+    const modelProps = [];
+    models.forEach((model) => {
+      const fileWithoutExt = (0, import_plugin_utils.winPath)((0, import_path.format)({
+        dir: (0, import_path.dirname)(model.file),
+        base: (0, import_path.basename)(model.file, (0, import_path.extname)(model.file))
+      }));
+      if (model.exportName !== "default") {
+        imports.push(`import { ${model.exportName} as ${model.id} } from '${fileWithoutExt}';`);
+      } else {
+        imports.push(`import ${model.id} from '${fileWithoutExt}';`);
+      }
+      modelProps.push(`${model.id}: { namespace: '${model.namespace}', model: ${model.id} },`);
+    });
+    return `
+${imports.join("\n")}
 
 export const models = {
-${modelProps.join('\n')}
+${modelProps.join("\n")}
 } as const`;
-    }
-}
-exports.ModelUtils = ModelUtils;
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  Model,
+  ModelUtils,
+  getNamespace
+});

package/dist/utils/resolveProjectDep.js

@@ -1,15 +1,38 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveProjectDep = void 0;
-const path_1 = require("path");
-const plugin_utils_1 = require("umi/plugin-utils");
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/utils/resolveProjectDep.ts
+var resolveProjectDep_exports = {};
+__export(resolveProjectDep_exports, {
+  resolveProjectDep: () => resolveProjectDep
+});
+module.exports = __toCommonJS(resolveProjectDep_exports);
+var import_path = require("path");
+var import_plugin_utils = require("umi/plugin-utils");
 function resolveProjectDep(opts) {
-    var _a, _b;
-    if (((_a = opts.pkg.dependencies) === null || _a === void 0 ? void 0 : _a[opts.dep]) ||
-        ((_b = opts.pkg.devDependencies) === null || _b === void 0 ? void 0 : _b[opts.dep])) {
-        return (0, path_1.dirname)(plugin_utils_1.resolve.sync(`${opts.dep}/package.json`, {
-            basedir: opts.cwd,
-        }));
-    }
+  var _a, _b;
+  if (((_a = opts.pkg.dependencies) == null ? void 0 : _a[opts.dep]) || ((_b = opts.pkg.devDependencies) == null ? void 0 : _b[opts.dep])) {
+    return (0, import_path.dirname)(import_plugin_utils.resolve.sync(`${opts.dep}/package.json`, {
+      basedir: opts.cwd
+    }));
+  }
 }
-exports.resolveProjectDep = resolveProjectDep;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  resolveProjectDep
+});

package/dist/utils/withTmpPath.js

@@ -1,11 +1,33 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.withTmpPath = void 0;
-const path_1 = require("path");
-const plugin_utils_1 = require("umi/plugin-utils");
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/utils/withTmpPath.ts
+var withTmpPath_exports = {};
+__export(withTmpPath_exports, {
+  withTmpPath: () => withTmpPath
+});
+module.exports = __toCommonJS(withTmpPath_exports);
+var import_path = require("path");
+var import_plugin_utils = require("umi/plugin-utils");
 function withTmpPath(opts) {
-    return (0, plugin_utils_1.winPath)((0, path_1.join)(opts.api.paths.absTmpPath, opts.api.plugin.key && !opts.noPluginDir
-        ? `plugin-${opts.api.plugin.key}`
-        : '', opts.path));
+  return (0, import_plugin_utils.winPath)((0, import_path.join)(opts.api.paths.absTmpPath, opts.api.plugin.key && !opts.noPluginDir ? `plugin-${opts.api.plugin.key}` : "", opts.path));
 }
-exports.withTmpPath = withTmpPath;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  withTmpPath
+});

package/libs/locale/localeExports.tpl

@@ -3,7 +3,6 @@ import {
   IntlShape,
   MessageDescriptor,
 } from '{{{ reactIntlPkgPath }}}';
-import { ApplyPluginsType } from 'umi';
 import { getPluginManager } from '../core/plugin';
 import EventEmitter from '{{{EventEmitterPkg}}}';
 // @ts-ignore
@@ -153,7 +152,8 @@ export const setIntl = (locale: string) => {
 export const getLocale = () => {
   const runtimeLocale = getPluginManager().applyPlugins({
     key: 'locale',
-    type: ApplyPluginsType.modify,
+    // workaround: 不使用 ApplyPluginsType.modify 是为了避免循环依赖，与 fast-refresh 一起用时会有问题
+    type: 'modify',
     initialValue: {},
   });
   // runtime getLocale for user define
@@ -201,7 +201,8 @@ export const setLocale = (lang: string, realReload: boolean = true) => {
   //const { pluginManager } = useAppContext();
   //const runtimeLocale = pluginManagerapplyPlugins({
   //  key: 'locale',
-  //  type: ApplyPluginsType.modify,
+  //  workaround: 不使用 ApplyPluginsType.modify 是为了避免循环依赖，与 fast-refresh 一起用时会有问题
+  //  type: 'modify',
   //  initialValue: {},
   //});
 
@@ -261,6 +262,9 @@ http://j.mp/37Fkd5Q
     );
     firstWaring = false;
   }
+  if (!g_intl) {
+    setIntl(getLocale());
+  }
   return g_intl.formatMessage(descriptor, values);
 };