@module-federation/vite 1.1.9 → 1.2.0

package/lib/index.cjs

@@ -1,9 +1,9 @@
+var defu = require('defu');
 var fs = require('fs');
 var path = require('pathe');
 var pluginutils = require('@rollup/pluginutils');
 var estreeWalker = require('estree-walker');
 var MagicString = require('magic-string');
-var defu = require('defu');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -25,6 +25,7 @@ function _interopNamespace(e) {
   return n;
 }
 
+var defu__default = /*#__PURE__*/_interopDefaultLegacy(defu);
 var fs__namespace = /*#__PURE__*/_interopNamespace(fs);
 var path__namespace = /*#__PURE__*/_interopNamespace(path);
 var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
@@ -65,14 +66,6 @@ var addEntry = function addEntry(_ref) {
       devEntryPath = config.base + devEntryPath.replace(/\\\\?/g, '/').replace(/.+?\:([/\\])[/\\]?/, '$1').replace(/^\//, '');
     },
     configureServer: function configureServer(server) {
-      var _server$httpServer;
-      (_server$httpServer = server.httpServer) == null || _server$httpServer.once == null || _server$httpServer.once('listening', function () {
-        var _server$config$server = server.config.server,
-          port = _server$config$server.port,
-          hostConfig = _server$config$server.host;
-        var host = typeof hostConfig === 'string' && hostConfig !== '0.0.0.0' ? hostConfig : 'localhost';
-        fetch("http://" + host + ":" + port + devEntryPath)["catch"](function (e) {});
-      });
       server.middlewares.use(function (req, res, next) {
         if (!fileName) {
           next();
@@ -683,7 +676,7 @@ function generateRemoteEntry(options) {
 var HOST_AUTO_INIT_TAG = '__H_A_I__';
 var hostAutoInitModule = new VirtualModule('hostAutoInit', HOST_AUTO_INIT_TAG);
 function writeHostAutoInit() {
-  hostAutoInitModule.writeSync("\n    import {init} from \"" + REMOTE_ENTRY_ID + "\"\n    init()\n    ");
+  hostAutoInitModule.writeSync("\n    const remoteEntryPromise = import(\"" + REMOTE_ENTRY_ID + "\")\n    // __tla only serves as a hack for vite-plugin-top-level-await. \n    Promise.resolve(remoteEntryPromise)\n      .then(remoteEntry => {\n        return Promise.resolve(remoteEntry.__tla)\n          .then(remoteEntry.init).catch(remoteEntry.init)\n      })\n    ");
 }
 function getHostAutoInitImportId() {
   return hostAutoInitModule.getImportId();
@@ -1106,7 +1099,7 @@ function pluginProxyRemoteEntry () {
           if (_command === 'serve') {
             var _viteConfig$server, _viteConfig$server2;
             var host = typeof ((_viteConfig$server = viteConfig.server) == null ? void 0 : _viteConfig$server.host) === 'string' && viteConfig.server.host !== '0.0.0.0' ? viteConfig.server.host : 'localhost';
-            return Promise.resolve("\n          const {init} = await import(\"//" + host + ":" + ((_viteConfig$server2 = viteConfig.server) == null ? void 0 : _viteConfig$server2.port) + (viteConfig.base + options.filename) + "\")\n          init()\n          ");
+            return Promise.resolve("\n          const origin = window ? window.origin : \"//" + host + ":" + ((_viteConfig$server2 = viteConfig.server) == null ? void 0 : _viteConfig$server2.port) + "\"\n          const remoteEntryPromise = await import(origin + \"" + (viteConfig.base + options.filename) + "\")\n          // __tla only serves as a hack for vite-plugin-top-level-await. \n          Promise.resolve(remoteEntryPromise)\n          .then(remoteEntry => {\n            return Promise.resolve(remoteEntry.__tla)\n              .then(remoteEntry.init).catch(remoteEntry.init)\n          })\n          ");
           }
           return Promise.resolve(code);
         }
@@ -1260,22 +1253,6 @@ function proxySharedModule(options) {
         };
       }));
     }
-  }, {
-    name: 'watchLocalSharedImportMap',
-    apply: 'serve',
-    config: function config(_config3) {
-      _config3.optimizeDeps = defu.defu(_config3.optimizeDeps, {
-        exclude: [getLocalSharedImportMapPath()]
-      });
-      _config3.server = defu.defu(_config3.server, {
-        watch: {
-          ignored: []
-        }
-      });
-      var watch = _config3.server.watch;
-      watch.ignored = [].concat(watch.ignored);
-      watch.ignored.push("!**" + getLocalSharedImportMapPath() + "**");
-    }
   }];
 }
 
