@wyw-in-js/transform 0.8.0 → 1.0.0

package/types/transform/BaseEntrypoint.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="debug" />
 import type { Debugger } from '@wyw-in-js/shared';
 import type { ParentEntrypoint } from '../types';
 import type { Services } from './types';

package/types/transform/Entrypoint.helpers.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="debug" />
 import type { TransformOptions } from '@babel/core';
 import type { File } from '@babel/types';
 import type { Debugger, EvalRule } from '@wyw-in-js/shared';

package/types/transform/Entrypoint.helpers.js

@@ -1,6 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isSuperSet = exports.mergeOnly = exports.getStack = exports.loadAndParse = exports.parseFile = exports.getMatchedRule = void 0;
+exports.isSuperSet = void 0;
+exports.getMatchedRule = getMatchedRule;
+exports.parseFile = parseFile;
+exports.loadAndParse = loadAndParse;
+exports.getStack = getStack;
+exports.mergeOnly = mergeOnly;
 const fs_1 = require("fs");
 const path_1 = require("path");
 const shared_1 = require("@wyw-in-js/shared");
@@ -8,6 +13,7 @@ const buildOptions_1 = require("../options/buildOptions");
 const loadBabelOptions_1 = require("../options/loadBabelOptions");
 const getFileIdx_1 = require("../utils/getFileIdx");
 const getPluginKey_1 = require("../utils/getPluginKey");
