@modern-js/app-tools 2.69.5 → 3.0.0-alpha.0

package/dist/esm/plugins/serverBuild.js

@@ -1,83 +0,0 @@
-import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
-import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import fs from "fs";
-import path from "path";
-import { compile } from "@modern-js/server-utils";
-import { SERVER_DIR, SHARED_DIR, getMeta } from "@modern-js/utils";
-var TS_CONFIG_FILENAME = "tsconfig.json";
-function checkHasCache(appDir) {
-  var tsFilepath = path.resolve(appDir, SERVER_DIR, "cache.ts");
-  var jsfilepath = path.resolve(appDir, SERVER_DIR, "cache.js");
-  return fs.existsSync(tsFilepath) || fs.existsSync(jsfilepath);
-}
-function checkHasConfig(appDir) {
-  var metaName = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "modern-js";
-  var meta = getMeta(metaName);
-  var tsFilepath = path.resolve(appDir, SERVER_DIR, "".concat(meta, ".server.ts"));
-  var jsfilepath = path.resolve(appDir, SERVER_DIR, "".concat(meta, ".server.js"));
-  return fs.existsSync(tsFilepath) || fs.existsSync(jsfilepath);
-}
-function serverBuild_default() {
-  return {
-    name: "@modern-js/server-build",
-    setup: function setup(api) {
-      api.onAfterBuild(/* @__PURE__ */ _async_to_generator(function() {
-        var _api_getAppContext, appDirectory, distDirectory, metaName, modernConfig, distDir, serverDir, sharedDir, tsconfigPath, sourceDirs, server, alias, babel;
-        return _ts_generator(this, function(_state) {
-          switch (_state.label) {
-            case 0:
-              _api_getAppContext = api.getAppContext(), appDirectory = _api_getAppContext.appDirectory, distDirectory = _api_getAppContext.distDirectory, metaName = _api_getAppContext.metaName;
-              if (!checkHasCache(appDirectory) && !checkHasConfig(appDirectory, metaName)) {
-                return [
-                  2
-                ];
-              }
-              modernConfig = api.getNormalizedConfig();
-              distDir = path.resolve(distDirectory);
-              serverDir = path.resolve(appDirectory, SERVER_DIR);
-              sharedDir = path.resolve(appDirectory, SHARED_DIR);
-              tsconfigPath = path.resolve(appDirectory, TS_CONFIG_FILENAME);
-              sourceDirs = [];
-              if (fs.existsSync(serverDir)) {
-                sourceDirs.push(serverDir);
-                if (fs.existsSync(sharedDir)) {
-                  sourceDirs.push(sharedDir);
-                }
-              }
-              server = modernConfig.server;
-              alias = modernConfig.source.alias;
-              babel = modernConfig.tools.babel;
-              if (!(sourceDirs.length > 0))
-                return [
-                  3,
-                  2
-                ];
-              return [
-                4,
-                compile(appDirectory, {
-                  server,
-                  alias,
-                  babelConfig: babel
-                }, {
-                  sourceDirs,
-                  distDir,
-                  tsconfigPath
-                })
-              ];
-            case 1:
-              _state.sent();
-              _state.label = 2;
-            case 2:
-              return [
-                2
-              ];
-          }
-        });
-      }));
-    }
-  };
-}
-;
-export {
-  serverBuild_default as default
-};

package/dist/esm/plugins/serverRuntime.js

@@ -1,22 +0,0 @@
-function serverRuntime_default() {
-  return {
-    name: "@modern-js/plugin-server-runtime",
-    setup: function setup(api) {
-      api.config(function() {
-        return {
-          output: {
-            externals: [
-              {
-                "@modern-js/server-runtime": "@modern-js/server-runtime"
-              }
-            ]
-          }
-        };
-      });
-    }
-  };
-}
-;
-export {
-  serverRuntime_default as default
-};

package/dist/esm/run/index.js