@@ -1348,6 +1325,11 @@ function federation(mfUserOptions) {
         find: '@module-federation/runtime',
         replacement: options.implementation
       });
+      _config.build = defu__default["default"](_config.build || {}, {
+        commonjsOptions: {
+          strictRequires: 'auto'
+        }
+      });
       (_config$optimizeDeps = _config.optimizeDeps) == null || (_config$optimizeDeps = _config$optimizeDeps.include) == null || _config$optimizeDeps.push('@module-federation/runtime');
       (_config$optimizeDeps2 = _config.optimizeDeps) == null || (_config$optimizeDeps2 = _config$optimizeDeps2.include) == null || _config$optimizeDeps2.push('__mf__virtual');
       (_config$optimizeDeps3 = _config.optimizeDeps) == null || (_config$optimizeDeps3 = _config$optimizeDeps3.needsInterop) == null || _config$optimizeDeps3.push('__mf__virtual');

package/lib/index.esm.js

@@ -1,3 +1,4 @@
+import defu from 'defu';
 import * as fs from 'fs';
 import { mkdirSync, writeFileSync, existsSync, writeFile } from 'fs';
 import * as path from 'pathe';
@@ -5,7 +6,6 @@ import path__default, { parse, join, dirname, resolve, relative } from 'pathe';
 import { createFilter } from '@rollup/pluginutils';
 import { walk } from 'estree-walker';
 import MagicString from 'magic-string';
