@electron-forge/plugin-vite 7.4.0 → 7.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@electron-forge/plugin-vite",
-  "version": "7.4.0",
+  "version": "7.6.0",
   "description": "Vite plugin for Electron Forge, lets you use Vite directly in your tooling",
   "repository": {
     "type": "git",
@@ -15,17 +15,17 @@
     "test": "xvfb-maybe mocha --config ../../../.mocharc.js test/**/*_spec.ts test/*_spec.ts"
   },
   "dependencies": {
-    "@electron-forge/core-utils": "7.4.0",
-    "@electron-forge/plugin-base": "7.4.0",
-    "@electron-forge/shared-types": "7.4.0",
-    "@electron-forge/web-multi-logger": "7.4.0",
+    "@electron-forge/core-utils": "7.6.0",
+    "@electron-forge/plugin-base": "7.6.0",
+    "@electron-forge/shared-types": "7.6.0",
+    "@electron-forge/web-multi-logger": "7.6.0",
     "chalk": "^4.0.0",
     "debug": "^4.3.1",
     "fs-extra": "^10.0.0",
     "listr2": "^7.0.2"
   },
   "devDependencies": {
-    "@electron/packager": "^18.3.1",
+    "@electron/packager": "^18.3.5",
     "@malept/cross-spawn-promise": "^2.0.0",
     "@types/node": "^18.0.3",
     "chai": "^4.3.3",
@@ -42,7 +42,8 @@
   },
   "files": [
     "dist",
-    "src"
+    "src",
+    "forge-vite-env.d.ts"
   ],
-  "gitHead": "d3d47b2bc53be13609b5ff4d858275ce74bff819"
+  "gitHead": "37a66f2a42e2ea74a30d168a32aff69c90cc20b9"
 }

package/src/Config.ts