@@ -1,134 +0,0 @@
-import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
-import { _ as _type_of } from "@swc/helpers/_/_type_of";
-import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import path from "path";
-import { initAppDir } from "@modern-js/plugin-v2/cli";
-import { run as CLIPluginRun } from "@modern-js/plugin-v2/run";
-import { chalk, minimist } from "@modern-js/utils";
-import { handleSetupResult } from "../compat/hooks";
-import { PACKAGE_JSON_CONFIG_NAME, STATE_PLUGIN_NAME } from "../constants";
-import { getConfigFile } from "../utils/getConfigFile";
-import { getUserConfig } from "../utils/getUserConfig";
-import { loadInternalPlugins } from "../utils/loadPlugins";
-function createRunOptions(_) {
-  return _createRunOptions.apply(this, arguments);
-}
-function _createRunOptions() {
-  _createRunOptions = _async_to_generator(function(param) {
-    var cwd, initialLog, _param_metaName, metaName, version, internalPlugins, _param_packageJsonConfig, packageJsonConfig, _param_statePluginName, statePluginName, configFile, _userConfig_runtime, _userConfig_runtime1, _userConfig_runtime_state, _userConfig_runtime2, nodeVersion, versionArr, command, cliParams, SUPPORT_CONFIG_PARAM_COMMANDS, customConfigFile, appDirectory, finalConfigFile, userConfig, plugins;
-    return _ts_generator(this, function(_state) {
-      switch (_state.label) {
-        case 0:
-          cwd = param.cwd, initialLog = param.initialLog, _param_metaName = param.metaName, metaName = _param_metaName === void 0 ? "modern-js" : _param_metaName, version = param.version, internalPlugins = param.internalPlugins, _param_packageJsonConfig = param.packageJsonConfig, packageJsonConfig = _param_packageJsonConfig === void 0 ? PACKAGE_JSON_CONFIG_NAME : _param_packageJsonConfig, _param_statePluginName = param.statePluginName, statePluginName = _param_statePluginName === void 0 ? STATE_PLUGIN_NAME : _param_statePluginName, configFile = param.configFile;
-          nodeVersion = process.versions.node;
-          versionArr = nodeVersion.split(".").map(Number);
-          if (versionArr[0] <= 16) {
-            console.warn("\n  ".concat(chalk.bgRed.white.bold(" ⚠️ CRITICAL NODE.JS VERSION ALERT ⚠️ "), "\n\n  ").concat(chalk.red.bold("Node.js 16 End-of-Life Notice:"), "\n  ").concat(chalk.red("- Security updates and support have ended for Node.js 16"), "\n\n  ").concat(chalk.yellow("▸ Detected Runtime:"), "  ").concat(chalk.yellow.bold("Node.js v".concat(nodeVersion)), "\n  ").concat(chalk.green("▸ Required Minimum:"), " ").concat(chalk.green.bold("Node.js LTS (v18.x or higher)"), "\n  ").concat(chalk.green("▸ Recommended:"), " ").concat(chalk.green.bold("Node.js LTS (v22.x or higher)"), "\n\n  ").concat(chalk.cyan("Immediate Action Required:"), "\n    ").concat(chalk.gray("├──"), " ").concat(chalk.yellow("Recommended Upgrade"), "\n       ").concat(chalk.bold("nvm install 22 --lts && nvm use 22"), "\n    ").concat(chalk.gray("├──"), " ").concat(chalk.yellow("Manual Installation"), "\n       ").concat(chalk.underline("https://nodejs.org/download/release/lts-hydrogen/"), "\n     ").concat(chalk.gray("└──"), " ").concat(chalk.yellow("Environment Verification"), "\n       ").concat(chalk.bold("node -v && npm -v"), "\n\n  ").concat(chalk.hex("#AAAAAA").italic("[Security Advisory] Node.js 16 is no longer supported. Upgrade immediately for security and compatibility."), "\n      "));
-          }
-          command = process.argv[2];
-          cliParams = minimist(process.argv.slice(2));
-          SUPPORT_CONFIG_PARAM_COMMANDS = [
-            "dev",
-            "build",
-            "deploy",
-            "start",
-            "serve",
-            "inspect",
-            "upgrade"
-          ];
-          if (SUPPORT_CONFIG_PARAM_COMMANDS.includes(command)) {
-            customConfigFile = cliParams.config || cliParams.c;
-          }
-          if (command === "new") {
-            customConfigFile = cliParams["config-file"];
-          }
-          if (!process.env.NODE_ENV) {
-            if ([
-              "build",
-              "serve",
-              "deploy",
-              "analyze"
-            ].includes(command)) {
-              process.env.NODE_ENV = "production";
-            } else if (command === "test") {
-              process.env.NODE_ENV = "test";
-            } else {
-              process.env.NODE_ENV = "development";
-            }
-          }
-          return [
-            4,
-            initAppDir(cwd)
-          ];
-        case 1:
-          appDirectory = _state.sent();
-          finalConfigFile = customConfigFile || getConfigFile(configFile);
-          return [
-            4,
-            getUserConfig(appDirectory, finalConfigFile, packageJsonConfig, metaName)
-          ];
-        case 2:
-          userConfig = _state.sent();
-          return [
-            4,
-            loadInternalPlugins(appDirectory, internalPlugins === null || internalPlugins === void 0 ? void 0 : internalPlugins.cli, internalPlugins === null || internalPlugins === void 0 ? void 0 : internalPlugins.autoLoad, userConfig.autoLoadPlugins)
-          ];
-        case 3:
-          plugins = _state.sent();
-          if (!userConfig.autoLoadPlugins && userConfig.runtime && typeof userConfig.runtime !== "boolean" && (((_userConfig_runtime = userConfig.runtime) === null || _userConfig_runtime === void 0 ? void 0 : _userConfig_runtime.state) === true || _type_of((_userConfig_runtime1 = userConfig.runtime) === null || _userConfig_runtime1 === void 0 ? void 0 : _userConfig_runtime1.state) === "object" && !((_userConfig_runtime2 = userConfig.runtime) === null || _userConfig_runtime2 === void 0 ? void 0 : (_userConfig_runtime_state = _userConfig_runtime2.state) === null || _userConfig_runtime_state === void 0 ? void 0 : _userConfig_runtime_state.legacy))) {
-            if (!userConfig.plugins.find(function(plugin) {
-              return plugin.name === statePluginName;
-            })) {
-              console.warn("".concat(chalk.red("\n[Warning]"), " We will no longer support built-in `runtime.state`. If you want to use Reduck, you must run ").concat(chalk.yellow.bold("`pnpm add ".concat(statePluginName, "@").concat(version, "`")), " to install the state plugin dependency and manually register the plugin. After install state plugin, please add the following code to ").concat(chalk.yellow.bold("`".concat(path.basename(finalConfigFile), "`")), ":\n\n").concat(chalk.yellow.bold("import { statePlugin } from '".concat(statePluginName, "';\n\nexport default defineConfig({\n  plugins: [\n    ...,\n    statePlugin(),\n  ],\n});\n        "))));
-            }
-          }
-          return [
-            2,
-            {
-              cwd,
-              initialLog: initialLog || "Modern.js Framework v".concat(version),
-              configFile: finalConfigFile,
-              metaName,
-              packageJsonConfig,
-              internalPlugins: plugins,
-              handleSetupResult
-            }
-          ];
-      }
-    });
-  });
-  return _createRunOptions.apply(this, arguments);
-}
-function run(options) {
-  return _run.apply(this, arguments);
-}
-function _run() {
-  _run = _async_to_generator(function(options) {
-    var runOptions;
-    return _ts_generator(this, function(_state) {
-      switch (_state.label) {
-        case 0:
-          return [
-            4,
-            createRunOptions(options)
-          ];
-        case 1:
-          runOptions = _state.sent();
-          return [
-            4,
-            CLIPluginRun(runOptions)
-          ];
-        case 2:
-          _state.sent();
-          return [
-            2
-          ];
-      }
-    });
-  });
-  return _run.apply(this, arguments);
-}
-export {
-  createRunOptions,
-  run
-};