-import { defu } from 'defu';
 
 function getFirstHtmlEntryFile(entryFiles) {
   return entryFiles.find(function (file) {
@@ -42,14 +42,6 @@ var addEntry = function addEntry(_ref) {
       devEntryPath = config.base + devEntryPath.replace(/\\\\?/g, '/').replace(/.+?\:([/\\])[/\\]?/, '$1').replace(/^\//, '');
     },
     configureServer: function configureServer(server) {
-      var _server$httpServer;
-      (_server$httpServer = server.httpServer) == null || _server$httpServer.once == null || _server$httpServer.once('listening', function () {
-        var _server$config$server = server.config.server,
-          port = _server$config$server.port,
-          hostConfig = _server$config$server.host;
-        var host = typeof hostConfig === 'string' && hostConfig !== '0.0.0.0' ? hostConfig : 'localhost';
-        fetch("http://" + host + ":" + port + devEntryPath)["catch"](function (e) {});
-      });
       server.middlewares.use(function (req, res, next) {
         if (!fileName) {
           next();
@@ -660,7 +652,7 @@ function generateRemoteEntry(options) {
 var HOST_AUTO_INIT_TAG = '__H_A_I__';
 var hostAutoInitModule = new VirtualModule('hostAutoInit', HOST_AUTO_INIT_TAG);
 function writeHostAutoInit() {
-  hostAutoInitModule.writeSync("\n    import {init} from \"" + REMOTE_ENTRY_ID + "\"\n    init()\n    ");
+  hostAutoInitModule.writeSync("\n    const remoteEntryPromise = import(\"" + REMOTE_ENTRY_ID + "\")\n    // __tla only serves as a hack for vite-plugin-top-level-await. \n    Promise.resolve(remoteEntryPromise)\n      .then(remoteEntry => {\n        return Promise.resolve(remoteEntry.__tla)\n          .then(remoteEntry.init).catch(remoteEntry.init)\n      })\n    ");
 }
 function getHostAutoInitImportId() {
   return hostAutoInitModule.getImportId();
@@ -1083,7 +1075,7 @@ function pluginProxyRemoteEntry () {
           if (_command === 'serve') {
             var _viteConfig$server, _viteConfig$server2;
             var host = typeof ((_viteConfig$server = viteConfig.server) == null ? void 0 : _viteConfig$server.host) === 'string' && viteConfig.server.host !== '0.0.0.0' ? viteConfig.server.host : 'localhost';
-            return Promise.resolve("\n          const {init} = await import(\"//" + host + ":" + ((_viteConfig$server2 = viteConfig.server) == null ? void 0 : _viteConfig$server2.port) + (viteConfig.base + options.filename) + "\")\n          init()\n          ");
+            return Promise.resolve("\n          const origin = window ? window.origin : \"//" + host + ":" + ((_viteConfig$server2 = viteConfig.server) == null ? void 0 : _viteConfig$server2.port) + "\"\n          const remoteEntryPromise = await import(origin + \"" + (viteConfig.base + options.filename) + "\")\n          // __tla only serves as a hack for vite-plugin-top-level-await. \n          Promise.resolve(remoteEntryPromise)\n          .then(remoteEntry => {\n            return Promise.resolve(remoteEntry.__tla)\n              .then(remoteEntry.init).catch(remoteEntry.init)\n          })\n          ");
           }
           return Promise.resolve(code);
         }
@@ -1237,22 +1229,6 @@ function proxySharedModule(options) {
         };
       }));
     }
-  }, {
-    name: 'watchLocalSharedImportMap',
-    apply: 'serve',
-    config: function config(_config3) {
-      _config3.optimizeDeps = defu(_config3.optimizeDeps, {
-        exclude: [getLocalSharedImportMapPath()]
-      });
-      _config3.server = defu(_config3.server, {
-        watch: {
-          ignored: []
-        }
-      });
-      var watch = _config3.server.watch;
-      watch.ignored = [].concat(watch.ignored);
-      watch.ignored.push("!**" + getLocalSharedImportMapPath() + "**");
-    }
   }];
 }
 
@@ -1325,6 +1301,11 @@ function federation(mfUserOptions) {
         find: '@module-federation/runtime',
         replacement: options.implementation
       });
+      _config.build = defu(_config.build || {}, {
+        commonjsOptions: {
+          strictRequires: 'auto'
+        }
+      });
       (_config$optimizeDeps = _config.optimizeDeps) == null || (_config$optimizeDeps = _config$optimizeDeps.include) == null || _config$optimizeDeps.push('@module-federation/runtime');
       (_config$optimizeDeps2 = _config.optimizeDeps) == null || (_config$optimizeDeps2 = _config$optimizeDeps2.include) == null || _config$optimizeDeps2.push('__mf__virtual');
       (_config$optimizeDeps3 = _config.optimizeDeps) == null || (_config$optimizeDeps3 = _config$optimizeDeps3.needsInterop) == null || _config$optimizeDeps3.push('__mf__virtual');

package/lib/index.modern.js

@@ -1,3 +1,4 @@
+import defu from 'defu';
 import * as fs from 'fs';
 import { mkdirSync, writeFileSync, existsSync, writeFile } from 'fs';
 import * as path from 'pathe';
@@ -5,7 +6,6 @@ import path__default, { parse, join, dirname, resolve, relative } from 'pathe';
 import { createFilter } from '@rollup/pluginutils';
 import { walk } from 'estree-walker';
 import MagicString from 'magic-string';
-import { defu } from 'defu';
 
 function getFirstHtmlEntryFile(entryFiles) {
   return entryFiles.find(file => file.endsWith('.html'));
@@ -41,15 +41,6 @@ const addEntry = ({
       devEntryPath = config.base + devEntryPath.replace(/\\\\?/g, '/').replace(/.+?\:([/\\])[/\\]?/, '$1').replace(/^\//, '');
     },
     configureServer(server) {
-      var _server$httpServer;
-      (_server$httpServer = server.httpServer) == null || _server$httpServer.once == null || _server$httpServer.once('listening', () => {
-        const {
-          port,
-          host: hostConfig
-        } = server.config.server;
-        const host = typeof hostConfig === 'string' && hostConfig !== '0.0.0.0' ? hostConfig : 'localhost';
-        fetch(`http://${host}:${port}${devEntryPath}`).catch(e => {});
-      });
       server.middlewares.use((req, res, next) => {
         if (!fileName) {
           next();
@@ -753,8 +744,13 @@ const HOST_AUTO_INIT_TAG = '__H_A_I__';
 const hostAutoInitModule = new VirtualModule('hostAutoInit', HOST_AUTO_INIT_TAG);
 function writeHostAutoInit() {
   hostAutoInitModule.writeSync(`
-    import {init} from "${REMOTE_ENTRY_ID}"
-    init()
+    const remoteEntryPromise = import("${REMOTE_ENTRY_ID}")
+    // __tla only serves as a hack for vite-plugin-top-level-await. 
+    Promise.resolve(remoteEntryPromise)
+      .then(remoteEntry => {
+        return Promise.resolve(remoteEntry.__tla)
+          .then(remoteEntry.init).catch(remoteEntry.init)
+      })
     `);
 }
 function getHostAutoInitImportId() {
@@ -1150,8 +1146,14 @@ function pluginProxyRemoteEntry () {
           var _viteConfig$server, _viteConfig$server2;
           const host = typeof ((_viteConfig$server = viteConfig.server) == null ? void 0 : _viteConfig$server.host) === 'string' && viteConfig.server.host !== '0.0.0.0' ? viteConfig.server.host : 'localhost';
           return `
-          const {init} = await import("//${host}:${(_viteConfig$server2 = viteConfig.server) == null ? void 0 : _viteConfig$server2.port}${viteConfig.base + options.filename}")
-          init()
+          const origin = window ? window.origin : "//${host}:${(_viteConfig$server2 = viteConfig.server) == null ? void 0 : _viteConfig$server2.port}"
+          const remoteEntryPromise = await import(origin + "${viteConfig.base + options.filename}")
+          // __tla only serves as a hack for vite-plugin-top-level-await. 
+          Promise.resolve(remoteEntryPromise)
+          .then(remoteEntry => {
+            return Promise.resolve(remoteEntry.__tla)
+              .then(remoteEntry.init).catch(remoteEntry.init)
+          })
           `;
         }
         return code;
@@ -1290,22 +1292,6 @@ function proxySharedModule(options) {
         };
       }));
     }
-  }, {
-    name: 'watchLocalSharedImportMap',
-    apply: 'serve',
-    config(config) {
-      config.optimizeDeps = defu(config.optimizeDeps, {
-        exclude: [getLocalSharedImportMapPath()]
-      });
-      config.server = defu(config.server, {
-        watch: {
-          ignored: []
-        }
-      });
-      const watch = config.server.watch;
-      watch.ignored = [].concat(watch.ignored);
-      watch.ignored.push(`!**${getLocalSharedImportMapPath()}**`);
-    }
   }];
 }
 
@@ -1387,6 +1373,11 @@ function federation(mfUserOptions) {
         find: '@module-federation/runtime',
         replacement: options.implementation
       });
+      config.build = defu(config.build || {}, {
+        commonjsOptions: {
+          strictRequires: 'auto'
+        }
+      });
       (_config$optimizeDeps = config.optimizeDeps) == null || (_config$optimizeDeps = _config$optimizeDeps.include) == null || _config$optimizeDeps.push('@module-federation/runtime');
       (_config$optimizeDeps2 = config.optimizeDeps) == null || (_config$optimizeDeps2 = _config$optimizeDeps2.include) == null || _config$optimizeDeps2.push('__mf__virtual');
       (_config$optimizeDeps3 = config.optimizeDeps) == null || (_config$optimizeDeps3 = _config$optimizeDeps3.needsInterop) == null || _config$optimizeDeps3.push('__mf__virtual');

package/lib/index.umd.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('fs'), require('pathe'), require('@rollup/pluginutils'), require('estree-walker'), require('magic-string'), require('defu')) :
-  typeof define === 'function' && define.amd ? define(['exports', 'fs', 'pathe', '@rollup/pluginutils', 'estree-walker', 'magic-string', 'defu'], factory) :
-  (global = global || self, factory(global.vite = {}, global.fs, global.pathe, global.pluginutils, global.estreeWalker, global.magicString, global.defu));
-})(this, (function (exports, fs, path, pluginutils, estreeWalker, MagicString, defu) {
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('defu'), require('fs'), require('pathe'), require('@rollup/pluginutils'), require('estree-walker'), require('magic-string')) :
+  typeof define === 'function' && define.amd ? define(['exports', 'defu', 'fs', 'pathe', '@rollup/pluginutils', 'estree-walker', 'magic-string'], factory) :
+  (global = global || self, factory(global.vite = {}, global.defu, global.fs, global.pathe, global.pluginutils, global.estreeWalker, global.magicString));
+})(this, (function (exports, defu, fs, path, pluginutils, estreeWalker, MagicString) {
   function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
   function _interopNamespace(e) {
@@ -23,6 +23,7 @@
     return n;
   }
 
+  var defu__default = /*#__PURE__*/_interopDefaultLegacy(defu);
   var fs__namespace = /*#__PURE__*/_interopNamespace(fs);
   var path__namespace = /*#__PURE__*/_interopNamespace(path);
   var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
@@ -63,14 +64,6 @@
         devEntryPath = config.base + devEntryPath.replace(/\\\\?/g, '/').replace(/.+?\:([/\\])[/\\]?/, '$1').replace(/^\//, '');
       },
       configureServer: function configureServer(server) {
-        var _server$httpServer;
-        (_server$httpServer = server.httpServer) == null || _server$httpServer.once == null || _server$httpServer.once('listening', function () {
-          var _server$config$server = server.config.server,
-            port = _server$config$server.port,
-            hostConfig = _server$config$server.host;
-          var host = typeof hostConfig === 'string' && hostConfig !== '0.0.0.0' ? hostConfig : 'localhost';
-          fetch("http://" + host + ":" + port + devEntryPath)["catch"](function (e) {});
-        });
         server.middlewares.use(function (req, res, next) {
           if (!fileName) {
             next();
@@ -681,7 +674,7 @@
   var HOST_AUTO_INIT_TAG = '__H_A_I__';
   var hostAutoInitModule = new VirtualModule('hostAutoInit', HOST_AUTO_INIT_TAG);
   function writeHostAutoInit() {
-    hostAutoInitModule.writeSync("\n    import {init} from \"" + REMOTE_ENTRY_ID + "\"\n    init()\n    ");
+    hostAutoInitModule.writeSync("\n    const remoteEntryPromise = import(\"" + REMOTE_ENTRY_ID + "\")\n    // __tla only serves as a hack for vite-plugin-top-level-await. \n    Promise.resolve(remoteEntryPromise)\n      .then(remoteEntry => {\n        return Promise.resolve(remoteEntry.__tla)\n          .then(remoteEntry.init).catch(remoteEntry.init)\n      })\n    ");
   }
   function getHostAutoInitImportId() {
     return hostAutoInitModule.getImportId();
@@ -1104,7 +1097,7 @@
             if (_command === 'serve') {
               var _viteConfig$server, _viteConfig$server2;
               var host = typeof ((_viteConfig$server = viteConfig.server) == null ? void 0 : _viteConfig$server.host) === 'string' && viteConfig.server.host !== '0.0.0.0' ? viteConfig.server.host : 'localhost';
-              return Promise.resolve("\n          const {init} = await import(\"//" + host + ":" + ((_viteConfig$server2 = viteConfig.server) == null ? void 0 : _viteConfig$server2.port) + (viteConfig.base + options.filename) + "\")\n          init()\n          ");
+              return Promise.resolve("\n          const origin = window ? window.origin : \"//" + host + ":" + ((_viteConfig$server2 = viteConfig.server) == null ? void 0 : _viteConfig$server2.port) + "\"\n          const remoteEntryPromise = await import(origin + \"" + (viteConfig.base + options.filename) + "\")\n          // __tla only serves as a hack for vite-plugin-top-level-await. \n          Promise.resolve(remoteEntryPromise)\n          .then(remoteEntry => {\n            return Promise.resolve(remoteEntry.__tla)\n              .then(remoteEntry.init).catch(remoteEntry.init)\n          })\n          ");
             }
             return Promise.resolve(code);
           }
@@ -1258,22 +1251,6 @@
           };
         }));
       }
-    }, {
-      name: 'watchLocalSharedImportMap',
-      apply: 'serve',
-      config: function config(_config3) {
-        _config3.optimizeDeps = defu.defu(_config3.optimizeDeps, {
-          exclude: [getLocalSharedImportMapPath()]
-        });
-        _config3.server = defu.defu(_config3.server, {
-          watch: {
-            ignored: []
-          }
-        });
-        var watch = _config3.server.watch;
-        watch.ignored = [].concat(watch.ignored);
-        watch.ignored.push("!**" + getLocalSharedImportMapPath() + "**");
-      }
     }];
   }
 
