@analogjs/platform 0.2.0-beta.1 → 0.2.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@analogjs/platform",
-  "version": "0.2.0-beta.1",
+  "version": "0.2.0-beta.2",
   "type": "commonjs",
   "description": "The fullstack meta-framework for Angular",
   "author": "Brandon Roberts <robertsbt@gmail.com>",
@@ -25,7 +25,8 @@
   },
   "dependencies": {
     "nitropack": "^1.0.0",
-    "@analogjs/vite-plugin-angular": "^0.2.0-beta.1"
+    "@analogjs/vite-plugin-angular": "^0.2.0-beta.2",
+    "@analogjs/vite-plugin-nitro": "^0.2.0-beta.2"
   },
   "generators": "./src/lib/nx-plugin/generators.json",
   "schematics": "./src/lib/nx-plugin/generators.json",

package/src/lib/nx-plugin/src/generators/app/files/versions.d.ts

@@ -1,10 +1,10 @@
-export declare const V16_ANALOG_JS_CONTENT = "^0.2.0-beta.1";
-export declare const V16_ANALOG_JS_ROUTER = "^0.2.0-beta.1";
+export declare const V16_ANALOG_JS_CONTENT = "^0.2.0-beta.2";
+export declare const V16_ANALOG_JS_ROUTER = "^0.2.0-beta.2";
 export declare const V16_ANGULAR_PLATFORM_SERVER = "^16.0.0-rc.0";
 export declare const V16_FRONT_MATTER = "^4.0.2";
 export declare const V16_MARKED = "^4.2.12";
 export declare const V16_PRISMJS = "^1.29.0";
-export declare const V16_ANALOG_JS_PLATFORM = "^0.2.0-beta.1";
+export declare const V16_ANALOG_JS_PLATFORM = "^0.2.0-beta.2";
 export declare const V16_NRWL_VITE = "^15.7.0";
 export declare const V16_JSDOM = "^20.0.0";
 export declare const V16_TYPESCRIPT = "~5.0.2";

package/src/lib/nx-plugin/src/generators/app/files/versions.js

@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.V15_VITEST = exports.V15_VITE_TSCONFIG_PATHS = exports.V15_VITE = exports.V15_TYPESCRIPT = exports.V15_JSDOM = exports.V15_NRWL_VITE = exports.V15_ANALOG_JS_PLATFORM = exports.V15_PRISMJS = exports.V15_MARKED = exports.V15_FRONT_MATTER = exports.V15_ANGULAR_PLATFORM_SERVER = exports.V15_ANALOG_JS_ROUTER = exports.V15_ANALOG_JS_CONTENT = exports.V16_VITEST = exports.V16_VITE_TSCONFIG_PATHS = exports.V16_VITE = exports.V16_TYPESCRIPT = exports.V16_JSDOM = exports.V16_NRWL_VITE = exports.V16_ANALOG_JS_PLATFORM = exports.V16_PRISMJS = exports.V16_MARKED = exports.V16_FRONT_MATTER = exports.V16_ANGULAR_PLATFORM_SERVER = exports.V16_ANALOG_JS_ROUTER = exports.V16_ANALOG_JS_CONTENT = void 0;
 // V16
 // dependencies
-exports.V16_ANALOG_JS_CONTENT = '^0.2.0-beta.1';
-exports.V16_ANALOG_JS_ROUTER = '^0.2.0-beta.1';
+exports.V16_ANALOG_JS_CONTENT = '^0.2.0-beta.2';
+exports.V16_ANALOG_JS_ROUTER = '^0.2.0-beta.2';
 exports.V16_ANGULAR_PLATFORM_SERVER = '^16.0.0-rc.0';
 exports.V16_FRONT_MATTER = '^4.0.2';
 exports.V16_MARKED = '^4.2.12';
 exports.V16_PRISMJS = '^1.29.0';
 // devDependencies