package/dist/esm/types/config/index.js

@@ -1 +0,0 @@
-export * from "./output";

package/dist/esm/types/index.js

@@ -1,3 +0,0 @@
-export * from "./hooks";
-export * from "./config";
-export * from "./legacyConfig";

package/dist/esm/utils/config.js

@@ -1,122 +0,0 @@
-import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
-import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
-import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
-import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import * as path from "path";
-import { bundle } from "@modern-js/node-bundle-require";
-import { fs, CONFIG_FILE_EXTENSIONS, OUTPUT_CONFIG_FILE, ensureAbsolutePath, getServerConfig } from "@modern-js/utils";
-import { stringify } from "flatted";
-var defineServerConfig = function(config) {
-  return config;
-};
-var buildServerConfig = function() {
-  var _ref = _async_to_generator(function(param) {
-    var appDirectory, distDirectory, configFile, options, watch, configFilePath, getOutputFile, configHelperFilePath, helperCode;
-    return _ts_generator(this, function(_state) {
-      switch (_state.label) {
-        case 0:
-          appDirectory = param.appDirectory, distDirectory = param.distDirectory, configFile = param.configFile, options = param.options, watch = param.watch;
-          return [
-            4,
-            getServerConfig(appDirectory, configFile)
-          ];
-        case 1:
-          configFilePath = _state.sent();
-          getOutputFile = function() {
-            var _ref2 = _async_to_generator(function(filepath) {
-              return _ts_generator(this, function(_state2) {
-                return [
-                  2,
-                  path.resolve(distDirectory, "".concat(filepath.replace(new RegExp(CONFIG_FILE_EXTENSIONS.join("|")), ""), ".cjs"))
-                ];
-              });
-            });
-            return function getOutputFile2(filepath) {
-              return _ref2.apply(this, arguments);
-            };
-          }();
-          if (!configFilePath)
-            return [
-              3,
-              5
-            ];
-          configHelperFilePath = path.normalize(path.join(distDirectory, "./config-helper.js"));
-          helperCode = "\n      export const defineConfig = (config) => config;\n    ";
-          return [
-            4,
-            fs.ensureDir(distDirectory)
-          ];
-        case 2:
-          _state.sent();
-          return [
-            4,
-            fs.writeFile(configHelperFilePath, helperCode)
-          ];
-        case 3:
-          _state.sent();
-          return [
-            4,
-            bundle(configFilePath, _object_spread_props(_object_spread({}, options), {
-              watch,
-              getOutputFile,
-              esbuildPlugins: [
-                {
-                  name: "native-build-config",
-                  setup: function setup(ctx) {
-                    ctx.onResolve({
-                      filter: /app-tools\/server/
-                    }, function() {
-                      return {
-                        path: configHelperFilePath
-                      };
-                    });
-                  }
-                }
-              ]
-            }))
-          ];
-        case 4:
-          _state.sent();
-          _state.label = 5;
-        case 5:
-          return [
-            2
-          ];
-      }
-    });
-  });
-  return function buildServerConfig2(_) {
-    return _ref.apply(this, arguments);
-  };
-}();
-var emitResolvedConfig = function() {
-  var _ref = _async_to_generator(function(appDirectory, resolvedConfig) {
-    var _resolvedConfig_output_distPath, outputPath, output;
-    return _ts_generator(this, function(_state) {
-      switch (_state.label) {
-        case 0:
-          outputPath = ensureAbsolutePath(appDirectory, path.join(((_resolvedConfig_output_distPath = resolvedConfig.output.distPath) === null || _resolvedConfig_output_distPath === void 0 ? void 0 : _resolvedConfig_output_distPath.root) || "./dist", OUTPUT_CONFIG_FILE));
-          output = stringify(resolvedConfig);
-          return [
-            4,
-            fs.writeFile(outputPath, output, {
-              encoding: "utf-8"
-            })
-          ];
-        case 1:
-          _state.sent();
-          return [
-            2
-          ];
-      }
-    });
-  });
-  return function emitResolvedConfig2(appDirectory, resolvedConfig) {
-    return _ref.apply(this, arguments);
-  };
-}();
-export {
-  buildServerConfig,
-  defineServerConfig,
-  emitResolvedConfig
-};