+const parseRequest_1 = require("../utils/parseRequest");
 function getMatchedRule(rules, filename, code) {
     for (let i = rules.length - 1; i >= 0; i--) {
         const rule = rules[i];
@@ -23,7 +29,6 @@ function getMatchedRule(rules, filename, code) {
     }
     return { action: 'ignore' };
 }
-exports.getMatchedRule = getMatchedRule;
 function parseFile(babel, filename, originalCode, parseConfig) {
     const log = shared_1.logger.extend('transform:parse').extend((0, getFileIdx_1.getFileIdx)(filename));
     const parseResult = babel.parseSync(originalCode, parseConfig);
@@ -33,7 +38,6 @@ function parseFile(babel, filename, originalCode, parseConfig) {
     log('stage-1', `${filename} has been parsed`);
     return parseResult;
 }
-exports.parseFile = parseFile;
 const isModuleResolver = (plugin) => {
     const key = (0, getPluginKey_1.getPluginKey)(plugin);
     if (!key)
@@ -44,6 +48,93 @@ const isModuleResolver = (plugin) => {
     return /([\\/])babel-plugin-module-resolver\1/.test(key);
 };
 let moduleResolverWarned = false;
+const normalizeBabelKey = (key) => key.replace(/\\/g, '/');
+const isBabelPresetTypescript = (key) => {
+    const normalized = normalizeBabelKey(key);
+    if (normalized === 'typescript')
+        return true;
+    return normalized.includes('preset-typescript');
+};
+const isBabelTransformTypescriptPlugin = (key) => {
+    const normalized = normalizeBabelKey(key);
+    if (normalized === 'transform-typescript')
+        return true;
+    return normalized.includes('plugin-transform-typescript');
+};
+const withAllowDeclareFields = (item) => {
+    if (!Array.isArray(item)) {
+        return [item, { allowDeclareFields: true }];
+    }
+    const [target, rawOptions, ...rest] = item;
+    const options = typeof rawOptions === 'object' &&
+        rawOptions !== null &&
+        !Array.isArray(rawOptions)
+        ? rawOptions
+        : {};
+    if ('allowDeclareFields' in options) {
+        return item;
+    }
+    return [target, { ...options, allowDeclareFields: true }, ...rest];
+};
+const ensureAllowDeclareFieldsInBabelOptions = (babelOptions, scope = 'top') => {
+    let presetsChanged = false;
+    let pluginsChanged = false;
+    let overridesChanged = false;
+    let envChanged = false;
+    const presets = babelOptions.presets?.map((item) => {
+        const key = (0, getPluginKey_1.getPluginKey)(item);
+        if (!key || !isBabelPresetTypescript(key)) {
+            return item;
+        }
+        presetsChanged = true;
+        return withAllowDeclareFields(item);
+    });
+    const plugins = babelOptions.plugins?.map((item) => {
+        const key = (0, getPluginKey_1.getPluginKey)(item);
+        if (!key || !isBabelTransformTypescriptPlugin(key)) {
+            return item;
+        }
+        pluginsChanged = true;
+        return withAllowDeclareFields(item);
+    });
+    const { overrides: baseOverrides } = babelOptions;
+    let overrides = baseOverrides;
+    if (scope === 'top' && baseOverrides) {
+        const patchedOverrides = baseOverrides.map((override) => ensureAllowDeclareFieldsInBabelOptions(override, 'override'));
+        if (patchedOverrides.some((patchedOverride, idx) => patchedOverride !== baseOverrides[idx])) {
+            overridesChanged = true;
+            overrides = patchedOverrides;
+        }
+    }
+    const { env: baseEnv } = babelOptions;
+    let env = baseEnv;
+    if (scope === 'top' && baseEnv) {
+        const entries = Object.entries(baseEnv);
+        const patchedEntries = entries.map(([envName, envOptions]) => [
+            envName,
+            envOptions
+                ? ensureAllowDeclareFieldsInBabelOptions(envOptions, 'env')
+                : envOptions,
+        ]);
+        if (patchedEntries.some(([, patched], idx) => patched !== entries[idx][1])) {
+            envChanged = true;
+            env = Object.fromEntries(patchedEntries);
+        }
+    }
+    if (!presetsChanged && !pluginsChanged && !overridesChanged && !envChanged) {
+        return babelOptions;
+    }
+    const next = { ...babelOptions };
+    if (presetsChanged)
+        next.presets = presets;
+    if (pluginsChanged)
+        next.plugins = plugins;
+    if (overridesChanged)
+        next.overrides = overrides;
+    if (envChanged)
+        next.env = env;
+    return next;
+};
 function buildConfigs(services, name, pluginOptions, babelOptions) {
     const { babel, options } = services;
     const commonOptions = {
@@ -54,10 +145,20 @@ function buildConfigs(services, name, pluginOptions, babelOptions) {
         sourceFileName: name,
         sourceMaps: true,
     };
-    const rawConfig = (0, buildOptions_1.buildOptions)(pluginOptions?.babelOptions, babelOptions, commonOptions);
+    const isTypescriptFile = name.endsWith('.ts') ||
+        name.endsWith('.tsx') ||
+        name.endsWith('.mts') ||
+        name.endsWith('.cts');
+    let rawConfig = (0, buildOptions_1.buildOptions)(pluginOptions?.babelOptions, babelOptions, commonOptions);
+    if (isTypescriptFile) {
+        rawConfig = ensureAllowDeclareFieldsInBabelOptions(rawConfig);
+    }
     const useBabelConfigs = (0, shared_1.isFeatureEnabled)(pluginOptions.features, 'useBabelConfigs', name);
     if (!useBabelConfigs) {
-        rawConfig.configFile = false;
+        rawConfig = {
+            ...rawConfig,
+            configFile: false,
+        };
     }
     const parseConfig = (0, loadBabelOptions_1.loadBabelOptions)(babel, name, {
         babelrc: useBabelConfigs,
@@ -73,11 +174,14 @@ function buildConfigs(services, name, pluginOptions, babelOptions) {
                 `Please add the module-resolver plugin to the babelOptions for the wyw-in-js plugin.`);
             moduleResolverWarned = true;
         }
-        rawConfig.plugins = [
-            ...(parseConfig.plugins?.filter((plugin) => isModuleResolver(plugin)) ??
-                []),
-            ...(rawConfig.plugins ?? []),
-        ];
+        rawConfig = {
+            ...rawConfig,
+            plugins: [
+                ...(parseConfig.plugins?.filter((plugin) => isModuleResolver(plugin)) ??
+                    []),
+                ...(rawConfig.plugins ?? []),
+            ],
+        };
     }
     const evalConfig = (0, loadBabelOptions_1.loadBabelOptions)(babel, name, {
         babelrc: false,
@@ -90,24 +194,20 @@ function buildConfigs(services, name, pluginOptions, babelOptions) {
 }
 function loadAndParse(services, name, loadedCode, log) {
     const { babel, eventEmitter, options: { pluginOptions }, } = services;
-    const extension = (0, path_1.extname)(name);
+    const filename = (0, parseRequest_1.stripQueryAndHash)(name);
+    const extension = (0, path_1.extname)(filename);
     if (!pluginOptions.extensions.includes(extension)) {
-        log('[createEntrypoint] %s is ignored. If you want it to be processed, you should add \'%s\' to the "extensions" option.', name, extension);
+        log('[createEntrypoint] %s is ignored. If you want it to be processed, you should add \'%s\' to the "extensions" option.', filename, extension);
         return {
-            get code() {
-                if ((0, path_1.isAbsolute)(name)) {
-                    return loadedCode ?? (0, fs_1.readFileSync)(name, 'utf-8');
-                }
-                return ''; // it is a built-in module
-            },
+            code: (0, path_1.isAbsolute)(filename) ? loadedCode : '',
             evaluator: 'ignored',
             reason: 'extension',
         };
     }
-    const code = loadedCode ?? (0, fs_1.readFileSync)(name, 'utf-8');
-    const { action, babelOptions } = getMatchedRule(pluginOptions.rules, name, code);
+    const code = loadedCode ?? (0, fs_1.readFileSync)(filename, 'utf-8');
+    const { action, babelOptions } = getMatchedRule(pluginOptions.rules, filename, code);
     let ast;
-    const { evalConfig, parseConfig } = buildConfigs(services, name, pluginOptions, babelOptions);
+    const { evalConfig, parseConfig } = buildConfigs(services, filename, pluginOptions, babelOptions);
     const getOrParse = () => {
         if (ast)
             return ast;
@@ -128,7 +228,7 @@ function loadAndParse(services, name, loadedCode, log) {
     const evaluator = typeof action === 'function'
         ? action
         : require(require.resolve(action, {
-            paths: [(0, path_1.dirname)(name)],
+            paths: [(0, path_1.dirname)(filename)],
         })).default;
     return {
         get ast() {
@@ -139,7 +239,6 @@ function loadAndParse(services, name, loadedCode, log) {
         evalConfig,
     };
 }
-exports.loadAndParse = loadAndParse;
 function getStack(entrypoint) {
     if (!entrypoint)
         return [];
@@ -151,13 +250,11 @@ function getStack(entrypoint) {
     }
     return stack;
 }
-exports.getStack = getStack;
 function mergeOnly(a, b) {
     const result = new Set(a);
     b.forEach((item) => result.add(item));
     return [...result].filter((i) => i).sort();
 }
-exports.mergeOnly = mergeOnly;
 const isSuperSet = (a, b) => {
     if (a.includes('*'))
         return true;

package/types/transform/Entrypoint.js

@@ -4,6 +4,7 @@ exports.Entrypoint = void 0;
 const ts_invariant_1 = require("ts-invariant");
 const BaseEntrypoint_1 = require("./BaseEntrypoint");
 const Entrypoint_helpers_1 = require("./Entrypoint.helpers");
+const isStaticallyEvaluatableModule_1 = require("./isStaticallyEvaluatableModule");
 const EvaluatedEntrypoint_1 = require("./EvaluatedEntrypoint");
 const AbortError_1 = require("./actions/AbortError");
 const BaseAction_1 = require("./actions/BaseAction");
@@ -105,8 +106,8 @@ class Entrypoint extends BaseEntrypoint_1.BaseEntrypoint {
             return ['cached', cached];
         }
         const exports = cached?.exports;
-        const evaluatedOnly = cached?.evaluatedOnly ?? [];
-        const mergedOnly = cached?.only ? (0, Entrypoint_helpers_1.mergeOnly)(cached.only, only) : only;
+        const evaluatedOnly = changed ? [] : cached?.evaluatedOnly ?? [];
+        const mergedOnly = cached?.only ? (0, Entrypoint_helpers_1.mergeOnly)(cached.only, only) : [...only];
         if (cached?.evaluated) {
             cached.log('is already evaluated with', cached.evaluatedOnly);
         }
@@ -126,6 +127,17 @@ class Entrypoint extends BaseEntrypoint_1.BaseEntrypoint {
             return [isLoop ? 'loop' : 'created', cached.supersede(mergedOnly)];
         }
         const newEntrypoint = new Entrypoint(services, parent ? [parent] : [], loadedCode, name, mergedOnly, exports, evaluatedOnly, undefined, cached && 'resolveTasks' in cached ? cached.resolveTasks : undefined, cached && 'dependencies' in cached ? cached.dependencies : undefined, cached ? cached.generation + 1 : 1);
+        if (!newEntrypoint.ignored &&
+            !newEntrypoint.only.includes('*') &&
+            !newEntrypoint.only.includes('__wywPreval') &&
+            !newEntrypoint.only.includes('side-effect')) {
+            const { ast } = newEntrypoint.loadedAndParsed;
+            if (ast && (0, isStaticallyEvaluatableModule_1.isStaticallyEvaluatableModule)(ast)) {
+                newEntrypoint.log('[entrypoint] promote `only` to "*" for statically evaluatable module');
+                newEntrypoint.only.length = 0;
+                newEntrypoint.only.push('*');
+            }
+        }
         if (cached && !cached.evaluated) {
             cached.log('is cached, but with different code');
             cached.supersede(newEntrypoint);

package/types/transform/Entrypoint.types.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="debug" />
 import type { TransformOptions } from '@babel/core';
 import type { File } from '@babel/types';
 import type { Debugger, Evaluator } from '@wyw-in-js/shared';

package/types/transform/EvaluatedEntrypoint.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="debug" />
 import type { Debugger } from '@wyw-in-js/shared';
 import { BaseEntrypoint } from './BaseEntrypoint';
 import type { IEntrypointDependency } from './Entrypoint.types';

package/types/transform/actions/BaseAction.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="debug" />
 import '../../utils/dispose-polyfill';
 import type { Debugger } from '@wyw-in-js/shared';
 import type { Entrypoint } from '../Entrypoint';
@@ -19,6 +18,7 @@ export declare class BaseAction<TAction extends ActionQueueItem> implements GetB
     private activeScenario;
     private activeScenarioError?;
     private activeScenarioNextResults;
+    private handler;
     constructor(type: TAction['type'], services: Services, entrypoint: Entrypoint, data: TAction['data'], abortSignal: AbortSignal | null);
     get log(): Debugger;
     get ref(): string;

package/types/transform/actions/BaseAction.js

@@ -16,6 +16,7 @@ class BaseAction {
     activeScenario = null;
     activeScenarioError;
     activeScenarioNextResults = [];
+    handler = null;
     constructor(type, services, entrypoint, data, abortSignal) {
         this.type = type;
         this.services = services;
@@ -63,6 +64,10 @@ class BaseAction {
         };
     }
     run(handler) {
+        if (this.handler && this.handler !== handler) {
+            throw new Error(`action handler is already set`);
+        }
+        this.handler = handler;
         if (!this.activeScenario) {
             this.activeScenario = handler.call(this);
             this.activeScenarioNextResults = [];

package/types/transform/actions/actionRunner.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.syncActionRunner = exports.asyncActionRunner = void 0;
+exports.asyncActionRunner = asyncActionRunner;
+exports.syncActionRunner = syncActionRunner;
 const types_1 = require("../types");
 const AbortError_1 = require("./AbortError");
 function getHandler(action, actionHandlers) {
@@ -48,7 +49,6 @@ async function asyncActionRunner(action, actionHandlers, stack = [getActionRef(a
         }
     }
 }
-exports.asyncActionRunner = asyncActionRunner;
 function syncActionRunner(action, actionHandlers, stack = [getActionRef(action.type, action.entrypoint)]) {
     if (action.result !== types_1.Pending) {
         action.log('result is cached');
@@ -83,4 +83,3 @@ function syncActionRunner(action, actionHandlers, stack = [getActionRef(action.t
         }
     }
 }
-exports.syncActionRunner = syncActionRunner;

package/types/transform/generators/collect.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.collect = void 0;
+exports.collect = collect;
 const buildOptions_1 = require("../../options/buildOptions");
 const collector_1 = require("../../plugins/collector");
 const TransformMetadata_1 = require("../../utils/TransformMetadata");
@@ -54,4 +54,3 @@ function* collect() {
         metadata: transformMetadata ?? null,
     };
 }
-exports.collect = collect;

package/types/transform/generators/createStylisPreprocessor.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import * as path from 'path';
 import type { Middleware } from 'stylis';
 import type { Options } from '../../types';

package/types/transform/generators/createStylisPreprocessor.js

@@ -15,15 +15,29 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createStylisPreprocessor = exports.createKeyframeSuffixerPlugin = exports.createStylisUrlReplacePlugin = exports.stylisGlobalPlugin = exports.transformUrl = void 0;
+exports.stylisGlobalPlugin = void 0;
+exports.transformUrl = transformUrl;
+exports.createStylisUrlReplacePlugin = createStylisUrlReplacePlugin;
+exports.createKeyframeSuffixerPlugin = createKeyframeSuffixerPlugin;
+exports.createStylisPreprocessor = createStylisPreprocessor;
 /* eslint-disable no-continue */
 const path = __importStar(require("path"));
 const stylis_1 = require("stylis");
@@ -38,7 +52,6 @@ function transformUrl(url, outputFilename, sourceFilename, platformPath = path)
     }
     return relative.split(platformPath.sep).join(POSIX_SEP);
 }
-exports.transformUrl = transformUrl;
 const DEFINED_KEYFRAMES = Symbol('definedKeyframes');
 const ORIGINAL_KEYFRAME_NAME = Symbol('originalKeyframeName');
 const ORIGINAL_VALUE_KEY = Symbol('originalValue');
@@ -164,7 +177,6 @@ function createStylisUrlReplacePlugin(filename, outputFilename) {
         }
     };
 }
-exports.createStylisUrlReplacePlugin = createStylisUrlReplacePlugin;
 function createKeyframeSuffixerPlugin() {
     const prefixes = ['webkit', 'moz', 'ms', 'o', ''].map((i) => i ? `-${i}-` : '');
     const getPrefixedProp = (prop) => prefixes.map((prefix) => `${prefix}${prop}`);
@@ -268,19 +280,162 @@ function createKeyframeSuffixerPlugin() {
         }
     };
 }
-exports.createKeyframeSuffixerPlugin = createKeyframeSuffixerPlugin;
 const isMiddleware = (obj) => obj !== null;
+const displayKeywordRegexp = /^[a-z-]+$/;
+const knownMultiKeywordDisplayTokens = new Set([
+    'block',
+    'inline',
+    'flow',
+    'flow-root',
+    'flex',
+    'grid',
+    'table',
+    'list-item',
+]);
+function normalizeMultiKeywordDisplayValue(value) {
+    const trimmed = value.trim();
+    if (trimmed === '' || !/\s/.test(trimmed)) {
+        return null;
+    }
+    const importantRegexp = /!\s*important\s*$/i;
+    const hasImportant = importantRegexp.test(trimmed);
+    const withoutImportant = trimmed.replace(importantRegexp, '').trim();
+    const tokens = withoutImportant.split(/\s+/).filter(Boolean);
+    if (tokens.length < 2) {
+        return null;
+    }
+    const normalizedTokens = tokens.map((token) => token.toLowerCase());
+    if (!normalizedTokens.every((token) => displayKeywordRegexp.test(token))) {
+        return null;
+    }
+    const tokenSet = new Set(normalizedTokens);
+    const hasInline = tokenSet.has('inline');
+    const hasBlock = tokenSet.has('block');
+    if (hasInline && hasBlock) {
+        return null;
+    }
+    let outside = null;
+    if (hasInline) {
+        outside = 'inline';
+    }
+    else if (hasBlock) {
+        outside = 'block';
+    }
+    const insideCandidates = [
+        'flow-root',
+        'flow',
+        'flex',
+        'grid',
+        'table',
+    ].filter((candidate) => tokenSet.has(candidate));
+    if (insideCandidates.length > 1) {
+        return null;
+    }
+    const inside = insideCandidates[0] ?? null;
+    const hasListItem = tokenSet.has('list-item');
+    const canCanonicalize = normalizedTokens.every((token) => knownMultiKeywordDisplayTokens.has(token));
+    if (canCanonicalize) {
+        const canonicalOutside = outside ?? 'block';
+        const canonicalInside = inside ?? (hasListItem ? 'flow' : null);
+        if (canonicalInside) {
+            let canonical = null;
+            if (hasListItem) {
+                if (canonicalInside === 'flow' && canonicalOutside === 'block') {
+                    canonical = 'list-item';
+                }
+            }
+            else {
+                switch (canonicalInside) {
+                    case 'flex':
+                        canonical = canonicalOutside === 'inline' ? 'inline-flex' : 'flex';
+                        break;
+                    case 'grid':
+                        canonical = canonicalOutside === 'inline' ? 'inline-grid' : 'grid';
+                        break;
+                    case 'table':
+                        canonical =
+                            canonicalOutside === 'inline' ? 'inline-table' : 'table';
+                        break;
+                    case 'flow-root':
+                        canonical = canonicalOutside === 'block' ? 'flow-root' : null;
+                        break;
+                    case 'flow':
+                        canonical = canonicalOutside === 'inline' ? 'inline' : 'block';
+                        break;
+                    default:
+                        break;
+                }
+            }
+            if (canonical) {
+                return hasImportant ? `${canonical}!important` : canonical;
+            }
+        }
+    }
+    const innerDisplay = inside === 'flex' || inside === 'grid' ? inside : null;
+    if (innerDisplay &&
+        normalizedTokens[0] === innerDisplay &&
+        normalizedTokens.length > 1) {
+        const reordered = [
+            ...(outside ? [outside] : []),
+            ...normalizedTokens.filter((token) => token !== innerDisplay && token !== outside),
+            innerDisplay,
+        ].join(' ');
+        return hasImportant ? `${reordered}!important` : reordered;
+    }
+    return null;
+}
+function createStylisDisplayNormalizationPlugin() {
+    return (element) => {
+        if (!isDeclaration(element) || element.props !== 'display') {
+            return;
+        }
+        const normalized = normalizeMultiKeywordDisplayValue(element.children);
+        if (!normalized) {
+            return;
+        }
+        const decl = `display:${normalized};`;
+        Object.assign(element, {
+            children: normalized,
+            value: decl,
+        });
+    };
+}
+function createStylisStringifier(keepComments) {
+    if (!keepComments) {
+        return stylis_1.stringify;
+    }
+    const keepAllComments = keepComments === true;
+    const keepCommentsFilter = keepComments instanceof RegExp ? keepComments : null;
+    return (element, index, children, callback) => {
+        if (element.type === stylis_1.COMMENT) {
+            if (!keepAllComments && keepCommentsFilter) {
+                const commentValue = typeof element.children === 'string'
+                    ? element.children
+                    : element.value;
+                keepCommentsFilter.lastIndex = 0;
+                if (!keepCommentsFilter.test(commentValue)) {
+                    return '';
+                }
+            }
+            return element.value;
+        }
+        return (0, stylis_1.stringify)(element, index, children, callback);
+    };
+}
 function createStylisPreprocessor(options) {
+    const stringifier = createStylisStringifier(options.keepComments);
     function stylisPreprocess(selector, text) {
         const compiled = (0, stylis_1.compile)(`${selector} {${text}}\n`);
         return (0, stylis_1.serialize)(compiled, (0, stylis_1.middleware)([
             createStylisUrlReplacePlugin(options.filename, options.outputFilename),
             exports.stylisGlobalPlugin,
+            options.prefixer === false
+                ? null
+                : createStylisDisplayNormalizationPlugin(),
             options.prefixer === false ? null : stylis_1.prefixer,
             createKeyframeSuffixerPlugin(),
-            stylis_1.stringify,
+            stringifier,
         ].filter(isMiddleware)));
     }
     return stylisPreprocess;
 }
-exports.createStylisPreprocessor = createStylisPreprocessor;

package/types/transform/generators/evalFile.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.evalFile = void 0;
+exports.evalFile = evalFile;
 const evaluators_1 = __importDefault(require("../../evaluators"));
 const hasWywPreval_1 = __importDefault(require("../../utils/hasWywPreval"));
 const UnprocessedEntrypointError_1 = require("../actions/UnprocessedEntrypointError");
@@ -53,4 +53,3 @@ function* evalFile() {
     log(`<< evaluated __wywPreval %O`, valueCache);
     return [valueCache, evaluated.dependencies];
 }
-exports.evalFile = evalFile;

package/types/transform/generators/explodeReexports.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.explodeReexports = void 0;
+exports.explodeReexports = explodeReexports;
 const generator_1 = __importDefault(require("@babel/generator"));
 const getExports_1 = require("./getExports");
 const getWildcardReexport = (babel, ast) => {
@@ -42,26 +42,23 @@ function* explodeReexports() {
     const importedEntrypoints = (0, getExports_1.findExportsInImports)(this.entrypoint, resolvedImports);
     const replacements = new Map();
     for (const importedEntrypoint of importedEntrypoints) {
-        const exports = yield* this.getNext('getExports', importedEntrypoint.entrypoint, undefined);
-        const reexport = reexportsFrom.find((i) => i.source === importedEntrypoint.import);
-        if (reexport) {
-            replacements.set(reexport.node, exports.length
-                ? babel.types.exportNamedDeclaration(null, exports.map((i) => babel.types.exportSpecifier(babel.types.identifier(i), babel.types.identifier(i))), babel.types.stringLiteral(importedEntrypoint.import))
-                : null);
+        if (importedEntrypoint.entrypoint.loadedAndParsed.evaluator !== 'ignored') {
+            const reexport = reexportsFrom.find((i) => i.source === importedEntrypoint.import);
+            if (reexport) {
+                const exports = yield* this.getNext('getExports', importedEntrypoint.entrypoint, undefined);
+                if (exports.length !== 0) {
+                    replacements.set(reexport.node, babel.types.exportNamedDeclaration(null, exports.map((i) => babel.types.exportSpecifier(babel.types.identifier(i), babel.types.identifier(i))), babel.types.stringLiteral(importedEntrypoint.import)));
+                }
+            }
         }
     }
     // Replace wildcard reexport with named reexports
     babel.traverse(loadedAndParsed.ast, {
         ExportAllDeclaration(path) {
-            const replacement = replacements.get(path.node);
-            if (replacement) {
-                path.replaceWith(replacement);
-            }
-            else {
-                path.remove();
-            }
+            if (!replacements.has(path.node))
+                return;
+            path.replaceWith(replacements.get(path.node));
         },
     });
     loadedAndParsed.code = (0, generator_1.default)(loadedAndParsed.ast).code;
 }
-exports.explodeReexports = explodeReexports;

package/types/transform/generators/extract.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extract = void 0;
+exports.extract = extract;
 const source_map_1 = require("source-map");
 const createStylisPreprocessor_1 = require("./createStylisPreprocessor");
 function extractCssFromAst(rules, originalCode, options) {
@@ -87,4 +87,3 @@ function* extract() {
         replacements: allReplacements,
     };
 }
-exports.extract = extract;