@@ -1,22 +1,26 @@
-// eslint-disable-next-line node/no-unpublished-import
 import type { LibraryOptions } from 'vite';
 
 export interface VitePluginBuildConfig {
   /**
    * Alias of `build.lib.entry` in `config`.
    */
-  entry?: LibraryOptions['entry'];
+  entry: LibraryOptions['entry'];
   /**
    * Vite config file path.
    */
   config: string;
+  /**
+   * The build target is main process or preload script.
+   * @defaultValue 'main'
+   */
+  target?: 'main' | 'preload';
 }
 
 export interface VitePluginRendererConfig {
   /**
    * Human friendly name of your entry point.
    */
-  name?: string;
+  name: string;
   /**
    * Vite config file path.
    */

package/src/ViteConfig.ts

@@ -1,33 +1,47 @@
 import debug from 'debug';
-// eslint-disable-next-line node/no-unpublished-import
 import { loadConfigFromFile } from 'vite';
 
+import { getConfig as getMainViteConfig } from './config/vite.main.config';
+import { getConfig as getPreloadViteConfig } from './config/vite.preload.config';
+import { getConfig as getRendererViteConfig } from './config/vite.renderer.config';
+
 import type { VitePluginBuildConfig, VitePluginConfig, VitePluginRendererConfig } from './Config';
-// eslint-disable-next-line node/no-unpublished-import
 import type { ConfigEnv, UserConfig } from 'vite';
 
 const d = debug('@electron-forge/plugin-vite:ViteConfig');
 
+type Target = NonNullable<VitePluginBuildConfig['target']> | 'renderer';
+
 export default class ViteConfigGenerator {
   constructor(private readonly pluginConfig: VitePluginConfig, private readonly projectDir: string, private readonly isProd: boolean) {
     d('Config mode:', this.mode);
   }
 
-  resolveConfig(buildConfig: VitePluginBuildConfig | VitePluginRendererConfig, configEnv: Partial<ConfigEnv> = {}) {
-    // @see - https://vitejs.dev/config/#conditional-config
-    configEnv.command ??= this.isProd ? 'build' : 'serve';
-    // `mode` affects `.env.[mode]` file load.
-    configEnv.mode ??= this.mode;
+  async resolveConfig(buildConfig: VitePluginBuildConfig | VitePluginRendererConfig, target: Target): Promise<UserConfig> {
+    const configEnv: ConfigEnv = {
+      // @see - https://vitejs.dev/config/#conditional-config
+      command: this.isProd ? 'build' : 'serve',
+      // `mode` affects `.env.[mode]` file load.
+      mode: this.mode,
 
-    // Hack! Pass the forge runtime config to the vite config file in the template.
-    Object.assign(configEnv, {
+      // Forge extension variables.
       root: this.projectDir,
       forgeConfig: this.pluginConfig,
       forgeConfigSelf: buildConfig,
-    });
+    };
 
     // `configEnv` is to be passed as an arguments when the user export a function in `vite.config.js`.
-    return loadConfigFromFile(configEnv as ConfigEnv, buildConfig.config);
+    const userConfig = (await loadConfigFromFile(configEnv, buildConfig.config))?.config;
+    switch (target) {
+      case 'main':
+        return getMainViteConfig(configEnv as ConfigEnv<'build'>, userConfig);
+      case 'preload':
+        return getPreloadViteConfig(configEnv as ConfigEnv<'build'>, userConfig);
+      case 'renderer':
+        return getRendererViteConfig(configEnv as ConfigEnv<'renderer'>, userConfig);
+      default:
+        throw new Error(`Unknown target: ${target}, expected 'main', 'preload' or 'renderer'`);
+    }
   }
 
   get mode(): string {
@@ -45,7 +59,7 @@ export default class ViteConfigGenerator {
     const configs = this.pluginConfig.build
       // Prevent load the default `vite.config.js` file.
       .filter(({ config }) => config)
-      .map<Promise<UserConfig>>(async (buildConfig) => (await this.resolveConfig(buildConfig))?.config ?? {});
+      .map((buildConfig) => this.resolveConfig(buildConfig, buildConfig.target ?? 'main'));
 
     return await Promise.all(configs);
   }
@@ -56,8 +70,9 @@ export default class ViteConfigGenerator {
     }
 
     const configs = this.pluginConfig.renderer
+      // Prevent load the default `vite.config.js` file.
       .filter(({ config }) => config)
-      .map<Promise<UserConfig>>(async (buildConfig) => (await this.resolveConfig(buildConfig))?.config ?? {});
+      .map((buildConfig) => this.resolveConfig(buildConfig, 'renderer'));
 
     return await Promise.all(configs);
   }

package/src/VitePlugin.ts

@@ -5,15 +5,13 @@ import chalk from 'chalk';
 import debug from 'debug';
 import fs from 'fs-extra';
 import { PRESET_TIMER } from 'listr2';
-// eslint-disable-next-line node/no-unpublished-import
 import { default as vite } from 'vite';
 
-import { getFlatDependencies } from './util/package';
 import { onBuildDone } from './util/plugins';
 import ViteConfigGenerator from './ViteConfig';
 
 import type { VitePluginConfig } from './Config';
-import type { ForgeMultiHookMap, ResolvedForgeConfig, StartResult } from '@electron-forge/shared-types';
+import type { ForgeMultiHookMap, ResolvedForgeConfig } from '@electron-forge/shared-types';
 import type { AddressInfo } from 'node:net';
 // eslint-disable-next-line node/no-extraneous-import
 import type { RollupWatcher } from 'rollup';
@@ -58,6 +56,37 @@ export default class VitePlugin extends PluginBase<VitePluginConfig> {
 
   getHooks = (): ForgeMultiHookMap => {
     return {
+      preStart: [
+        namedHookWithTaskFn<'preStart'>(async (task) => {
+          if (VitePlugin.alreadyStarted) return;
+          VitePlugin.alreadyStarted = true;
+
+          await fs.remove(this.baseDir);
+
+          return task?.newListr([
+            {
+              title: 'Launching dev servers for renderer process code',
+              task: async () => {
+                await this.launchRendererDevServers();
+              },
+              rendererOptions: {
+                persistentOutput: true,
+                timer: { ...PRESET_TIMER },
+              },
+            },
+            // The main process depends on the `server.port` of the renderer process, so the renderer process is run first.
+            {
+              title: 'Compiling main process code',
+              task: async () => {
+                await this.build();
+              },
+              rendererOptions: {
+                timer: { ...PRESET_TIMER },
+              },
+            },
+          ]) as any;
+        }, 'Preparing vite bundles'),
+      ],
       prePackage: [
         namedHookWithTaskFn<'prePackage'>(async () => {
           this.isProd = true;
@@ -95,8 +124,10 @@ Your packaged app may be larger than expected if you dont ignore everything othe
     forgeConfig.packagerConfig.ignore = (file: string) => {
       if (!file) return false;
 
-      // Always starts with `/`
+      // `file` always starts with `/`
       // @see - https://github.com/electron/packager/blob/v18.1.3/src/copy-filter.ts#L89-L93
+
+      // Collect the files built by Vite
       return !file.startsWith('/.vite');
     };
     return forgeConfig;
@@ -104,7 +135,6 @@ Your packaged app may be larger than expected if you dont ignore everything othe
 
   packageAfterCopy = async (_forgeConfig: ResolvedForgeConfig, buildPath: string): Promise<void> => {
     const pj = await fs.readJson(path.resolve(this.projectDir, 'package.json'));
-    const flatDependencies = await getFlatDependencies(this.projectDir);
 
     if (!pj.main?.includes('.vite/')) {
       throw new Error(`Electron Forge is configured to use the Vite plugin. The plugin expects the
@@ -116,47 +146,7 @@ the generated files). Instead, it is ${JSON.stringify(pj.main)}`);
       delete pj.config.forge;
     }
 
-    await fs.writeJson(path.resolve(buildPath, 'package.json'), pj, {
-      spaces: 2,
-    });
-
-    // Copy the dependencies in package.json
-    for (const dep of flatDependencies) {
-      await fs.copy(dep.src, path.resolve(buildPath, dep.dest));
-    }
-  };
-
-  startLogic = async (): Promise<StartResult> => {
-    if (VitePlugin.alreadyStarted) return false;
-    VitePlugin.alreadyStarted = true;
-
-    await fs.remove(this.baseDir);
-
-    return {
-      tasks: [
-        {
-          title: 'Launching dev servers for renderer process code',
-          task: async () => {
-            await this.launchRendererDevServers();
-          },
-          rendererOptions: {
-            persistentOutput: true,
-            timer: { ...PRESET_TIMER },
-          },
-        },
-        // The main process depends on the `server.port` of the renderer process, so the renderer process is run first.
-        {
-          title: 'Compiling main process code',
-          task: async () => {
-            await this.build();
-          },
-          rendererOptions: {
-            timer: { ...PRESET_TIMER },
-          },
-        },
-      ],
-      result: false,
-    };
+    await fs.writeJson(path.resolve(buildPath, 'package.json'), pj, { spaces: 2 });
   };
 
   // Main process, Preload scripts and Worker process, etc.

package/src/config/vite.base.config.ts

@@ -0,0 +1,97 @@
+import { builtinModules } from 'node:module';
+
+import type { AddressInfo } from 'node:net';
+import type { ConfigEnv, Plugin, UserConfig, ViteDevServer } from 'vite';
+
+export const builtins = ['electron', ...builtinModules.map((m) => [m, `node:${m}`]).flat()];
+
+export const external = [...builtins];
+
+// Used for hot reload after preload scripts.
+const viteDevServers: Record<string, ViteDevServer> = {};
+const viteDevServerUrls: Record<string, string> = {};
+
+export function getBuildConfig(env: ConfigEnv<'build'>): UserConfig {
+  const { root, mode, command } = env;
+
+  return {
+    root,
+    mode,
+    build: {
+      // Prevent multiple builds from interfering with each other.
+      emptyOutDir: false,
+      // 🚧 Multiple builds may conflict.
+      outDir: '.vite/build',
+      watch: command === 'serve' ? {} : null,
+      minify: command === 'build',
+    },
+    clearScreen: false,
+  };
+}
+
+export function getDefineKeys(names: string[]) {
+  const define: { [name: string]: VitePluginRuntimeKeys } = {};
+
+  return names.reduce((acc, name) => {
+    const NAME = name.toUpperCase();
+    const keys: VitePluginRuntimeKeys = {
+      VITE_DEV_SERVER_URL: `${NAME}_VITE_DEV_SERVER_URL`,
+      VITE_NAME: `${NAME}_VITE_NAME`,
+    };
+
+    return { ...acc, [name]: keys };
+  }, define);
+}
+
+export function getBuildDefine(env: ConfigEnv<'build'>) {
+  const { command, forgeConfig } = env;
+  const names = forgeConfig.renderer.filter(({ name }) => name != null).map(({ name }) => name!);
+  const defineKeys = getDefineKeys(names);
+  const define = Object.entries(defineKeys).reduce((acc, [name, keys]) => {
+    const { VITE_DEV_SERVER_URL, VITE_NAME } = keys;
+    const def = {
+      [VITE_DEV_SERVER_URL]: command === 'serve' ? JSON.stringify(viteDevServerUrls[VITE_DEV_SERVER_URL]) : undefined,
+      [VITE_NAME]: JSON.stringify(name),
+    };
+    return { ...acc, ...def };
+  }, {} as Record<string, any>);
+
+  return define;
+}
+
+export function pluginExposeRenderer(name: string): Plugin {
+  const { VITE_DEV_SERVER_URL } = getDefineKeys([name])[name];
+
+  return {
+    name: '@electron-forge/plugin-vite:expose-renderer',
+    configureServer(server) {
+      // Expose server for preload scripts hot reload.
+      viteDevServers[name] = server;
+
+      server.httpServer?.once('listening', () => {
+        const addressInfo = server.httpServer?.address() as AddressInfo;
+        // Expose env constant for main process use.
+        viteDevServerUrls[VITE_DEV_SERVER_URL] = `http://localhost:${addressInfo?.port}`;
+      });
+    },
+  };
+}
+
+export function pluginHotRestart(command: 'reload' | 'restart'): Plugin {
+  return {
+    name: '@electron-forge/plugin-vite:hot-restart',
+    closeBundle() {
+      if (command === 'reload') {
+        for (const server of Object.values(viteDevServers)) {
+          // Preload scripts hot reload.
+          server.ws.send({ type: 'full-reload' });
+        }
+      } else if (command === 'restart') {
+        // Main process hot restart.
+        // https://github.com/electron/forge/blob/v7.2.0/packages/api/core/src/api/start.ts#L216-L223
+        // TODO: blocked in #3380
+        // process.stdin.emit('data', 'rs');
+      }
+    },
+  };
+}

package/src/config/vite.main.config.ts

@@ -0,0 +1,33 @@
+import { type ConfigEnv, mergeConfig, type UserConfig } from 'vite';
+
+import { external, getBuildConfig, getBuildDefine, pluginHotRestart } from './vite.base.config';
+
+export function getConfig(forgeEnv: ConfigEnv<'build'>, userConfig: UserConfig = {}): UserConfig {
+  const { forgeConfigSelf } = forgeEnv;
+  const define = getBuildDefine(forgeEnv);
+  const config: UserConfig = {
+    build: {
+      rollupOptions: {
+        external,
+      },
+    },
+    plugins: [pluginHotRestart('restart')],
+    define,
+    resolve: {
+      // Load the Node.js entry.
+      conditions: ['node'],
+      mainFields: ['module', 'jsnext:main', 'jsnext'],
+    },
+  };
+  const buildConfig = getBuildConfig(forgeEnv);
+
+  if (userConfig.build?.lib == null) {
+    config.build!.lib = {
+      entry: forgeConfigSelf.entry,
+      fileName: () => '[name].js',
+      formats: ['cjs'],
+    };
+  }
+
+  return mergeConfig(mergeConfig(buildConfig, config), userConfig);
+}

package/src/config/vite.preload.config.ts

@@ -0,0 +1,28 @@
+import { type ConfigEnv, mergeConfig, type UserConfig } from 'vite';
+
+import { external, getBuildConfig, pluginHotRestart } from './vite.base.config';
+
+export function getConfig(forgeEnv: ConfigEnv<'build'>, userConfig: UserConfig = {}): UserConfig {
+  const { forgeConfigSelf } = forgeEnv;
+  const config: UserConfig = {
+    build: {
+      rollupOptions: {
+        external,
+        // Preload scripts may contain Web assets, so use the `build.rollupOptions.input` instead `build.lib.entry`.
+        input: forgeConfigSelf.entry,
+        output: {
+          format: 'cjs',
+          // It should not be split chunks.
+          inlineDynamicImports: true,
+          entryFileNames: '[name].js',
+          chunkFileNames: '[name].js',
+          assetFileNames: '[name].[ext]',
+        },
+      },
+    },
+    plugins: [pluginHotRestart('reload')],
+  };
+  const buildConfig = getBuildConfig(forgeEnv);
+
+  return mergeConfig(mergeConfig(buildConfig, config), userConfig);
+}

package/src/config/vite.renderer.config.ts

@@ -0,0 +1,25 @@
+import { type ConfigEnv, mergeConfig, type UserConfig } from 'vite';
+
+import { pluginExposeRenderer } from './vite.base.config';
+
+// https://vitejs.dev/config
+export function getConfig(forgeEnv: ConfigEnv<'renderer'>, userConfig: UserConfig = {}) {
+  const { root, mode, forgeConfigSelf } = forgeEnv;
+  const name = forgeConfigSelf.name ?? '';
+
+  const config: UserConfig = {
+    root,
+    mode,
+    base: './',
+    build: {
+      outDir: `.vite/renderer/${name}`,
+    },
+    plugins: [pluginExposeRenderer(name)],
+    resolve: {
+      preserveSymlinks: true,
+    },
+    clearScreen: false,
+  };
+
+  return mergeConfig(config, userConfig);
+}

package/src/util/plugins.ts

@@ -1,4 +1,3 @@
-// eslint-disable-next-line node/no-unpublished-import
 import type { Plugin } from 'vite';
 
 export function onBuildDone(callback: () => void) {

package/dist/util/package.d.ts

@@ -1,14 +0,0 @@
-export interface Dependency {
-    name: string;
-    path: SourceAndDestination;
-    dependencies: Dependency[];
-}
-export interface SourceAndDestination {
-    src: string;
-    dest: string;
-}
-export declare function isDirectory(p: string): Promise<boolean>;
-export declare function lookupNodeModulesPaths(root: string, paths?: string[]): Promise<string[]>;
-export declare function resolveDependencies(root: string): Promise<Dependency[]>;
-export declare function getFlatDependencies(root?: string): Promise<SourceAndDestination[]>;
-//# sourceMappingURL=package.d.ts.map

package/dist/util/package.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"package.d.ts","sourceRoot":"","sources":["../../src/util/package.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,oBAAoB,CAAC;IAC3B,YAAY,EAAE,UAAU,EAAE,CAAC;CAC5B;AAED,MAAM,WAAW,oBAAoB;IACnC,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;CACd;AAOD,wBAAsB,WAAW,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAO7D;AAED,wBAAsB,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,GAAE,MAAM,EAAO,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAYlG;AAED,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,MAAM,yBAmDrD;AAED,wBAAsB,mBAAmB,CAAC,IAAI,SAAgB,mCAW7D"}

package/dist/util/package.js

@@ -1,93 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFlatDependencies = exports.resolveDependencies = exports.lookupNodeModulesPaths = exports.isDirectory = void 0;
-const node_path_1 = __importDefault(require("node:path"));
-const fs_extra_1 = __importDefault(require("fs-extra"));
-function isRootPath(dir) {
-    // *unix or Windows root path
-    return dir === '/' || /^[a-zA-Z]:\\$/i.test(dir);
-}
-async function isDirectory(p) {
-    try {
-        const stat = await fs_extra_1.default.promises.stat(p);
-        return stat.isDirectory();
-    }
-    catch {
-        return false;
-    }
-}
-exports.isDirectory = isDirectory;
-async function lookupNodeModulesPaths(root, paths = []) {
-    if (!root)
-        return paths;
-    if (!node_path_1.default.isAbsolute(root))
-        return paths;
-    const p = node_path_1.default.join(root, 'node_modules');
-    if (await isDirectory(p)) {
-        paths = paths.concat(p);
-    }
-    root = node_path_1.default.join(root, '..');
-    return isRootPath(root) ? paths : await lookupNodeModulesPaths(root, paths);
-}
-exports.lookupNodeModulesPaths = lookupNodeModulesPaths;
-async function resolveDependencies(root) {
-    const rootDependencies = Object.keys((await fs_extra_1.default.readJson(node_path_1.default.join(root, 'package.json'))).dependencies || {});
-    const resolve = async (prePath, dependencies, collected = new Map()) => await Promise.all(dependencies.map(async (name) => {
-        let curPath = prePath, depPath = null, packageJson = null;
-        while (!packageJson && !isRootPath(curPath)) {
-            const allNodeModules = await lookupNodeModulesPaths(curPath);
-            for (const nodeModules of allNodeModules) {
-                depPath = node_path_1.default.join(nodeModules, name);
-                if (await fs_extra_1.default.pathExists(depPath))
-                    break;
-            }
-            if (depPath) {
-                try {
-                    packageJson = await fs_extra_1.default.readJson(node_path_1.default.join(depPath, 'package.json'));
-                }
-                catch (err) {
-                    // lookup node_modules
-                    curPath = node_path_1.default.join(curPath, '..');
-                    if (curPath.length < root.length) {
-                        console.error(`not found 'node_modules' in root path: ${root}`);
-                        throw err;
-                    }
-                }
-            }
-        }
-        if (!depPath || !packageJson) {
-            throw new Error(`find dependencies error in: ${curPath}`);
-        }
-        const result = {
-            name,
-            path: {
-                src: depPath,
-                dest: node_path_1.default.relative(root, depPath),
-            },
-            dependencies: [],
-        };
-        const shouldResolveDeps = !collected.has(depPath);
-        collected.set(depPath, result);
-        if (shouldResolveDeps) {
-            result.dependencies = await resolve(depPath, Object.keys(packageJson.dependencies || {}), collected);
-        }
-        return result;
-    }));
-    return resolve(root, rootDependencies);
-}
-exports.resolveDependencies = resolveDependencies;
-async function getFlatDependencies(root = process.cwd()) {
-    const depsTree = await resolveDependencies(root);
-    const depsFlat = new Map();
-    const flatten = (dep) => {
-        depsFlat.set(dep.path.src, dep.path); // dedup
-        dep.dependencies.forEach(flatten);
-    };
-    depsTree.forEach(flatten);
-    return [...depsFlat.values()];
-}
-exports.getFlatDependencies = getFlatDependencies;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGFja2FnZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsL3BhY2thZ2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsMERBQTZCO0FBRTdCLHdEQUEwQjtBQWExQixTQUFTLFVBQVUsQ0FBQyxHQUFXO0lBQzdCLDZCQUE2QjtJQUM3QixPQUFPLEdBQUcsS0FBSyxHQUFHLElBQUksZ0JBQWdCLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0FBQ25ELENBQUM7QUFFTSxLQUFLLFVBQVUsV0FBVyxDQUFDLENBQVM7SUFDekMsSUFBSTtRQUNGLE1BQU0sSUFBSSxHQUFHLE1BQU0sa0JBQUUsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQ3ZDLE9BQU8sSUFBSSxDQUFDLFdBQVcsRUFBRSxDQUFDO0tBQzNCO0lBQUMsTUFBTTtRQUNOLE9BQU8sS0FBSyxDQUFDO0tBQ2Q7QUFDSCxDQUFDO0FBUEQsa0NBT0M7QUFFTSxLQUFLLFVBQVUsc0JBQXNCLENBQUMsSUFBWSxFQUFFLFFBQWtCLEVBQUU7SUFDN0UsSUFBSSxDQUFDLElBQUk7UUFBRSxPQUFPLEtBQUssQ0FBQztJQUN4QixJQUFJLENBQUMsbUJBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDO1FBQUUsT0FBTyxLQUFLLENBQUM7SUFFekMsTUFBTSxDQUFDLEdBQUcsbUJBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLGNBQWMsQ0FBQyxDQUFDO0lBRTFDLElBQUksTUFBTSxXQUFXLENBQUMsQ0FBQyxDQUFDLEVBQUU7UUFDeEIsS0FBSyxHQUFHLEtBQUssQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUM7S0FDekI7SUFDRCxJQUFJLEdBQUcsbUJBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxDQUFDO0lBRTdCLE9BQU8sVUFBVSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxL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