package/dist/esm/utils/createServer.js

@@ -1,58 +0,0 @@
-import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
-import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { applyPlugins } from "@modern-js/prod-server";
-import { createDevServer } from "@modern-js/server";
-var server = null;
-var getServer = function() {
-  return server;
-};
-var setServer = function(newServer) {
-  server = newServer;
-};
-var closeServer = function() {
-  var _ref = _async_to_generator(function() {
-    return _ts_generator(this, function(_state) {
-      if (server) {
-        server.close();
-        server = null;
-      }
-      return [
-        2
-      ];
-    });
-  });
-  return function closeServer2() {
-    return _ref.apply(this, arguments);
-  };
-}();
-var createServer = function() {
-  var _ref = _async_to_generator(function(options) {
-    return _ts_generator(this, function(_state) {
-      switch (_state.label) {
-        case 0:
-          if (server) {
-            server.close();
-          }
-          return [
-            4,
-            createDevServer(options, applyPlugins)
-          ];
-        case 1:
-          server = _state.sent().server;
-          return [
-            2,
-            server
-          ];
-      }
-    });
-  });
-  return function createServer2(options) {
-    return _ref.apply(this, arguments);
-  };
-}();
-export {
-  closeServer,
-  createServer,
-  getServer,
-  setServer
-};