@@ -1346,6 +1323,11 @@
           find: '@module-federation/runtime',
           replacement: options.implementation
         });
+        _config.build = defu__default["default"](_config.build || {}, {
+          commonjsOptions: {
+            strictRequires: 'auto'
+          }
+        });
         (_config$optimizeDeps = _config.optimizeDeps) == null || (_config$optimizeDeps = _config$optimizeDeps.include) == null || _config$optimizeDeps.push('@module-federation/runtime');
         (_config$optimizeDeps2 = _config.optimizeDeps) == null || (_config$optimizeDeps2 = _config$optimizeDeps2.include) == null || _config$optimizeDeps2.push('__mf__virtual');
         (_config$optimizeDeps3 = _config.optimizeDeps) == null || (_config$optimizeDeps3 = _config$optimizeDeps3.needsInterop) == null || _config$optimizeDeps3.push('__mf__virtual');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/vite",
-  "version": "1.1.9",
+  "version": "1.2.0",
   "description": "Vite plugin for Module Federation",
   "type": "module",
   "source": "src/index.ts",
@@ -9,22 +9,6 @@
   "files": [
     "lib/**/*"
   ],
-  "scripts": {
-    "prepare": "husky install",
-    "fmt": "prettier --write src",
-    "fmt.check": "prettier --check src",
-    "format": "pretty-quick",
-    "dev": "microbundle watch --no-sourcemap --compress=false",
-    "build": "rimraf lib && microbundle --no-sourcemap --compress=false",
-    "dev-rv": "pnpm -filter 'examples-rust-vite*' run dev",
-    "preview-rv": "pnpm -filter 'examples-rust-vite*' run preview",
-    "dev-vv": "pnpm -filter 'examples-vite-vite*' run dev",
-    "dev-nv": "pnpm -filter 'examples-nuxt-vite-host' -filter 'examples-vite-vite-remote' run dev",
-    "preview-vv": "pnpm -filter 'examples-vite-vite*'  run preview",
-    "multi-example": "pnpm --filter \"multi-example-*\" --parallel run start",
-    "test": "vitest",
-    "e2e": "playwright test"
-  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/module-federation/vite.git"
@@ -44,7 +28,6 @@
     "url": "https://github.com/module-federation/vite/issues"
   },
   "homepage": "https://github.com/module-federation/vite#readme",
