reactivated 0.30.0 → 0.30.1

package/dist/{generator.js → generator.mjs}

@@ -1,31 +1,30 @@
 #!/usr/bin/env node
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs_1 = __importDefault(require("fs"));
+import fs from "fs";
 // Must be above the compile import as get-stdin used by
 // json-schema-to-typescript messes up the descriptor even if unused.
-const stdinBuffer = fs_1.default.readFileSync(0);
-const json_schema_to_typescript_1 = require("json-schema-to-typescript");
-const ts_morph_1 = require("ts-morph");
+const stdinBuffer = fs.readFileSync(0);
+const { compile } = await import("json-schema-to-typescript");
+import { Project, VariableDeclarationKind, } from "ts-morph";
 const schema = JSON.parse(stdinBuffer.toString("utf8"));
 const { urls: possibleEmptyUrls, templates, interfaces, types, values } = schema;
-const urls = Object.assign(Object.assign({}, possibleEmptyUrls), { __reactivated_do_not_use: {
+const urls = {
+    ...possibleEmptyUrls,
+    __reactivated_do_not_use: {
         route: "__reactivated_do_not_use",
         args: {},
-    }, __reactivated_do_not_use_args: {
+    },
+    __reactivated_do_not_use_args: {
         route: "__reactivated_do_not_use_args",
         args: {
             _: "string",
         },
-    } });
-const project = new ts_morph_1.Project();
+    },
+};
+const project = new Project();
 const sourceFile = project.createSourceFile("");
 if (Object.keys(urls).length !== 0) {
     sourceFile.addVariableStatement({
-        declarationKind: ts_morph_1.VariableDeclarationKind.Const,
+        declarationKind: VariableDeclarationKind.Const,
         declarations: [
             {
                 name: "urls",
@@ -123,7 +122,7 @@ export type models = _Types["globals"]["models"];
 export const {Form, FormSet, Widget, useForm, useFormSet, ManagementForm} = forms;
 `);
 // tslint:disable-next-line
-(0, json_schema_to_typescript_1.compile)(types, "this is unused").then((ts) => {
+compile(types, "this is unused").then((ts) => {
     process.stdout.write("/* eslint-disable */\n");
     process.stdout.write(ts);
     for (const name of Object.keys(templates)) {
@@ -153,4 +152,4 @@ export namespace interfaces {
     }
     process.stdout.write(sourceFile.getText());
 });
-//# sourceMappingURL=generator.js.map
+//# sourceMappingURL=generator.mjs.map

package/dist/generator.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"generator.mjs","sourceRoot":"","sources":["../src/generator.mts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -1,19 +1,3 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./components/Form"), exports);
-__exportStar(require("./components/Widget"), exports);
+export * from "./components/Form";
+export * from "./components/Widget";
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAEA,oDAAkC;AAClC,sDAAoC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":"AAEA,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC"}

package/dist/{linaria.js → linaria.mjs}

@@ -1,50 +1,24 @@
-"use strict";
 /**
  * This file contains an esbuild loader for Linaria.
  * It uses the transform.ts function to generate class names from source code,
  * returns transformed code without template literals and attaches generated source maps
  */
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const esbuild_1 = require("esbuild");
-const babel_preset_1 = require("@linaria/babel-preset");
+import fs from "fs";
+import path from "path";
+import { transformSync } from "esbuild";
+import { slugify, transform } from "@linaria/babel-preset";
 const nodeModulesRegex = /^(?:.*[\\/])?node_modules(?:[\\/].*)?$/;
-function linaria(_a = {}) {
-    var { sourceMap, preprocessor, esbuildOptions } = _a, rest = __rest(_a, ["sourceMap", "preprocessor", "esbuildOptions"]);
+export default function linaria({ sourceMap, preprocessor, esbuildOptions, ...rest } = {}) {
     let options = esbuildOptions;
     return {
         name: "linaria",
         setup(build) {
             const cssLookup = new Map();
-            const asyncResolve = (token, importer) => __awaiter(this, void 0, void 0, function* () {
-                const context = path_1.default.isAbsolute(importer)
-                    ? path_1.default.dirname(importer)
-                    : path_1.default.join(process.cwd(), path_1.default.dirname(importer));
-                const result = yield build.resolve(token, {
+            const asyncResolve = async (token, importer) => {
+                const context = path.isAbsolute(importer)
+                    ? path.dirname(importer)
+                    : path.join(process.cwd(), path.dirname(importer));
+                const result = await build.resolve(token, {
                     kind: "entry-point",
                     resolveDir: context,
                 });
@@ -52,7 +26,7 @@ function linaria(_a = {}) {
                     throw new Error(`Cannot resolve ${token}`);
                 }
                 return result.path;
-            });
+            };
             build.onResolve({ filter: /\.linaria\.css$/ }, (args) => {
                 return {
                     namespace: "linaria",
@@ -63,12 +37,12 @@ function linaria(_a = {}) {
                 return {
                     contents: cssLookup.get(args.path),
                     loader: "css",
-                    resolveDir: path_1.default.basename(args.path),
+                    resolveDir: path.basename(args.path),
                 };
             });
-            build.onLoad({ filter: /\.(js|jsx|ts|tsx)$/ }, (args) => __awaiter(this, void 0, void 0, function* () {
-                const rawCode = fs_1.default.readFileSync(args.path, "utf8");
-                const { ext, name: filename } = path_1.default.parse(args.path);
+            build.onLoad({ filter: /\.(js|jsx|ts|tsx)$/ }, async (args) => {
+                const rawCode = fs.readFileSync(args.path, "utf8");
+                const { ext, name: filename } = path.parse(args.path);
                 const loader = ext.replace(/^\./, "");
                 if (nodeModulesRegex.test(args.path)) {
                     return {
@@ -85,26 +59,48 @@ function linaria(_a = {}) {
                         options.jsxFragment = build.initialOptions.jsxFragment;
                     }
                 }
-                const transformed = (0, esbuild_1.transformSync)(rawCode, Object.assign(Object.assign({}, options), { sourcefile: args.path, sourcemap: sourceMap, loader }));
+                const transformed = transformSync(rawCode, {
+                    ...options,
+                    sourcefile: args.path,
+                    sourcemap: sourceMap,
+                    loader,
+                });
                 let { code } = transformed;
                 if (sourceMap) {
                     const esbuildMap = Buffer.from(transformed.map).toString("base64");
                     code += `/*# sourceMappingURL=data:application/json;base64,${esbuildMap}*/`;
                 }
-                const result = yield (0, babel_preset_1.transform)(code, {
+                const babelOptions = {
+                    presets: [
+                        ["@babel/preset-env", { targets: { node: "v12.13.0" } }],
+                        ["@babel/preset-typescript", { allowNamespaces: true }],
+                    ],
+                    plugins: [
+                        [
+                            "module-resolver",
+                            {
+                                root: ["./"],
+                                alias: {
+                                    "@client": "./client",
+                                },
+                            },
+                        ],
+                    ],
+                };
+                const result = await transform(code, {
                     filename: args.path,
                     preprocessor,
-                    pluginOptions: rest,
+                    pluginOptions: { ...rest, babelOptions },
                 }, asyncResolve);
                 if (!result.cssText) {
                     return {
                         contents: code,
                         loader,
-                        resolveDir: path_1.default.dirname(args.path),
+                        resolveDir: path.dirname(args.path),
                     };
                 }
                 let { cssText } = result;
-                const slug = (0, babel_preset_1.slugify)(cssText);
+                const slug = slugify(cssText);
                 const cssFilename = `${filename}_${slug}.linaria.css`;
                 let contents = `import ${JSON.stringify(cssFilename)}; ${result.code}`;
                 if (sourceMap && result.cssSourceMapText) {
@@ -117,11 +113,10 @@ function linaria(_a = {}) {
                 return {
                     contents,
                     loader,
-                    resolveDir: path_1.default.dirname(args.path),
+                    resolveDir: path.dirname(args.path),
                 };
-            }));
+            });
         },
     };
 }
-exports.default = linaria;
-//# sourceMappingURL=linaria.js.map
+//# sourceMappingURL=linaria.mjs.map

package/dist/linaria.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"linaria.mjs","sourceRoot":"","sources":["../src/linaria.mts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AAGxB,OAAO,EAAC,aAAa,EAAC,MAAM,SAAS,CAAC;AAGtC,OAAO,EAAC,OAAO,EAAE,SAAS,EAAC,MAAM,uBAAuB,CAAC;AAQzD,MAAM,gBAAgB,GAAG,wCAAwC,CAAC;AAElE,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,EAC5B,SAAS,EACT,YAAY,EACZ,cAAc,EACd,GAAG,IAAI,KACe,EAAE;IACxB,IAAI,OAAO,GAAG,cAAc,CAAC;IAC7B,OAAO;QACH,IAAI,EAAE,SAAS;QACf,KAAK,CAAC,KAAK;YACP,MAAM,SAAS,GAAG,IAAI,GAAG,EAAkB,CAAC;YAE5C,MAAM,YAAY,GAAG,KAAK,EACtB,KAAa,EACb,QAAgB,EACD,EAAE;gBACjB,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;oBACrC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;oBACxB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAEvD,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE;oBACtC,IAAI,EAAE,aAAa;oBACnB,UAAU,EAAE,OAAO;iBACtB,CAAC,CAAC;gBAEH,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC1B,MAAM,IAAI,KAAK,CAAC,kBAAkB,KAAK,EAAE,CAAC,CAAC;iBAC9C;gBAED,OAAO,MAAM,CAAC,IAAI,CAAC;YACvB,CAAC,CAAC;YAEF,KAAK,CAAC,SAAS,CAAC,EAAC,MAAM,EAAE,iBAAiB,EAAC,EAAE,CAAC,IAAI,EAAE,EAAE;gBAClD,OAAO;oBACH,SAAS,EAAE,SAAS;oBACpB,IAAI,EAAE,IAAI,CAAC,IAAI;iBAClB,CAAC;YACN,CAAC,CAAC,CAAC;YAEH,KAAK,CAAC,MAAM,CAAC,EAAC,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAC,EAAE,CAAC,IAAI,EAAE,EAAE;gBACxD,OAAO;oBACH,QAAQ,EAAE,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC;oBAClC,MAAM,EAAE,KAAK;oBACb,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC;iBACvC,CAAC;YACN,CAAC,CAAC,CAAC;YAEH,KAAK,CAAC,MAAM,CAAC,EAAC,MAAM,EAAE,oBAAoB,EAAC,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;gBACxD,MAAM,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;gBACnD,MAAM,EAAC,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACpD,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAW,CAAC;gBAEhD,IAAI,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;oBAClC,OAAO;wBACH,MAAM;wBACN,QAAQ,EAAE,OAAO;qBACpB,CAAC;iBACL;gBAED,IAAI,CAAC,OAAO,EAAE;oBACV,OAAO,GAAG,EAAE,CAAC;oBACb,IAAI,YAAY,IAAI,KAAK,CAAC,cAAc,EAAE;wBACtC,OAAO,CAAC,UAAU,GAAG,KAAK,CAAC,cAAc,CAAC,UAAU,CAAC;qBACxD;oBACD,IAAI,aAAa,IAAI,KAAK,CAAC,cAAc,EAAE;wBACvC,OAAO,CAAC,WAAW,GAAG,KAAK,CAAC,cAAc,CAAC,WAAW,CAAC;qBAC1D;iBACJ;gBAED,MAAM,WAAW,GAAG,aAAa,CAAC,OAAO,EAAE;oBACvC,GAAG,OAAO;oBACV,UAAU,EAAE,IAAI,CAAC,IAAI;oBACrB,SAAS,EAAE,SAAS;oBACpB,MAAM;iBACT,CAAC,CAAC;gBACH,IAAI,EAAC,IAAI,EAAC,GAAG,WAAW,CAAC;gBAEzB,IAAI,SAAS,EAAE;oBACX,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;oBACnE,IAAI,IAAI,qDAAqD,UAAU,IAAI,CAAC;iBAC/E;gBAED,MAAM,YAAY,GAAG;oBACjB,OAAO,EAAE;wBACL,CAAC,mBAAmB,EAAE,EAAC,OAAO,EAAE,EAAC,IAAI,EAAE,UAAU,EAAC,EAAC,CAAC;wBACpD,CAAC,0BAA0B,EAAE,EAAC,eAAe,EAAE,IAAI,EAAC,CAAC;qBACxD;oBACD,OAAO,EAAE;wBACL;4BACI,iBAAiB;4BACjB;gCACI,IAAI,EAAE,CAAC,IAAI,CAAC;gCACZ,KAAK,EAAE;oCACH,SAAS,EAAE,UAAU;iCACxB;6BACJ;yBACJ;qBACJ;iBACJ,CAAC;gBAEF,MAAM,MAAM,GAAG,MAAM,SAAS,CAC1B,IAAI,EACJ;oBACI,QAAQ,EAAE,IAAI,CAAC,IAAI;oBACnB,YAAY;oBACZ,aAAa,EAAE,EAAC,GAAG,IAAI,EAAE,YAAY,EAAC;iBACzC,EACD,YAAY,CACf,CAAC;gBAEF,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;oBACjB,OAAO;wBACH,QAAQ,EAAE,IAAI;wBACd,MAAM;wBACN,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC;qBACtC,CAAC;iBACL;gBAED,IAAI,EAAC,OAAO,EAAC,GAAG,MAAM,CAAC;gBAEvB,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;gBAC9B,MAAM,WAAW,GAAG,GAAG,QAAQ,IAAI,IAAI,cAAc,CAAC;gBAEtD,IAAI,QAAQ,GAAG,UAAU,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,KAAK,MAAM,CAAC,IAAI,EAAE,CAAC;gBAEvE,IAAI,SAAS,IAAI,MAAM,CAAC,gBAAgB,EAAE;oBACtC,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;oBACpE,OAAO,IAAI,qDAAqD,GAAG,IAAI,CAAC;oBACxE,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAC1B,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,CACnC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;oBACrB,QAAQ,IAAI,qDAAqD,UAAU,IAAI,CAAC;iBACnF;gBAED,SAAS,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;gBAEpC,OAAO;oBACH,QAAQ;oBACR,MAAM;oBACN,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC;iBACtC,CAAC;YACN,CAAC,CAAC,CAAC;QACP,CAAC;KACJ,CAAC;AACN,CAAC"}

package/dist/models.js

@@ -1,3 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};
 //# sourceMappingURL=models.js.map

package/dist/renderer.d.ts

@@ -16,12 +16,12 @@ type Result = {
     status: "error";
     error: any;
 };
-export declare const render: ({ context, props }: {
+export declare const render: ({ context, props, }: {
     context: any;
     props: any;
-}) => Result;
+}) => Promise<Result>;
 export declare const simpleRender: () => void;
-export declare const serverRender: (body: Buffer) => Result;
+export declare const serverRender: (body: Buffer) => Promise<Result>;
 export declare const SOCKET_PATH: string;
 export declare const server: http.Server<typeof http.IncomingMessage, typeof http.ServerResponse>;
 export {};

package/dist/renderer.js

@@ -1,21 +1,11 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-var _a, _b;
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.server = exports.SOCKET_PATH = exports.serverRender = exports.simpleRender = exports.render = exports.renderPage = exports.BODY_SIZE_LIMIT = void 0;
-const fs_1 = __importDefault(require("fs"));
-const http_1 = __importDefault(require("http"));
-const react_1 = __importDefault(require("react"));
-const server_1 = __importDefault(require("react-dom/server"));
-const react_helmet_async_1 = require("react-helmet-async");
-// Useful when running e2e tests or the like, where the output is not
-// co-located with the running process.
-const REACTIVATED_CLIENT_ROOT = (_a = process.env.REACTIVATED_CLIENT_ROOT) !== null && _a !== void 0 ? _a : `../client`;
+import fs from "fs";
+import http from "http";
+import React from "react";
+import ReactDOMServer from "react-dom/server";
+import { HelmetProvider, } from "react-helmet-async";
 // TODO: WHAT DOES THIS NEED TO BE? Even 100k was super fragile and a 10 choice field broke it.
-exports.BODY_SIZE_LIMIT = "100000000k";
-const renderPage = ({ html, helmet, context, props, }) => {
+export const BODY_SIZE_LIMIT = "100000000k";
+export const renderPage = ({ html, helmet, context, props, }) => {
     const scriptNonce = context.request.csp_nonce
         ? `nonce="${context.request.csp_nonce}"`
         : "";
@@ -44,20 +34,20 @@ const renderPage = ({ html, helmet, context, props, }) => {
     </body>
 </html>`;
 };
-exports.renderPage = renderPage;
 const PATHS = ["/", "/form/"];
-const render = ({ context, props }) => {
-    const { Provider, getTemplate } = require("_reactivated/index.tsx");
+export const render = async ({ context, props, }) => {
+    // @ts-ignore
+    const { Provider, getTemplate } = await import("_reactivated/index.tsx");
     try {
         const Template = getTemplate(context);
         const helmetContext = {};
-        const rendered = server_1.default.renderToString(react_1.default.createElement(react_helmet_async_1.HelmetProvider, { context: helmetContext },
-            react_1.default.createElement(Provider, { value: context },
-                react_1.default.createElement(Template, Object.assign({}, props)))));
+        const rendered = ReactDOMServer.renderToString(React.createElement(HelmetProvider, { context: helmetContext },
+            React.createElement(Provider, { value: context },
+                React.createElement(Template, { ...props }))));
         const { helmet } = helmetContext;
         return {
             status: "success",
-            rendered: (0, exports.renderPage)({
+            rendered: renderPage({
                 html: rendered,
                 helmet,
                 props,
@@ -69,30 +59,27 @@ const render = ({ context, props }) => {
         return { status: "error", error };
     }
 };
-exports.render = render;
-const simpleRender = () => {
-    const input = fs_1.default.readFileSync(0);
+export const simpleRender = () => {
+    const input = fs.readFileSync(0);
     const { context, props } = JSON.parse(input.toString("utf8"));
-    process.stdout.write(JSON.stringify((0, exports.render)({ context, props })));
+    process.stdout.write(JSON.stringify(render({ context, props })));
 };
-exports.simpleRender = simpleRender;
-const serverRender = (body) => {
+export const serverRender = (body) => {
     const { context, props } = JSON.parse(body.toString("utf8"));
-    return (0, exports.render)({ context, props });
+    return render({ context, props });
 };
-exports.serverRender = serverRender;
 const OK_RESPONSE = 200;
 const ERROR_REPONSE = 500;
 // Relative path to keep it under 100 characters.
 // See: https://unix.stackexchange.com/questions/367008/why-is-socket-path-length-limited-to-a-hundred-chars
-exports.SOCKET_PATH = (_b = process.env.REACTIVATED_SOCKET) !== null && _b !== void 0 ? _b : `node_modules/_reactivated/reactivated.sock`;
-exports.server = http_1.default.createServer((req, res) => {
+export const SOCKET_PATH = process.env.REACTIVATED_SOCKET ?? `node_modules/_reactivated/reactivated.sock`;
+export const server = http.createServer((req, res) => {
     let body = Buffer.from("");
     req.on("data", (chunk) => {
         body = Buffer.concat([body, chunk]);
     });
-    req.on("end", () => {
-        const result = (0, exports.serverRender)(body);
+    req.on("end", async () => {
+        const result = await serverRender(body);
         if (result.status === "success") {
             res.writeHead(OK_RESPONSE, { "Content-Type": "text/html; charset=utf-8" });
             res.end(result.rendered);
@@ -103,11 +90,11 @@ exports.server = http_1.default.createServer((req, res) => {
         }
     });
 });
-if (fs_1.default.existsSync(exports.SOCKET_PATH)) {
-    fs_1.default.unlinkSync(exports.SOCKET_PATH);
+if (fs.existsSync(SOCKET_PATH)) {
+    fs.unlinkSync(SOCKET_PATH);
 }
-exports.server.listen(exports.SOCKET_PATH, () => {
-    const address = exports.server.address();
+server.listen(SOCKET_PATH, () => {
+    const address = server.address();
     if (address == null) {
         throw new Error();
     }

package/dist/renderer.js.map

@@ -1 +1 @@
-{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../src/renderer.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../src/renderer.tsx"],"names":[],"mappings":"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"}

package/dist/types.js

@@ -1,3 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};
 //# sourceMappingURL=types.js.map

package/package.json

@@ -1,8 +1,14 @@
 {
     "name": "reactivated",
-    "version": "0.30.0",
+    "version": "0.30.1",
     "description": "",
-    "main": "dist/index.js",
+    "exports": {
+        ".": "./dist/index.js",
+        "./dist/renderer": "./dist/renderer.js",
+        "./dist/forms": "./dist/forms/index.js",
+        "./dist/context": "./dist/context.js",
+        "./dist/babel.config.js": "./dist/babel.config.js"
+    },
     "typings": "dist/index.d.ts",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",
@@ -11,10 +17,10 @@
     "author": "",
     "bin": {
         "setup_environment.sh": "./scripts/setup_environment.sh",
-        "generate_client_assets": "./dist/generator.js",
-        "generate_client_constants": "./dist/generator/constants.js",
-        "build.client.js": "./dist/build.client.js",
-        "build.renderer.js": "./dist/build.renderer.js"
+        "generate_client_assets": "./dist/generator.mjs",
+        "generate_client_constants": "./dist/generator/constants.mjs",
+        "build.client": "./dist/build.client.mjs",
+        "build.renderer": "./dist/build.renderer.mjs"
     },
     "license": "ISC",
     "peerDependencies": {

package/src/{build.client.tsx → build.client.mts}

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-import linaria from "./linaria";
+import linaria from "./linaria.mjs";
 import {vanillaExtractPlugin} from "@vanilla-extract/esbuild-plugin";
 import * as esbuild from "esbuild";
 import ImportGlobPlugin from "esbuild-plugin-import-glob";
@@ -55,7 +55,8 @@ esbuild
             ".woff2": "file",
         },
         plugins: [
-            ImportGlobPlugin(),
+            // ESM imports make this weird.
+            (ImportGlobPlugin as unknown as {default: () => esbuild.Plugin}).default(),
             // We manually pass in identifiers because the client is not
             // minified by esbuild but the renderer is, so class names could
             // differ.

package/src/{build.renderer.tsx → build.renderer.mts}

@@ -1,11 +1,13 @@
 #!/usr/bin/env node
 
-import linaria from "./linaria";
+import linaria from "./linaria.mjs";
 import {vanillaExtractPlugin} from "@vanilla-extract/esbuild-plugin";
 import * as esbuild from "esbuild";
 import ImportGlobPlugin from "esbuild-plugin-import-glob";
 import http from "http";
-import fs = require("fs");
+import fs from "fs";
+import path from "path";
+import {createRequire} from "module";
 
 let server: http.Server | null = null;
 
@@ -13,11 +15,15 @@ const CACHE_KEY = `${process.cwd()}/node_modules/_reactivated/renderer.js`;
 const production = process.env.NODE_ENV === "production";
 const identifiers = production ? "short" : "debug";
 
-const restartServer = () => {
+const restartServer = async () => {
     if (server != null) {
         server.close();
     }
 
+    const modulePath = path.resolve(CACHE_KEY);
+
+    // https://ar.al/2021/02/22/cache-busting-in-node.js-dynamic-esm-imports/
+    const require = createRequire(import.meta.url);
     delete require.cache[CACHE_KEY];
     server = require(CACHE_KEY).server;
 };
@@ -26,7 +32,7 @@ esbuild
     .context({
         stdin: {
             contents: `
-                export {server} from "reactivated/dist/renderer";
+                export {server, currentTime} from "reactivated/dist/renderer";
             `,
             resolveDir: process.cwd(),
             loader: "ts",
@@ -43,7 +49,8 @@ esbuild
         // above as in monorepos.
         nodePaths: [`${process.cwd()}/node_modules`],
         plugins: [
-            ImportGlobPlugin(),
+            // ESM imports make this weird.
+            (ImportGlobPlugin as unknown as {default: () => esbuild.Plugin}).default(),
             // We manually pass in identifiers because the client is not
             // minified by esbuild but the renderer is, so class names could
             // differ.

package/src/{generator.tsx → generator.mts}

@@ -7,7 +7,8 @@ import * as generated from "./generated";
 // json-schema-to-typescript messes up the descriptor even if unused.
 const stdinBuffer = fs.readFileSync(0);
 
-import {compile} from "json-schema-to-typescript";
+const {compile} = await import("json-schema-to-typescript");
+
 import {
     Project,
     SourceFile,

package/src/{linaria.tsx → linaria.mts}

@@ -103,12 +103,30 @@ export default function linaria({
                     code += `/*# sourceMappingURL=data:application/json;base64,${esbuildMap}*/`;
                 }
 
+                const babelOptions = {
+                    presets: [
+                        ["@babel/preset-env", {targets: {node: "v12.13.0"}}],
+                        ["@babel/preset-typescript", {allowNamespaces: true}],
+                    ],
+                    plugins: [
+                        [
+                            "module-resolver",
+                            {
+                                root: ["./"],
+                                alias: {
+                                    "@client": "./client",
+                                },
+                            },
+                        ],
+                    ],
+                };
+
                 const result = await transform(
                     code,
                     {
                         filename: args.path,
                         preprocessor,
-                        pluginOptions: rest,
+                        pluginOptions: {...rest, babelOptions},
                     },
                     asyncResolve,
                 );

package/src/renderer.tsx

@@ -11,10 +11,6 @@ import {
     HelmetServerState,
 } from "react-helmet-async";
 
-// Useful when running e2e tests or the like, where the output is not
-// co-located with the running process.
-const REACTIVATED_CLIENT_ROOT = process.env.REACTIVATED_CLIENT_ROOT ?? `../client`;
-
 import {Settings} from "./models";
 
 // TODO: WHAT DOES THIS NEED TO BE? Even 100k was super fragile and a 10 choice field broke it.
@@ -78,8 +74,15 @@ type Result =
           error: any;
       };
 
-export const render = ({context, props}: {context: any; props: any}): Result => {
-    const {Provider, getTemplate} = require("_reactivated/index.tsx");
+export const render = async ({
+    context,
+    props,
+}: {
+    context: any;
+    props: any;
+}): Promise<Result> => {
+    // @ts-ignore
+    const {Provider, getTemplate} = await import("_reactivated/index.tsx");
 
     try {
         const Template = getTemplate(context);
@@ -136,8 +139,8 @@ export const server = http.createServer((req, res) => {
     req.on("data", (chunk) => {
         body = Buffer.concat([body, chunk as Buffer]);
     });
-    req.on("end", () => {
-        const result = serverRender(body);
+    req.on("end", async () => {
+        const result = await serverRender(body);
 
         if (result.status === "success") {
             res.writeHead(OK_RESPONSE, {"Content-Type": "text/html; charset=utf-8"});

package/tsconfig.json

@@ -2,8 +2,9 @@
     "compilerOptions": {
         "strict": true,
         "sourceMap": true,
-        "module": "commonjs",
-        "target": "es6",
+        "module": "ES2022",
+        "target": "ES2020",
+        "moduleResolution": "node",
         "outDir": "dist",
         "esModuleInterop": true,
         "declaration": true,

package/dist/babel.config.d.ts

@@ -1,12 +0,0 @@
-declare const _default: {
-    presets: (string | {
-        allowNamespaces: boolean;
-    })[][];
-    plugins: (string | {
-        root: string[];
-        alias: {
-            "@client": string;
-        };
-    })[][];
-};
-export default _default;