package/dist/esm/utils/env.js

@@ -1,16 +0,0 @@
-import { cutNameByHyphen } from "@modern-js/utils/universal";
-function getAutoInjectEnv(appContext) {
-  var metaName = appContext.metaName;
-  var prefix = "".concat(cutNameByHyphen(metaName), "_").toUpperCase();
-  var envReg = new RegExp("^".concat(prefix));
-  return Object.keys(process.env).reduce(function(prev, key) {
-    var value = process.env[key];
-    if (envReg.test(key) && typeof value !== "undefined") {
-      prev["process.env.".concat(key)] = value;
-    }
-    return prev;
-  }, {});
-}
-export {
-  getAutoInjectEnv
-};

package/dist/esm/utils/generateWatchFiles.js

@@ -1,71 +0,0 @@
-import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
-import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
-import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import path from "path";
-import { fs, getServerConfig } from "@modern-js/utils";
-import { PACKAGE_JSON_CONFIG_NAME } from "../constants";
-var getPackageConfig = function(appDirectory, packageJsonConfig) {
-  var json = JSON.parse(fs.readFileSync(path.resolve(appDirectory, "./package.json"), "utf8"));
-  return json[packageJsonConfig !== null && packageJsonConfig !== void 0 ? packageJsonConfig : PACKAGE_JSON_CONFIG_NAME];
-};
-var addServerConfigToDeps = function() {
-  var _ref = _async_to_generator(function(dependencies, appDirectory, serverConfigFile) {
-    var serverConfig;
-    return _ts_generator(this, function(_state) {
-      switch (_state.label) {
-        case 0:
-          return [
-            4,
-            getServerConfig(appDirectory, serverConfigFile)
-          ];
-        case 1:
-          serverConfig = _state.sent();
-          if (serverConfig) {
-            dependencies.push(serverConfig);
-          }
-          return [
-            2
-          ];
-      }
-    });
-  });
-  return function addServerConfigToDeps2(dependencies, appDirectory, serverConfigFile) {
-    return _ref.apply(this, arguments);
-  };
-}();
-function generateWatchFiles(appContext, configDir) {
-  return _generateWatchFiles.apply(this, arguments);
-}
-function _generateWatchFiles() {
-  _generateWatchFiles = _async_to_generator(function(appContext, configDir) {
-    var appDirectory, configFile, configPath, dependencies;
-    return _ts_generator(this, function(_state) {
-      switch (_state.label) {
-        case 0:
-          appDirectory = appContext.appDirectory, configFile = appContext.configFile;
-          configPath = path.join(appDirectory, configDir || "");
-          dependencies = getPackageConfig(appContext.appDirectory, appContext.packageName) ? [
-            path.resolve(appDirectory, "./package.json")
-          ] : [];
-          return [
-            4,
-            addServerConfigToDeps(dependencies, appContext.appDirectory, appContext.serverConfigFile)
-          ];
-        case 1:
-          _state.sent();
-          return [
-            2,
-            [
-              "".concat(configPath, "/html"),
-              configFile || "./config"
-            ].concat(_to_consumable_array(dependencies))
-          ];
-      }
-    });
-  });
-  return _generateWatchFiles.apply(this, arguments);
-}
-export {
-  addServerConfigToDeps,
-  generateWatchFiles
-};