-exports.V16_ANALOG_JS_PLATFORM = '^0.2.0-beta.1';
+exports.V16_ANALOG_JS_PLATFORM = '^0.2.0-beta.2';
 exports.V16_NRWL_VITE = '^15.7.0';
 exports.V16_JSDOM = '^20.0.0';
 exports.V16_TYPESCRIPT = '~5.0.2';

package/src/lib/platform-plugin.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.platformPlugin = void 0;
-const vite_plugin_angular_1 = require("@analogjs/vite-plugin-angular");
-const vite_nitro_plugin_1 = require("./vite-nitro-plugin");
 const router_plugin_1 = require("./router-plugin");
 const dev_server_plugin_1 = require("./ssr/dev-server-plugin");
 const ssr_build_plugin_1 = require("./ssr/ssr-build-plugin");
 const content_plugin_1 = require("./content-plugin");
+const vite_plugin_nitro_1 = require("@analogjs/vite-plugin-nitro");
+const vite_plugin_angular_1 = require("@analogjs/vite-plugin-angular");
 function platformPlugin(opts = {}) {
     const { apiPrefix, ...platformOptions } = {
         ssr: true,
@@ -22,7 +22,7 @@ function platformPlugin(opts = {}) {
         };
     }
     return [
-        (0, vite_nitro_plugin_1.viteNitroPlugin)(platformOptions, nitroOptions),
+        (0, vite_plugin_nitro_1.default)(platformOptions, nitroOptions),
         (platformOptions.ssr ? (0, ssr_build_plugin_1.ssrBuildPlugin)() : false),
         ...(0, router_plugin_1.routerPlugin)(),
         ...(0, content_plugin_1.contentPlugin)(),
@@ -33,4 +33,4 @@ function platformPlugin(opts = {}) {
     ];
 }
 exports.platformPlugin = platformPlugin;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGxhdGZvcm0tcGx1Z2luLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvcGxhdGZvcm0vc3JjL2xpYi9wbGF0Zm9ybS1wbHVnaW4udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQ0EsdUVBQW9EO0FBRXBELDJEQUFzRDtBQUN0RCxtREFBK0M7QUFDL0MsK0RBQTBEO0FBQzFELDZEQUF3RDtBQUN4RCxxREFBaUQ7QUFFakQsU0FBZ0IsY0FBYyxDQUFDLE9BQWdCLEVBQUU7SUFDL0MsTUFBTSxFQUFFLFNBQVMsRUFBRSxHQUFHLGVBQWUsRUFBRSxHQUFHO1FBQ3hDLEdBQUcsRUFBRSxJQUFJO1FBQ1QsR0FBRyxJQUFJO0tBQ1IsQ0FBQztJQUVGLElBQUksWUFBWSxHQUFHLGVBQWUsRUFBRSxLQUFLLENBQUM7SUFDMUMsSUFBSSxTQUFTLEVBQUU7UUFDYixZQUFZLEdBQUc7WUFDYixHQUFHLFlBQVk7WUFDZixhQUFhLEVBQUU7Z0JBQ2IsU0FBUzthQUNWO1NBQ0YsQ0FBQztLQUNIO0lBRUQsT0FBTztRQUNMLElBQUEsbUNBQWUsRUFBQyxlQUFlLEVBQUUsWUFBWSxDQUFDO1FBQzlDLENBQUMsZUFBZSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsSUFBQSxpQ0FBYyxHQUFFLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBVztRQUMxRCxHQUFHLElBQUEsNEJBQVksR0FBRTtRQUNqQixHQUFHLElBQUEsOEJBQWEsR0FBRTtRQUNsQixDQUFDLGVBQWUsQ0FBQyxHQUFHO1lBQ2xCLENBQUMsQ0FBQyxJQUFBLG1DQUFlLEVBQUMsRUFBRSxXQUFXLEVBQUUsSUFBSSxDQUFDLFdBQVcsRUFBRSxDQUFDO1lBQ3BELENBQUMsQ0FBQyxLQUFLLENBQVc7UUFDcEIsR0FBRyxJQUFBLDZCQUFPLEVBQUMsSUFBSSxFQUFFLElBQUksQ0FBQztLQUN2QixDQUFDO0FBQ0osQ0FBQztBQTFCRCx3Q0EwQkMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGxhdGZvcm0tcGx1Z2luLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvcGxhdGZvcm0vc3JjL2xpYi9wbGF0Zm9ybS1wbHVnaW4udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBRUEsbURBQStDO0FBQy9DLCtEQUEwRDtBQUMxRCw2REFBd0Q7QUFDeEQscURBQWlEO0FBQ2pELG1FQUEwRDtBQUMxRCx1RUFBb0Q7QUFFcEQsU0FBZ0IsY0FBYyxDQUFDLE9BQWdCLEVBQUU7SUFDL0MsTUFBTSxFQUFFLFNBQVMsRUFBRSxHQUFHLGVBQWUsRUFBRSxHQUFHO1FBQ3hDLEdBQUcsRUFBRSxJQUFJO1FBQ1QsR0FBRyxJQUFJO0tBQ1IsQ0FBQztJQUVGLElBQUksWUFBWSxHQUFHLGVBQWUsRUFBRSxLQUFLLENBQUM7SUFDMUMsSUFBSSxTQUFTLEVBQUU7UUFDYixZQUFZLEdBQUc7WUFDYixHQUFHLFlBQVk7WUFDZixhQUFhLEVBQUU7Z0JBQ2IsU0FBUzthQUNWO1NBQ0YsQ0FBQztLQUNIO0lBRUQsT0FBTztRQUNMLElBQUEsMkJBQWUsRUFBQyxlQUFlLEVBQUUsWUFBWSxDQUFDO1FBQzlDLENBQUMsZUFBZSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsSUFBQSxpQ0FBYyxHQUFFLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBVztRQUMxRCxHQUFHLElBQUEsNEJBQVksR0FBRTtRQUNqQixHQUFHLElBQUEsOEJBQWEsR0FBRTtRQUNsQixDQUFDLGVBQWUsQ0FBQyxHQUFHO1lBQ2xCLENBQUMsQ0FBQyxJQUFBLG1DQUFlLEVBQUMsRUFBRSxXQUFXLEVBQUUsSUFBSSxDQUFDLFdBQVcsRUFBRSxDQUFDO1lBQ3BELENBQUMsQ0FBQyxLQUFLLENBQVc7UUFDcEIsR0FBRyxJQUFBLDZCQUFPLEVBQUMsSUFBSSxFQUFFLElBQUksQ0FBQztLQUN2QixDQUFDO0FBQ0osQ0FBQztBQTFCRCx3Q0EwQkMifQ==

package/src/lib/build-server.d.ts

@@ -1,3 +0,0 @@
-import { NitroConfig } from 'nitropack';
-import { Options } from './options';
-export declare function buildServer(options?: Options, nitroConfig?: NitroConfig): Promise<void>;

package/src/lib/build-server.js

@@ -1,23 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildServer = void 0;
-const load_esm_1 = require("@angular-devkit/build-angular/src/utils/load-esm");
-async function buildServer(options, nitroConfig) {
-    const { createNitro, build, prepare, copyPublicAssets, prerender } = await (0, load_esm_1.loadEsmModule)('nitropack');
-    const nitro = await createNitro({
-        dev: false,
-        ...nitroConfig,
-    });
-    await prepare(nitro);
-    await copyPublicAssets(nitro);
-    if (options?.static) {
-        console.log(`Prerendering static pages...`);
-    }
-    await prerender(nitro);
-    if (!options?.static) {
-        await build(nitro);
-    }
-    await nitro.close();
-}
-exports.buildServer = buildServer;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnVpbGQtc2VydmVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvcGxhdGZvcm0vc3JjL2xpYi9idWlsZC1zZXJ2ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsK0VBQWlGO0FBSzFFLEtBQUssVUFBVSxXQUFXLENBQy9CLE9BQWlCLEVBQ2pCLFdBQXlCO0lBRXpCLE1BQU0sRUFBRSxXQUFXLEVBQUUsS0FBSyxFQUFFLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxTQUFTLEVBQUUsR0FDaEUsTUFBTSxJQUFBLHdCQUFhLEVBQTZCLFdBQVcsQ0FBQyxDQUFDO0lBRS9ELE1BQU0sS0FBSyxHQUFHLE1BQU0sV0FBVyxDQUFDO1FBQzlCLEdBQUcsRUFBRSxLQUFLO1FBQ1YsR0FBRyxXQUFXO0tBQ2YsQ0FBQyxDQUFDO0lBQ0gsTUFBTSxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUM7SUFDckIsTUFBTSxnQkFBZ0IsQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUU5QixJQUFJLE9BQU8sRUFBRSxNQUFNLEVBQUU7UUFDbkIsT0FBTyxDQUFDLEdBQUcsQ0FBQyw4QkFBOEIsQ0FBQyxDQUFDO0tBQzdDO0lBRUQsTUFBTSxTQUFTLENBQUMsS0FBSyxDQUFDLENBQUM7SUFFdkIsSUFBSSxDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUU7UUFDcEIsTUFBTSxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUM7S0FDcEI7SUFFRCxNQUFNLEtBQUssQ0FBQyxLQUFLLEVBQUUsQ0FBQztBQUN0QixDQUFDO0FBekJELGtDQXlCQyJ9

package/src/lib/runtime/api-middleware.js

@@ -1,16 +0,0 @@
-/**
- * This file is written in JavaScript
- * because it is used by Nitro to build
- * the renderer for SSR.
- *
- * The package is shipped as commonjs
- * which won't be parsed by Nitro correctly.
- */
-import { eventHandler } from 'h3';
-
-export default eventHandler(async (event) => {
-  const apiPrefix = `/${import.meta.env.RUNTIME_CONFIG?.apiPrefix ?? 'api'}`;
-  if (event.req.url?.startsWith(apiPrefix)) {
-    return $fetch(`${event.req.url?.replace(apiPrefix, '')}`);
-  }
-});

package/src/lib/runtime/renderer.js

@@ -1,19 +0,0 @@
-/**
- * This file is written in JavaScript
- * because it is used by Nitro to build
- * the renderer for SSR.
- *
- * The package is shipped as commonjs
- * which won't be parsed by Nitro correctly.
- */
-import { eventHandler } from 'h3';
-import { useStorage } from '#imports';
-
-export default eventHandler(async (event) => {
-  const render = (await import('#build/../ssr/main.server.mjs'))['default'];
-  const template = await useStorage().getItem(`/assets/public:index.html`);
-
-  const html = await render(event.req.url, template);
-
-  return html;
-});

package/src/lib/ssr/build.d.ts

@@ -1,3 +0,0 @@
-import { UserConfig } from 'vite';
-import { Options } from '../options';
-export declare function buildSSRApp(config: UserConfig, options?: Options): Promise<void>;

package/src/lib/ssr/build.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildSSRApp = void 0;
-const vite_1 = require("vite");
-async function buildSSRApp(config, options) {
-    const ssrBuildConfig = (0, vite_1.mergeConfig)(config, {
-        build: {
-            ssr: true,
-            rollupOptions: {
-                input: options?.entryServer || './src/main.server.ts',
-            },
-            outDir: options?.ssrBuildDir || './dist/ssr',
-        },
-    });
-    await (0, vite_1.build)(ssrBuildConfig);
-}
-exports.buildSSRApp = buildSSRApp;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnVpbGQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9wbGF0Zm9ybS9zcmMvbGliL3Nzci9idWlsZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSwrQkFBc0Q7QUFHL0MsS0FBSyxVQUFVLFdBQVcsQ0FBQyxNQUFrQixFQUFFLE9BQWlCO0lBQ3JFLE1BQU0sY0FBYyxHQUFHLElBQUEsa0JBQVcsRUFBQyxNQUFNLEVBQUU7UUFDekMsS0FBSyxFQUFFO1lBQ0wsR0FBRyxFQUFFLElBQUk7WUFDVCxhQUFhLEVBQUU7Z0JBQ2IsS0FBSyxFQUFFLE9BQU8sRUFBRSxXQUFXLElBQUksc0JBQXNCO2FBQ3REO1lBQ0QsTUFBTSxFQUFFLE9BQU8sRUFBRSxXQUFXLElBQUksWUFBWTtTQUM3QztLQUNGLENBQUMsQ0FBQztJQUVILE1BQU0sSUFBQSxZQUFLLEVBQUMsY0FBYyxDQUFDLENBQUM7QUFDOUIsQ0FBQztBQVpELGtDQVlDIn0=

package/src/lib/vite-nitro-plugin.d.ts

@@ -1,4 +0,0 @@
-import { NitroConfig } from 'nitropack';
-import { Plugin } from 'vite';
-import { Options } from './options';
-export declare function viteNitroPlugin(options?: Options, nitroOptions?: NitroConfig): Plugin;

package/src/lib/vite-nitro-plugin.js

@@ -1,106 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.viteNitroPlugin = void 0;
-const load_esm_1 = require("@angular-devkit/build-angular/src/utils/load-esm");
-const h3_1 = require("h3");
-const build_server_1 = require("./build-server");
-const build_1 = require("./ssr/build");
-const vite_1 = require("vite");
-function viteNitroPlugin(options, nitroOptions) {
-    const rootDir = nitroOptions?.rootDir || '.';
-    const isTest = process.env['NODE_ENV'] === 'test' || !!process.env['VITEST'];
-    const apiPrefix = `/${nitroOptions?.runtimeConfig?.['apiPrefix'] ?? 'api'}`;
-    let nitroConfig = {
-        rootDir,
-        logLevel: nitroOptions?.logLevel || 0,
-        srcDir: (0, vite_1.normalizePath)(`${rootDir}/src`),
-        scanDirs: [(0, vite_1.normalizePath)(`${rootDir}/src/server`)],
-        output: {
-            dir: '../dist/analog',
-            publicDir: '../dist/analog/public',
-            ...nitroOptions?.output,
-        },
-        buildDir: './dist/.nitro',
-        typescript: {
-            generateTsConfig: false,
-        },
-        runtimeConfig: { ...nitroOptions?.runtimeConfig },
-    };
-    let isBuild = false;
-    let isServe = false;
-    let ssrBuild = false;
-    let config;
-    return {
-        name: 'analogjs-vite-nitro-plugin',
-        async config(_config, { command }) {
-            isServe = command === 'serve';
-            isBuild = command === 'build';
-            ssrBuild = _config.build?.ssr === true;
-            config = _config;
-            if (isBuild && options?.prerender) {
-                nitroConfig.prerender = {};
-                nitroConfig.prerender.crawlLinks = options?.prerender?.discover;
-                const prerenderRoutes = options?.prerender?.routes;
-                if (Array.isArray(prerenderRoutes)) {
-                    nitroConfig.prerender.routes = prerenderRoutes;
-                }
-                else if (typeof prerenderRoutes === 'function') {
-                    nitroConfig.prerender.routes = await prerenderRoutes();
-                }
-            }
-            if (isBuild && ssrBuild) {
-                nitroConfig = {
-                    ...nitroConfig,
-                    publicAssets: [{ dir: `../dist/client` }],
-                    serverAssets: [{ baseName: 'public', dir: `./dist/client` }],
-                    externals: {
-                        inline: ['zone.js/node'],
-                        external: ['rxjs', 'node-fetch-native/dist/polyfill', 'destr'],
-                    },
-                    moduleSideEffects: ['zone.js/bundles/zone-node.umd.js'],
-                    renderer: (0, vite_1.normalizePath)(`${__dirname}/runtime/renderer`),
-                    handlers: [
-                        {
-                            handler: (0, vite_1.normalizePath)(`${__dirname}/runtime/api-middleware`),
-                            middleware: true,
-                        },
-                    ],
-                };
-            }
-            nitroConfig = {
-                ...nitroConfig,
-                ...nitroOptions,
-            };
-        },
-        async configureServer(viteServer) {
-            if (isServe && !isTest) {
-                const { createNitro, createDevServer, build, prepare } = await (0, load_esm_1.loadEsmModule)('nitropack');
-                const nitro = await createNitro({
-                    dev: true,
-                    ...nitroConfig,
-                });
-                const server = createDevServer(nitro);
-                await prepare(nitro);
-                await build(nitro);
-                viteServer.middlewares.use(apiPrefix, (0, h3_1.toNodeListener)(server.app));
-                console.log(`\n\nThe '@analogjs/platform' successfully started.\nThe server endpoints are accessible under the "${apiPrefix}" path.`);
-            }
-        },
-        async closeBundle() {
-            if (ssrBuild) {
-                return;
-            }
-            if (isBuild) {
-                if (options?.ssr) {
-                    console.log('Building SSR application...');
-                    await (0, build_1.buildSSRApp)(config, options);
-                }
-                console.log('Building Server...');
-                await (0, build_server_1.buildServer)(options, nitroConfig);
-                console.log(`\n\nThe '@analogjs/platform' server has been successfully built.`);
-            }
-        },
-    };
-}
-exports.viteNitroPlugin = viteNitroPlugin;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidml0ZS1uaXRyby1wbHVnaW4uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9wbGF0Zm9ybS9zcmMvbGliL3ZpdGUtbml0cm8tcGx1Z2luLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLCtFQUFpRjtBQUVqRiwyQkFBb0M7QUFHcEMsaURBQTZDO0FBQzdDLHVDQUEwQztBQUMxQywrQkFBcUM7QUFFckMsU0FBZ0IsZUFBZSxDQUM3QixPQUFpQixFQUNqQixZQUEwQjtJQUUxQixNQUFNLE9BQU8sR0FBRyxZQUFZLEVBQUUsT0FBTyxJQUFJLEdBQUcsQ0FBQztJQUM3QyxNQUFNLE1BQU0sR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxLQUFLLE1BQU0sSUFBSSxDQUFDLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUM3RSxNQUFNLFNBQVMsR0FBRyxJQUFJLFlBQVksRUFBRSxhQUFhLEVBQUUsQ0FBQyxXQUFXLENBQUMsSUFBSSxLQUFLLEVBQUUsQ0FBQztJQUU1RSxJQUFJLFdBQVcsR0FBZ0I7UUFDN0IsT0FBTztRQUNQLFFBQVEsRUFBRSxZQUFZLEVBQUUsUUFBUSxJQUFJLENBQUM7UUFDckMsTUFBTSxFQUFFLElBQUEsb0JBQWEsRUFBQyxHQUFHLE9BQU8sTUFBTSxDQUFDO1FBQ3ZDLFFBQVEsRUFBRSxDQUFDLElBQUEsb0JBQWEsRUFBQyxHQUFHLE9BQU8sYUFBYSxDQUFDLENBQUM7UUFDbEQsTUFBTSxFQUFFO1lBQ04sR0FBRyxFQUFFLGdCQUFnQjtZQUNyQixTQUFTLEVBQUUsdUJBQXVCO1lBQ2xDLEdBQUcsWUFBWSxFQUFFLE1BQU07U0FDeEI7UUFDRCxRQUFRLEVBQUUsZUFBZTtRQUN6QixVQUFVLEVBQUU7WUFDVixnQkFBZ0IsRUFBRSxLQUFLO1NBQ3hCO1FBQ0QsYUFBYSxFQUFFLEVBQUUsR0FBRyxZQUFZLEVBQUUsYUFBYSxFQUFFO0tB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