-  "packageManager": "pnpm@9.1.3",
   "dependencies": {
     "@module-federation/runtime": "^0.8.0",
     "@rollup/pluginutils": "^5.1.0",
@@ -65,5 +48,20 @@
     "vite": "^5.4.3",
     "vitest": "^2.1.1",
     "wait-on": "^8.0.1"
+  },
+  "scripts": {
+    "fmt": "prettier --write src",
+    "fmt.check": "prettier --check src",
+    "format": "pretty-quick",
+    "dev": "microbundle watch --no-sourcemap --compress=false",
+    "build": "rimraf lib && microbundle --no-sourcemap --compress=false",
+    "dev-rv": "pnpm -filter 'examples-rust-vite*' run dev",
+    "preview-rv": "pnpm -filter 'examples-rust-vite*' run preview",
+    "dev-vv": "pnpm -filter 'examples-vite-vite*' run dev",
+    "dev-nv": "pnpm -filter 'examples-nuxt-vite-host' -filter 'examples-vite-vite-remote' run dev",
+    "preview-vv": "pnpm -filter 'examples-vite-vite*'  run preview",
+    "multi-example": "pnpm --filter \"multi-example-*\" --parallel run start",
+    "test": "vitest",
+    "e2e": "playwright test"
   }
-}
+}