package/dist/esm/utils/getConfigFile.js

@@ -1,11 +0,0 @@
-import path from "path";
-import { CONFIG_FILE_EXTENSIONS, findExists } from "@modern-js/utils";
-import { DEFAULT_CONFIG_FILE } from "../constants";
-var getConfigFile = function(configFile) {
-  return findExists(CONFIG_FILE_EXTENSIONS.map(function(extension) {
-    return path.resolve(process.cwd(), "".concat(configFile || DEFAULT_CONFIG_FILE).concat(extension));
-  }));
-};
-export {
-  getConfigFile
-};

package/dist/esm/utils/getSelectedEntries.js

@@ -1,67 +0,0 @@
-import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
-import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { chalk, inquirer } from "@modern-js/utils";
-import { i18n, localeKeys } from "../locale";
-var getSelectedEntries = function() {
-  var _ref = _async_to_generator(function(entry, entrypoints) {
-    var entryNames, selected;
-    return _ts_generator(this, function(_state) {
-      switch (_state.label) {
-        case 0:
-          entryNames = entrypoints.map(function(e) {
-            return e.entryName;
-          });
-          if (!entry) {
-            return [
-              2,
-              entryNames
-            ];
-          }
-          if (!(typeof entry === "boolean"))
-            return [
-              3,
-              2
-            ];
-          return [
-            4,
-            inquirer.prompt([
-              {
-                type: "checkbox",
-                name: "selected",
-                choices: entryNames,
-                message: i18n.t(localeKeys.command.dev.selectEntry),
-                validate: function validate(answer) {
-                  if (answer.length < 1) {
-                    return i18n.t(localeKeys.command.dev.requireEntry);
-                  }
-                  return true;
-                }
-              }
-            ])
-          ];
-        case 1:
-          selected = _state.sent().selected;
-          return [
-            2,
-            selected
-          ];
-        case 2:
-          entry.forEach(function(name) {
-            if (!entryNames.includes(name)) {
-              throw new Error("Can not found entry ".concat(chalk.yellow(name), ", the entry should be one of ").concat(chalk.yellow(entryNames.join(", "))));
-            }
-          });
-          return [
-            2,
-            entry
-          ];
-      }
-    });
-  });
-  return function getSelectedEntries2(entry, entrypoints) {
-    return _ref.apply(this, arguments);
-  };
-}();
-export {
-  getSelectedEntries
-};

package/dist/esm/utils/getUserConfig.js

@@ -1,32 +0,0 @@
-import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
-import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { createLoadedConfig, loadEnv } from "@modern-js/plugin-v2/cli";
-function getUserConfig(appDirectory, configFile, packageJsonConfig, metaName) {
-  return _getUserConfig.apply(this, arguments);
-}
-function _getUserConfig() {
-  _getUserConfig = _async_to_generator(function(appDirectory, configFile, packageJsonConfig, metaName) {
-    var envName, loaded;
-    return _ts_generator(this, function(_state) {
-      switch (_state.label) {
-        case 0:
-          envName = metaName === "modern-js" ? "MODERN" : metaName;
-          loadEnv(appDirectory, process.env["".concat(envName.toUpperCase(), "_ENV")]);
-          return [
-            4,
-            createLoadedConfig(appDirectory, configFile, packageJsonConfig)
-          ];
-        case 1:
-          loaded = _state.sent();
-          return [
-            2,
-            loaded.config || {}
-          ];
-      }
-    });
-  });
-  return _getUserConfig.apply(this, arguments);
-}
-export {
-  getUserConfig
-};