@modern-js/plugin-ssg 2.0.0-beta.2 → 2.0.0-beta.4

package/dist/js/node/index.js

@@ -1,184 +1,210 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+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 __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 __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);
+var stdin_exports = {};
+__export(stdin_exports, {
+  default: () => src_default
 });
-exports.default = void 0;
-var _path = _interopRequireDefault(require("path"));
-var _utils = require("@modern-js/utils");
-var _reactRouterDom = require("react-router-dom");
-var _util = require("./libs/util");
-var _server = require("./server");
-var _output = require("./libs/output");
-var _replace = require("./libs/replace");
-var _make = require("./libs/make");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-var _default = () => ({
-  name: '@modern-js/plugin-ssg',
-  pre: ['@modern-js/plugin-server', '@modern-js/plugin-bff'],
-  setup: api => {
+module.exports = __toCommonJS(stdin_exports);
+var import_path = __toESM(require("path"));
+var import_utils = require("@modern-js/utils");
+var import_react_router_dom = require("react-router-dom");
+var import_util = require("./libs/util");
+var import_server = require("./server");
+var import_output = require("./libs/output");
+var import_replace = require("./libs/replace");
+var import_make = require("./libs/make");
+var __defProp2 = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp2 = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp2.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+var src_default = () => ({
+  name: "@modern-js/plugin-ssg",
+  pre: ["@modern-js/plugin-server", "@modern-js/plugin-bff"],
+  setup: (api) => {
     const agreedRouteMap = {};
     return {
       validateSchema() {
-        return _utils.PLUGIN_SCHEMAS['@modern-js/plugin-ssg'];
+        return import_utils.PLUGIN_SCHEMAS["@modern-js/plugin-ssg"];
       },
-      modifyFileSystemRoutes({
-        entrypoint,
-        routes
-      }) {
-        const {
-          entryName
-        } = entrypoint;
-        const flattedRoutes = (0, _util.flattenRoutes)(routes);
+      modifyFileSystemRoutes({ entrypoint, routes }) {
+        const { entryName } = entrypoint;
+        const flattedRoutes = (0, import_util.flattenRoutes)(routes);
         agreedRouteMap[entryName] = flattedRoutes;
-        return {
-          entrypoint,
-          routes
-        };
+        return { entrypoint, routes };
       },
-      async afterBuild() {
-        const resolvedConfig = api.useResolvedConfigContext();
-        const appContext = api.useAppContext();
-        const {
-          appDirectory,
-          entrypoints
-        } = appContext;
-        const {
-          output,
-          server
-        } = resolvedConfig;
-        const {
-          ssg,
-          distPath: {
-            root: outputPath
-          } = {}
-        } = output;
-        const ssgOptions = Array.isArray(ssg) ? ssg.pop() : ssg;
-        // no ssg configuration, skip ssg render.
-        if (!ssgOptions) {
-          return;
-        }
-        const buildDir = _path.default.join(appDirectory, outputPath);
-        const routes = (0, _util.readJSONSpec)(buildDir);
-
-        // filter all routes not web
-        const pageRoutes = routes.filter(route => !route.isApi);
-        const apiRoutes = routes.filter(route => route.isApi);
-
-        // if no web page route, skip ssg render
-        if (pageRoutes.length === 0) {
-          return;
-        }
-        const intermediateOptions = (0, _util.standardOptions)(ssgOptions, entrypoints, pageRoutes, server);
-        if (!intermediateOptions) {
-          return;
-        }
-        const ssgRoutes = [];
-        // each route will try to match the configuration
-        pageRoutes.forEach(pageRoute => {
-          const {
-            entryName,
-            entryPath
-          } = pageRoute;
-          const agreedRoutes = agreedRouteMap[entryName];
-          let entryOptions = intermediateOptions[entryName] || intermediateOptions[pageRoute.urlPath];
-          if (!agreedRoutes) {
-            // default behavior for non-agreed route
-            if (!entryOptions) {
-              return;
-            }
-
-            // only add entry route if entryOptions is true
-            if (entryOptions === true) {
-              ssgRoutes.push(_objectSpread(_objectSpread({}, pageRoute), {}, {
-                output: entryPath
-              }));
-            } else if (entryOptions.routes && entryOptions.routes.length > 0) {
-              // if entryOptions is object and has routes options
-              // add every route in options
+      afterBuild() {
+        return __async(this, null, function* () {
+          const resolvedConfig = api.useResolvedConfigContext();
+          const appContext = api.useAppContext();
+          const { appDirectory, entrypoints } = appContext;
+          const { output, server } = resolvedConfig;
+          const { ssg, distPath: { root: outputPath } = {} } = output;
+          const ssgOptions = Array.isArray(ssg) ? ssg.pop() : ssg;
+          if (!ssgOptions) {
+            return;
+          }
+          const buildDir = import_path.default.join(appDirectory, outputPath);
+          const routes = (0, import_util.readJSONSpec)(buildDir);
+          const pageRoutes = routes.filter((route) => !route.isApi);
+          const apiRoutes = routes.filter((route) => route.isApi);
+          if (pageRoutes.length === 0) {
+            return;
+          }
+          const intermediateOptions = (0, import_util.standardOptions)(
+            ssgOptions,
+            entrypoints,
+            pageRoutes,
+            server
+          );
+          if (!intermediateOptions) {
+            return;
+          }
+          const ssgRoutes = [];
+          pageRoutes.forEach((pageRoute) => {
+            const { entryName, entryPath } = pageRoute;
+            const agreedRoutes = agreedRouteMap[entryName];
+            let entryOptions = intermediateOptions[entryName] || intermediateOptions[pageRoute.urlPath];
+            if (!agreedRoutes) {
+              if (!entryOptions) {
+                return;
+              }
+              if (entryOptions === true) {
+                ssgRoutes.push(__spreadProps(__spreadValues({}, pageRoute), { output: entryPath }));
+              } else if (entryOptions.routes && entryOptions.routes.length > 0) {
+                const { routes: enrtyRoutes, headers } = entryOptions;
+                enrtyRoutes.forEach((route) => {
+                  ssgRoutes.push((0, import_make.makeRoute)(pageRoute, route, headers));
+                });
+              }
+            } else {
+              if (!entryOptions) {
+                return;
+              }
+              if (entryOptions === true) {
+                entryOptions = { preventDefault: [], routes: [], headers: {} };
+              }
               const {
-                routes: enrtyRoutes,
+                preventDefault = [],
+                routes: userRoutes = [],
                 headers
               } = entryOptions;
-              enrtyRoutes.forEach(route => {
-                ssgRoutes.push((0, _make.makeRoute)(pageRoute, route, headers));
-              });
-            }
-          } else {
-            // Unless entryOptions is set to false
-            // the default behavior is to add all file-based routes
-            if (!entryOptions) {
-              return;
-            }
-            if (entryOptions === true) {
-              entryOptions = {
-                preventDefault: [],
-                routes: [],
-                headers: {}
-              };
-            }
-            const {
-              preventDefault = [],
-              routes: userRoutes = [],
-              headers
-            } = entryOptions;
-            // if the user sets the routes, then only add them
-            if (userRoutes.length > 0) {
-              userRoutes.forEach(route => {
-                if (typeof route === 'string') {
-                  ssgRoutes.push((0, _make.makeRoute)(pageRoute, route, headers));
-                } else if (Array.isArray(route.params)) {
-                  route.params.forEach(param => {
-                    ssgRoutes.push((0, _make.makeRoute)(pageRoute, _objectSpread(_objectSpread({}, route), {}, {
-                      url: (0, _reactRouterDom.generatePath)(route.url, param)
-                    }), headers));
-                  });
-                } else {
-                  ssgRoutes.push((0, _make.makeRoute)(pageRoute, route, headers));
-                }
-              });
-            } else {
-              // otherwith add all except dynamic routes
-              agreedRoutes.filter(route => !preventDefault.includes(route.path)).forEach(route => {
-                if (!(0, _util.isDynamicUrl)(route.path)) {
-                  ssgRoutes.push((0, _make.makeRoute)(pageRoute, route.path, headers));
-                }
-              });
+              if (userRoutes.length > 0) {
+                userRoutes.forEach((route) => {
+                  if (typeof route === "string") {
+                    ssgRoutes.push((0, import_make.makeRoute)(pageRoute, route, headers));
+                  } else if (Array.isArray(route.params)) {
+                    route.params.forEach((param) => {
+                      ssgRoutes.push(
+                        (0, import_make.makeRoute)(
+                          pageRoute,
+                          __spreadProps(__spreadValues({}, route), { url: (0, import_react_router_dom.generatePath)(route.url, param) }),
+                          headers
+                        )
+                      );
+                    });
+                  } else {
+                    ssgRoutes.push((0, import_make.makeRoute)(pageRoute, route, headers));
+                  }
+                });
+              } else {
+                agreedRoutes.filter((route) => !preventDefault.includes(route.path)).forEach((route) => {
+                  if (!(0, import_util.isDynamicUrl)(route.path)) {
+                    ssgRoutes.push((0, import_make.makeRoute)(pageRoute, route.path, headers));
+                  }
+                });
+              }
             }
+          });
+          if (ssgRoutes.length === 0) {
+            return;
           }
-        });
-        if (ssgRoutes.length === 0) {
-          return;
-        }
-
-        // currently SSG and SSR cannot be turned on at the same time、same route
-        ssgRoutes.forEach(ssgRoute => {
-          if (ssgRoute.isSSR) {
-            const isOriginRoute = pageRoutes.some(pageRoute => pageRoute.urlPath === ssgRoute.urlPath && pageRoute.entryName === ssgRoute.entryName);
-            if (isOriginRoute) {
-              throw new Error(`ssg can not using with ssr，url - ${ssgRoute.urlPath}, entry - ${ssgRoute.entryName} `);
+          ssgRoutes.forEach((ssgRoute) => {
+            if (ssgRoute.isSSR) {
+              const isOriginRoute = pageRoutes.some(
+                (pageRoute) => pageRoute.urlPath === ssgRoute.urlPath && pageRoute.entryName === ssgRoute.entryName
+              );
+              if (isOriginRoute) {
+                throw new Error(
+                  `ssg can not using with ssr，url - ${ssgRoute.urlPath}, entry - ${ssgRoute.entryName} `
+                );
+              }
+              import_utils.logger.warn(
+                `new ssg route ${ssgRoute.urlPath} is using ssr now，maybe from parent route ${ssgRoute.entryName}，close ssr`
+              );
             }
-            _utils.logger.warn(`new ssg route ${ssgRoute.urlPath} is using ssr now，maybe from parent route ${ssgRoute.entryName}，close ssr`);
-          }
-          ssgRoute.isSSR = false;
-          ssgRoute.output = (0, _util.formatOutput)(ssgRoute.output);
+            ssgRoute.isSSR = false;
+            ssgRoute.output = (0, import_util.formatOutput)(ssgRoute.output);
+          });
+          const htmlAry = yield (0, import_server.createServer)(
+            api,
+            ssgRoutes,
+            pageRoutes,
+            apiRoutes,
+            resolvedConfig,
+            appDirectory
+          );
+          (0, import_output.writeHtmlFile)(htmlAry, ssgRoutes, buildDir);
+          (0, import_replace.replaceRoute)(ssgRoutes, pageRoutes);
+          (0, import_util.writeJSONSpec)(buildDir, pageRoutes.concat(apiRoutes));
+          import_utils.logger.info("ssg Compiled successfully");
         });
-        const htmlAry = await (0, _server.createServer)(api, ssgRoutes, pageRoutes, apiRoutes, resolvedConfig, appDirectory);
-
-        // write to dist file
-        (0, _output.writeHtmlFile)(htmlAry, ssgRoutes, buildDir);
-
-        // format route info, side effect
-        (0, _replace.replaceRoute)(ssgRoutes, pageRoutes);
-
-        // write routes to spec file
-        (0, _util.writeJSONSpec)(buildDir, pageRoutes.concat(apiRoutes));
-        _utils.logger.info('ssg Compiled successfully');
       }
     };
   }
 });
-exports.default = _default;

package/dist/js/node/libs/make.js

@@ -1,41 +1,75 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+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 __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 __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);
+var stdin_exports = {};
+__export(stdin_exports, {
+  makeRender: () => makeRender,
+  makeRoute: () => makeRoute
 });
-exports.makeRender = makeRender;
-exports.makeRoute = makeRoute;
-var _path = _interopRequireDefault(require("path"));
-var _normalizePath = _interopRequireDefault(require("normalize-path"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+module.exports = __toCommonJS(stdin_exports);
+var import_path = __toESM(require("path"));
+var import_normalize_path = __toESM(require("normalize-path"));
+var __defProp2 = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp2 = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp2.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 function makeRender(ssgRoutes, render, port) {
-  return ssgRoutes.map(ssgRoute => render({
-    url: ssgRoute.urlPath,
-    headers: _objectSpread({
-      host: `localhost:${port}`
-    }, ssgRoute.headers),
-    connection: {}
-  }));
+  return ssgRoutes.map(
+    (ssgRoute) => render({
+      url: ssgRoute.urlPath,
+      headers: __spreadValues({ host: `localhost:${port}` }, ssgRoute.headers),
+      connection: {}
+    })
+  );
 }
 function makeRoute(baseRoute, route, headers = {}) {
-  const {
-    urlPath,
-    entryPath
-  } = baseRoute;
-  if (typeof route === 'string') {
-    return _objectSpread(_objectSpread({}, baseRoute), {}, {
-      urlPath: (0, _normalizePath.default)(`${urlPath}${route}`) || '/',
+  const { urlPath, entryPath } = baseRoute;
+  if (typeof route === "string") {
+    return __spreadProps(__spreadValues({}, baseRoute), {
+      urlPath: (0, import_normalize_path.default)(`${urlPath}${route}`) || "/",
       headers,
-      output: _path.default.join(entryPath, `..${route === '/' ? '' : route}`)
+      output: import_path.default.join(entryPath, `..${route === "/" ? "" : route}`)
     });
   } else {
-    return _objectSpread(_objectSpread({}, baseRoute), {}, {
-      urlPath: (0, _normalizePath.default)(`${urlPath}${route.url}`) || '/',
-      headers: _objectSpread(_objectSpread({}, headers), route.headers),
-      output: route.output ? _path.default.normalize(route.output) : _path.default.join(entryPath, `..${route.url === '/' ? '' : route.url}`)
+    return __spreadProps(__spreadValues({}, baseRoute), {
+      urlPath: (0, import_normalize_path.default)(`${urlPath}${route.url}`) || "/",
+      headers: __spreadValues(__spreadValues({}, headers), route.headers),
+      output: route.output ? import_path.default.normalize(route.output) : import_path.default.join(entryPath, `..${route.url === "/" ? "" : route.url}`)
     });
   }
-}
+}

package/dist/js/node/libs/output.js

@@ -1,19 +1,40 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+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 __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 __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);
+var stdin_exports = {};
+__export(stdin_exports, {
+  writeHtmlFile: () => writeHtmlFile
 });
-exports.writeHtmlFile = writeHtmlFile;
-var _path = _interopRequireDefault(require("path"));
-var _utils = require("@modern-js/utils");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+module.exports = __toCommonJS(stdin_exports);
+var import_path = __toESM(require("path"));
+var import_utils = require("@modern-js/utils");
 function writeHtmlFile(htmlAry, ssgRoutes, baseDir) {
   htmlAry.forEach((html, index) => {
     const ssgRoute = ssgRoutes[index];
-    const filepath = _path.default.join(baseDir, ssgRoute.output);
-    if (!_utils.fs.existsSync(_path.default.dirname(filepath))) {
-      _utils.fs.ensureDirSync(_path.default.dirname(filepath));
+    const filepath = import_path.default.join(baseDir, ssgRoute.output);
+    if (!import_utils.fs.existsSync(import_path.default.dirname(filepath))) {
+      import_utils.fs.ensureDirSync(import_path.default.dirname(filepath));
     }
-    _utils.fs.writeFileSync(filepath, html);
+    import_utils.fs.writeFileSync(filepath, html);
   });
-}
+}