reactivated 0.29.0 → 0.30.0

package/dist/build.client.js

@@ -23,11 +23,20 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+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 __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const esbuild_1 = __importDefault(require("@linaria/esbuild"));
+const linaria_1 = __importDefault(require("./linaria"));
 const esbuild_plugin_1 = require("@vanilla-extract/esbuild-plugin");
 const esbuild = __importStar(require("esbuild"));
 const esbuild_plugin_import_glob_1 = __importDefault(require("esbuild-plugin-import-glob"));
@@ -41,7 +50,7 @@ const env = {
     TAG_VERSION: process.env.TAG_VERSION,
 };
 esbuild
-    .build({
+    .context({
     entryPoints,
     bundle: true,
     // We use terser to minify because esbuild breaks safari sourcemaps.
@@ -54,7 +63,6 @@ esbuild
     sourcemap: true,
     target: "es2018",
     preserveSymlinks: true,
-    watch: production === false,
     external: ["moment", "@client/generated/images"],
     define: {
         // You need both. The one from the stringified JSON is not picked
@@ -82,8 +90,16 @@ esbuild
         // Instead of set it manually instead of relying on minification
         // settings.
         (0, esbuild_plugin_1.vanillaExtractPlugin)({ identifiers }),
-        (0, esbuild_1.default)({ sourceMap: true, esbuildOptions: { sourcemap: "inline" } }),
+        (0, linaria_1.default)({ sourceMap: true, esbuildOptions: { sourcemap: "inline" } }),
     ],
 })
-    .catch(() => process.exit(1));
+    .then((context) => __awaiter(void 0, void 0, void 0, function* () {
+    if (production === false) {
+        context.watch();
+    }
+    else {
+        yield context.rebuild();
+        process.exit();
+    }
+}));
 //# sourceMappingURL=build.client.js.map

package/dist/build.client.js.map

@@ -1 +1 @@
-{"version":3,"file":"build.client.js","sourceRoot":"","sources":["../src/build.client.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,+DAAuC;AACvC,oEAAqE;AACrE,iDAAmC;AACnC,4FAA0D;AAE1D,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAEzC,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,CAClC,UAAU,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,YAAY,KAAK,MAAM,CAAC,CAAC,CAC9D,CAAC;AAEF,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,CAAC;AACzD,MAAM,WAAW,GAAG,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;AAEnD,MAAM,GAAG,GAAG;IACR,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,aAAa;IACnD,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa;IACxC,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW;CACvC,CAAC;AAEF,OAAO;KACF,KAAK,CAAC;IACH,WAAW;IACX,MAAM,EAAE,IAAI;IACZ,oEAAoE;IACpE,sEAAsE;IACtE,MAAM,EAAE,KAAK;IACb,2CAA2C;IAC3C,aAAa,EAAE,MAAM;IACrB,QAAQ,EAAE,SAAS;IACnB,MAAM,EAAE,eAAe;IACvB,SAAS,EAAE,IAAI;IACf,MAAM,EAAE,QAAQ;IAChB,gBAAgB,EAAE,IAAI;IACtB,KAAK,EAAE,UAAU,KAAK,KAAK;IAC3B,QAAQ,EAAE,CAAC,QAAQ,EAAE,0BAA0B,CAAC;IAChD,MAAM,EAAE;QACJ,iEAAiE;QACjE,+BAA+B;QAC/B,sBAAsB,EAAE,UAAU,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,eAAe;QACrE,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,EAAC,GAAG,EAAC,CAAC;QAE9B,4BAA4B;QAC5B,MAAM,EAAE,IAAI;KACf;IACD,MAAM,EAAE;QACJ,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,MAAM;QACf,MAAM,EAAE,MAAM;QACd,MAAM,EAAE,MAAM;QACd,MAAM,EAAE,MAAM;QACd,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,MAAM;QACf,QAAQ,EAAE,MAAM;KACnB;IACD,OAAO,EAAE;QACL,IAAA,oCAAgB,GAAE;QAClB,4DAA4D;QAC5D,gEAAgE;QAChE,UAAU;QACV,gEAAgE;QAChE,YAAY;QACZ,IAAA,qCAAoB,EAAC,EAAC,WAAW,EAAC,CAAC;QACnC,IAAA,iBAAO,EAAC,EAAC,SAAS,EAAE,IAAI,EAAE,cAAc,EAAE,EAAC,SAAS,EAAE,QAAQ,EAAC,EAAC,CAAC;KACpE;CACJ,CAAC;KACD,KAAK,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC"}
+{"version":3,"file":"build.client.js","sourceRoot":"","sources":["../src/build.client.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,wDAAgC;AAChC,oEAAqE;AACrE,iDAAmC;AACnC,4FAA0D;AAE1D,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAEzC,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,CAClC,UAAU,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,YAAY,KAAK,MAAM,CAAC,CAAC,CAC9D,CAAC;AAEF,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,CAAC;AACzD,MAAM,WAAW,GAAG,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;AAEnD,MAAM,GAAG,GAAG;IACR,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,aAAa;IACnD,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa;IACxC,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW;CACvC,CAAC;AAEF,OAAO;KACF,OAAO,CAAC;IACL,WAAW;IACX,MAAM,EAAE,IAAI;IACZ,oEAAoE;IACpE,sEAAsE;IACtE,MAAM,EAAE,KAAK;IACb,2CAA2C;IAC3C,aAAa,EAAE,MAAM;IACrB,QAAQ,EAAE,SAAS;IACnB,MAAM,EAAE,eAAe;IACvB,SAAS,EAAE,IAAI;IACf,MAAM,EAAE,QAAQ;IAChB,gBAAgB,EAAE,IAAI;IACtB,QAAQ,EAAE,CAAC,QAAQ,EAAE,0BAA0B,CAAC;IAChD,MAAM,EAAE;QACJ,iEAAiE;QACjE,+BAA+B;QAC/B,sBAAsB,EAAE,UAAU,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,eAAe;QACrE,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,EAAC,GAAG,EAAC,CAAC;QAE9B,4BAA4B;QAC5B,MAAM,EAAE,IAAI;KACf;IACD,MAAM,EAAE;QACJ,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,MAAM;QACf,MAAM,EAAE,MAAM;QACd,MAAM,EAAE,MAAM;QACd,MAAM,EAAE,MAAM;QACd,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,MAAM;QACf,QAAQ,EAAE,MAAM;KACnB;IACD,OAAO,EAAE;QACL,IAAA,oCAAgB,GAAE;QAClB,4DAA4D;QAC5D,gEAAgE;QAChE,UAAU;QACV,gEAAgE;QAChE,YAAY;QACZ,IAAA,qCAAoB,EAAC,EAAC,WAAW,EAAC,CAAC;QACnC,IAAA,iBAAO,EAAC,EAAC,SAAS,EAAE,IAAI,EAAE,cAAc,EAAE,EAAC,SAAS,EAAE,QAAQ,EAAC,EAAC,CAAC;KACpE;CACJ,CAAC;KACD,IAAI,CAAC,CAAO,OAAO,EAAE,EAAE;IACpB,IAAI,UAAU,KAAK,KAAK,EAAE;QACtB,OAAO,CAAC,KAAK,EAAE,CAAC;KACnB;SAAM;QACH,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;QACxB,OAAO,CAAC,IAAI,EAAE,CAAC;KAClB;AACL,CAAC,CAAA,CAAC,CAAC"}

package/dist/build.renderer.js

@@ -23,11 +23,20 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+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 __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const esbuild_1 = __importDefault(require("@linaria/esbuild"));
+const linaria_1 = __importDefault(require("./linaria"));
 const esbuild_plugin_1 = require("@vanilla-extract/esbuild-plugin");
 const esbuild = __importStar(require("esbuild"));
 const esbuild_plugin_import_glob_1 = __importDefault(require("esbuild-plugin-import-glob"));
@@ -35,8 +44,15 @@ let server = null;
 const CACHE_KEY = `${process.cwd()}/node_modules/_reactivated/renderer.js`;
 const production = process.env.NODE_ENV === "production";
 const identifiers = production ? "short" : "debug";
+const restartServer = () => {
+    if (server != null) {
+        server.close();
+    }
+    delete require.cache[CACHE_KEY];
+    server = require(CACHE_KEY).server;
+};
 esbuild
-    .build({
+    .context({
     stdin: {
         contents: `
                 export {server} from "reactivated/dist/renderer";
@@ -55,13 +71,6 @@ esbuild
     // of the location of reactivated being in the cwd node_modules or
     // above as in monorepos.
     nodePaths: [`${process.cwd()}/node_modules`],
-    watch: production === true
-        ? false
-        : {
-            onRebuild: () => {
-                restartServer();
-            },
-        },
     plugins: [
         (0, esbuild_plugin_import_glob_1.default)(),
         // We manually pass in identifiers because the client is not
@@ -70,20 +79,26 @@ esbuild
         // Instead of set it manually instead of relying on minification
         // settings.
         (0, esbuild_plugin_1.vanillaExtractPlugin)({ identifiers }),
-        (0, esbuild_1.default)({ sourceMap: true }),
+        (0, linaria_1.default)({ sourceMap: true }),
+        {
+            name: "restartServer",
+            setup: (build) => {
+                if (production === false) {
+                    build.onEnd((result) => {
+                        restartServer();
+                    });
+                }
+            },
+        },
     ],
 })
-    .then(() => {
+    .then((context) => __awaiter(void 0, void 0, void 0, function* () {
     if (production === false) {
-        restartServer();
+        context.watch();
     }
-})
-    .catch(() => process.exit(1));
-const restartServer = () => {
-    if (server != null) {
-        server.close();
+    else {
+        yield context.rebuild();
+        process.exit();
     }
-    delete require.cache[CACHE_KEY];
-    server = require(CACHE_KEY).server;
-};
+}));
 //# sourceMappingURL=build.renderer.js.map

package/dist/build.renderer.js.map

@@ -1 +1 @@
-{"version":3,"file":"build.renderer.js","sourceRoot":"","sources":["../src/build.renderer.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,+DAAuC;AACvC,oEAAqE;AACrE,iDAAmC;AACnC,4FAA0D;AAI1D,IAAI,MAAM,GAAuB,IAAI,CAAC;AAEtC,MAAM,SAAS,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,wCAAwC,CAAC;AAC3E,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,CAAC;AACzD,MAAM,WAAW,GAAG,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;AAEnD,OAAO;KACF,KAAK,CAAC;IACH,KAAK,EAAE;QACH,QAAQ,EAAE;;aAET;QACD,UAAU,EAAE,OAAO,CAAC,GAAG,EAAE;QACzB,MAAM,EAAE,IAAI;KACf;IACD,MAAM,EAAE,UAAU;IAClB,MAAM,EAAE,IAAI;IACZ,QAAQ,EAAE,MAAM;IAChB,OAAO,EAAE,yCAAyC;IAClD,SAAS,EAAE,IAAI;IACf,MAAM,EAAE,QAAQ;IAChB,gBAAgB,EAAE,IAAI;IACtB,gEAAgE;IAChE,kEAAkE;IAClE,yBAAyB;IACzB,SAAS,EAAE,CAAC,GAAG,OAAO,CAAC,GAAG,EAAE,eAAe,CAAC;IAC5C,KAAK,EACD,UAAU,KAAK,IAAI;QACf,CAAC,CAAC,KAAK;QACP,CAAC,CAAC;YACI,SAAS,EAAE,GAAG,EAAE;gBACZ,aAAa,EAAE,CAAC;YACpB,CAAC;SACJ;IACX,OAAO,EAAE;QACL,IAAA,oCAAgB,GAAE;QAClB,4DAA4D;QAC5D,gEAAgE;QAChE,UAAU;QACV,gEAAgE;QAChE,YAAY;QACZ,IAAA,qCAAoB,EAAC,EAAC,WAAW,EAAC,CAAC;QACnC,IAAA,iBAAO,EAAC,EAAC,SAAS,EAAE,IAAI,EAAC,CAAC;KAC7B;CACJ,CAAC;KACD,IAAI,CAAC,GAAG,EAAE;IACP,IAAI,UAAU,KAAK,KAAK,EAAE;QACtB,aAAa,EAAE,CAAC;KACnB;AACL,CAAC,CAAC;KACD,KAAK,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;AAElC,MAAM,aAAa,GAAG,GAAG,EAAE;IACvB,IAAI,MAAM,IAAI,IAAI,EAAE;QAChB,MAAM,CAAC,KAAK,EAAE,CAAC;KAClB;IAED,OAAO,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAChC,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC;AACvC,CAAC,CAAC"}
+{"version":3,"file":"build.renderer.js","sourceRoot":"","sources":["../src/build.renderer.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,wDAAgC;AAChC,oEAAqE;AACrE,iDAAmC;AACnC,4FAA0D;AAI1D,IAAI,MAAM,GAAuB,IAAI,CAAC;AAEtC,MAAM,SAAS,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,wCAAwC,CAAC;AAC3E,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,CAAC;AACzD,MAAM,WAAW,GAAG,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;AAEnD,MAAM,aAAa,GAAG,GAAG,EAAE;IACvB,IAAI,MAAM,IAAI,IAAI,EAAE;QAChB,MAAM,CAAC,KAAK,EAAE,CAAC;KAClB;IAED,OAAO,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAChC,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC;AACvC,CAAC,CAAC;AAEF,OAAO;KACF,OAAO,CAAC;IACL,KAAK,EAAE;QACH,QAAQ,EAAE;;aAET;QACD,UAAU,EAAE,OAAO,CAAC,GAAG,EAAE;QACzB,MAAM,EAAE,IAAI;KACf;IACD,MAAM,EAAE,UAAU;IAClB,MAAM,EAAE,IAAI;IACZ,QAAQ,EAAE,MAAM;IAChB,OAAO,EAAE,yCAAyC;IAClD,SAAS,EAAE,IAAI;IACf,MAAM,EAAE,QAAQ;IAChB,gBAAgB,EAAE,IAAI;IACtB,gEAAgE;IAChE,kEAAkE;IAClE,yBAAyB;IACzB,SAAS,EAAE,CAAC,GAAG,OAAO,CAAC,GAAG,EAAE,eAAe,CAAC;IAC5C,OAAO,EAAE;QACL,IAAA,oCAAgB,GAAE;QAClB,4DAA4D;QAC5D,gEAAgE;QAChE,UAAU;QACV,gEAAgE;QAChE,YAAY;QACZ,IAAA,qCAAoB,EAAC,EAAC,WAAW,EAAC,CAAC;QACnC,IAAA,iBAAO,EAAC,EAAC,SAAS,EAAE,IAAI,EAAC,CAAC;QAC1B;YACI,IAAI,EAAE,eAAe;YACrB,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE;gBACb,IAAI,UAAU,KAAK,KAAK,EAAE;oBACtB,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,EAAE;wBACnB,aAAa,EAAE,CAAC;oBACpB,CAAC,CAAC,CAAC;iBACN;YACL,CAAC;SACJ;KACJ;CACJ,CAAC;KACD,IAAI,CAAC,CAAO,OAAO,EAAE,EAAE;IACpB,IAAI,UAAU,KAAK,KAAK,EAAE;QACtB,OAAO,CAAC,KAAK,EAAE,CAAC;KACnB;SAAM;QACH,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;QACxB,OAAO,CAAC,IAAI,EAAE,CAAC;KAClB;AACL,CAAC,CAAA,CAAC,CAAC"}

package/dist/linaria.d.ts

@@ -0,0 +1,14 @@
+/**
+ * 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
+ */
+import type { Plugin, TransformOptions } from "esbuild";
+import type { PluginOptions, Preprocessor } from "@linaria/babel-preset";
+type EsbuildPluginOptions = {
+    sourceMap?: boolean;
+    preprocessor?: Preprocessor;
+    esbuildOptions?: TransformOptions;
+} & Partial<PluginOptions>;
+export default function linaria({ sourceMap, preprocessor, esbuildOptions, ...rest }?: EsbuildPluginOptions): Plugin;
+export {};

package/dist/linaria.js

@@ -0,0 +1,127 @@
+"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");
+const nodeModulesRegex = /^(?:.*[\\/])?node_modules(?:[\\/].*)?$/;
+function linaria(_a = {}) {
+    var { sourceMap, preprocessor, esbuildOptions } = _a, rest = __rest(_a, ["sourceMap", "preprocessor", "esbuildOptions"]);
+    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, {
+                    kind: "entry-point",
+                    resolveDir: context,
+                });
+                if (result.errors.length > 0) {
+                    throw new Error(`Cannot resolve ${token}`);
+                }
+                return result.path;
+            });
+            build.onResolve({ filter: /\.linaria\.css$/ }, (args) => {
+                return {
+                    namespace: "linaria",
+                    path: args.path,
+                };
+            });
+            build.onLoad({ filter: /.*/, namespace: "linaria" }, (args) => {
+                return {
+                    contents: cssLookup.get(args.path),
+                    loader: "css",
+                    resolveDir: path_1.default.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);
+                const loader = ext.replace(/^\./, "");
+                if (nodeModulesRegex.test(args.path)) {
+                    return {
+                        loader,
+                        contents: rawCode,
+                    };
+                }
+                if (!options) {
+                    options = {};
+                    if ("jsxFactory" in build.initialOptions) {
+                        options.jsxFactory = build.initialOptions.jsxFactory;
+                    }
+                    if ("jsxFragment" in build.initialOptions) {
+                        options.jsxFragment = build.initialOptions.jsxFragment;
+                    }
+                }
+                const transformed = (0, esbuild_1.transformSync)(rawCode, Object.assign(Object.assign({}, 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, {
+                    filename: args.path,
+                    preprocessor,
+                    pluginOptions: rest,
+                }, asyncResolve);
+                if (!result.cssText) {
+                    return {
+                        contents: code,
+                        loader,
+                        resolveDir: path_1.default.dirname(args.path),
+                    };
+                }
+                let { cssText } = result;
+                const slug = (0, babel_preset_1.slugify)(cssText);
+                const cssFilename = `${filename}_${slug}.linaria.css`;
+                let contents = `import ${JSON.stringify(cssFilename)}; ${result.code}`;
+                if (sourceMap && result.cssSourceMapText) {
+                    const map = Buffer.from(result.cssSourceMapText).toString("base64");
+                    cssText += `/*# sourceMappingURL=data:application/json;base64,${map}*/`;
+                    const linariaMap = Buffer.from(JSON.stringify(result.sourceMap)).toString("base64");
+                    contents += `/*# sourceMappingURL=data:application/json;base64,${linariaMap}*/`;
+                }
+                cssLookup.set(cssFilename, cssText);
+                return {
+                    contents,
+                    loader,
+                    resolveDir: path_1.default.dirname(args.path),
+                };
+            }));
+        },
+    };
+}
+exports.default = linaria;
+//# sourceMappingURL=linaria.js.map

package/dist/linaria.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "reactivated",
-    "version": "0.29.0",
+    "version": "0.30.0",
     "description": "",
     "main": "dist/index.js",
     "typings": "dist/index.d.ts",
@@ -30,10 +30,14 @@
         "@types/react-dom": "^18.0.5",
         "@typescript-eslint/eslint-plugin": "^5.59.6",
         "@typescript-eslint/parser": "^5.59.6",
-        "@vanilla-extract/css": "^1.6.8",
-        "@vanilla-extract/esbuild-plugin": "^2.0.2",
+        "@vanilla-extract/css": "^1.11.0",
+        "@vanilla-extract/css-utils": "^0.1.3",
+        "@vanilla-extract/dynamic": "^2.0.3",
+        "@vanilla-extract/esbuild-plugin": "^2.2.2",
+        "@vanilla-extract/recipes": "^0.4.0",
+        "@vanilla-extract/sprinkles": "^1.6.0",
         "babel-plugin-module-resolver": "^5.0.0",
-        "esbuild": "^0.15.16",
+        "esbuild": "^0.17.19",
         "esbuild-plugin-import-glob": "^0.1.1",
         "eslint": "^8.40.0",
         "eslint-config-prettier": "^8.8.0",

package/src/build.client.tsx

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-import linaria from "@linaria/esbuild";
+import linaria from "./linaria";
 import {vanillaExtractPlugin} from "@vanilla-extract/esbuild-plugin";
 import * as esbuild from "esbuild";
 import ImportGlobPlugin from "esbuild-plugin-import-glob";
@@ -21,7 +21,7 @@ const env = {
 };
 
 esbuild
-    .build({
+    .context({
         entryPoints,
         bundle: true,
         // We use terser to minify because esbuild breaks safari sourcemaps.
@@ -34,7 +34,6 @@ esbuild
         sourcemap: true,
         target: "es2018",
         preserveSymlinks: true,
-        watch: production === false,
         external: ["moment", "@client/generated/images"],
         define: {
             // You need both. The one from the stringified JSON is not picked
@@ -66,4 +65,11 @@ esbuild
             linaria({sourceMap: true, esbuildOptions: {sourcemap: "inline"}}),
         ],
     })
-    .catch(() => process.exit(1));
+    .then(async (context) => {
+        if (production === false) {
+            context.watch();
+        } else {
+            await context.rebuild();
+            process.exit();
+        }
+    });

package/src/build.renderer.tsx

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-import linaria from "@linaria/esbuild";
+import linaria from "./linaria";
 import {vanillaExtractPlugin} from "@vanilla-extract/esbuild-plugin";
 import * as esbuild from "esbuild";
 import ImportGlobPlugin from "esbuild-plugin-import-glob";
@@ -13,8 +13,17 @@ const CACHE_KEY = `${process.cwd()}/node_modules/_reactivated/renderer.js`;
 const production = process.env.NODE_ENV === "production";
 const identifiers = production ? "short" : "debug";
 
+const restartServer = () => {
+    if (server != null) {
+        server.close();
+    }
+
+    delete require.cache[CACHE_KEY];
+    server = require(CACHE_KEY).server;
+};
+
 esbuild
-    .build({
+    .context({
         stdin: {
             contents: `
                 export {server} from "reactivated/dist/renderer";
@@ -33,14 +42,6 @@ esbuild
         // of the location of reactivated being in the cwd node_modules or
         // above as in monorepos.
         nodePaths: [`${process.cwd()}/node_modules`],
-        watch:
-            production === true
-                ? false
-                : {
-                      onRebuild: () => {
-                          restartServer();
-                      },
-                  },
         plugins: [
             ImportGlobPlugin(),
             // We manually pass in identifiers because the client is not
@@ -50,20 +51,23 @@ esbuild
             // settings.
             vanillaExtractPlugin({identifiers}),
             linaria({sourceMap: true}),
+            {
+                name: "restartServer",
+                setup: (build) => {
+                    if (production === false) {
+                        build.onEnd((result) => {
+                            restartServer();
+                        });
+                    }
+                },
+            },
         ],
     })
-    .then(() => {
+    .then(async (context) => {
         if (production === false) {
-            restartServer();
+            context.watch();
+        } else {
+            await context.rebuild();
+            process.exit();
         }
-    })
-    .catch(() => process.exit(1));
-
-const restartServer = () => {
-    if (server != null) {
-        server.close();
-    }
-
-    delete require.cache[CACHE_KEY];
-    server = require(CACHE_KEY).server;
-};
+    });

package/src/linaria.tsx

@@ -0,0 +1,150 @@
+/**
+ * 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
+ */
+
+import fs from "fs";
+import path from "path";
+
+import type {Plugin, TransformOptions, Loader} from "esbuild";
+import {transformSync} from "esbuild";
+
+import type {PluginOptions, Preprocessor} from "@linaria/babel-preset";
+import {slugify, transform} from "@linaria/babel-preset";
+
+type EsbuildPluginOptions = {
+    sourceMap?: boolean;
+    preprocessor?: Preprocessor;
+    esbuildOptions?: TransformOptions;
+} & Partial<PluginOptions>;
+
+const nodeModulesRegex = /^(?:.*[\\/])?node_modules(?:[\\/].*)?$/;
+
+export default function linaria({
+    sourceMap,
+    preprocessor,
+    esbuildOptions,
+    ...rest
+}: EsbuildPluginOptions = {}): Plugin {
+    let options = esbuildOptions;
+    return {
+        name: "linaria",
+        setup(build) {
+            const cssLookup = new Map<string, string>();
+
+            const asyncResolve = async (
+                token: string,
+                importer: string,
+            ): Promise<string> => {
+                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,
+                });
+
+                if (result.errors.length > 0) {
+                    throw new Error(`Cannot resolve ${token}`);
+                }
+
+                return result.path;
+            };
+
+            build.onResolve({filter: /\.linaria\.css$/}, (args) => {
+                return {
+                    namespace: "linaria",
+                    path: args.path,
+                };
+            });
+
+            build.onLoad({filter: /.*/, namespace: "linaria"}, (args) => {
+                return {
+                    contents: cssLookup.get(args.path),
+                    loader: "css",
+                    resolveDir: path.basename(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(/^\./, "") as Loader;
+
+                if (nodeModulesRegex.test(args.path)) {
+                    return {
+                        loader,
+                        contents: rawCode,
+                    };
+                }
+
+                if (!options) {
+                    options = {};
+                    if ("jsxFactory" in build.initialOptions) {
+                        options.jsxFactory = build.initialOptions.jsxFactory;
+                    }
+                    if ("jsxFragment" in build.initialOptions) {
+                        options.jsxFragment = build.initialOptions.jsxFragment;
+                    }
+                }
+
+                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 = await transform(
+                    code,
+                    {
+                        filename: args.path,
+                        preprocessor,
+                        pluginOptions: rest,
+                    },
+                    asyncResolve,
+                );
+
+                if (!result.cssText) {
+                    return {
+                        contents: code,
+                        loader,
+                        resolveDir: path.dirname(args.path),
+                    };
+                }
+
+                let {cssText} = result;
+
+                const slug = slugify(cssText);
+                const cssFilename = `${filename}_${slug}.linaria.css`;
+
+                let contents = `import ${JSON.stringify(cssFilename)}; ${result.code}`;
+
+                if (sourceMap && result.cssSourceMapText) {
+                    const map = Buffer.from(result.cssSourceMapText).toString("base64");
+                    cssText += `/*# sourceMappingURL=data:application/json;base64,${map}*/`;
+                    const linariaMap = Buffer.from(
+                        JSON.stringify(result.sourceMap),
+                    ).toString("base64");
+                    contents += `/*# sourceMappingURL=data:application/json;base64,${linariaMap}*/`;
+                }
+
+                cssLookup.set(cssFilename, cssText);
+
+                return {
+                    contents,
+                    loader,
+                    resolveDir: path.dirname(args.path),
+                };
+            });
+        },
+    };
+}