@plumeria/turbopack-loader 18.5.2 → 18.5.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/dist/index.js +13 -54
  2. package/package.json +3 -3
package/dist/index.js CHANGED
@@ -241,8 +241,7 @@ async function loader(source) {
241
241
  isVisibleReference(node) &&
242
242
  ((localCreateStyles[rootId] !== undefined &&
243
243
  localCreateStyles[rootId].type !== 'constant') ||
244
- mergedCreateTable[rootId] !== undefined ||
245
- mergedVariantsTable[rootId] !== undefined);
244
+ mergedCreateTable[rootId] !== undefined);
246
245
  if (!isPlumeriaStyle) {
247
246
  const origin = rootId ? localImports[rootId] : undefined;
248
247
  const failure = origin
@@ -370,7 +369,6 @@ async function loader(source) {
370
369
  const viewTransitionImportMap = {};
371
370
  const createImportMap = {};
372
371
  const createFunctionImportMap = {};
373
- const variantsImportMap = {};
374
372
  const createThemeImportMap = {};
375
373
  const createStaticImportMap = {};
376
374
  const plumeriaAliases = {};
@@ -437,10 +435,6 @@ async function loader(source) {
437
435
  if (scannedTables.createFunctionTable[uniqueKey]) {
438
436
  createFunctionImportMap[localName] = (0, utils_1.styleFunctionsOf)(scannedTables.createFunctionTable[uniqueKey]);
439
437
  }
440
- if (scannedTables.variantsHashTable[uniqueKey]) {
441
- variantsImportMap[localName] =
442
- scannedTables.variantsHashTable[uniqueKey];
443
- }
444
438
  if (scannedTables.createThemeHashTable[uniqueKey]) {
445
439
  createThemeImportMap[localName] =
446
440
  scannedTables.createThemeHashTable[uniqueKey];
@@ -499,17 +493,6 @@ async function loader(source) {
499
493
  for (const key of Object.keys(createImportMap)) {
500
494
  mergedCreateTable[key] = createImportMap[key];
501
495
  }
502
- const mergedVariantsTable = {};
503
- for (const key of Object.keys(scannedTables.variantsHashTable)) {
504
- mergedVariantsTable[key] = scannedTables.variantsHashTable[key];
505
- if (key.startsWith(`${resourcePath}-`)) {
506
- const varName = key.slice(resourcePath.length + 1);
507
- mergedVariantsTable[varName] = scannedTables.variantsHashTable[key];
508
- }
509
- }
510
- for (const key of Object.keys(variantsImportMap)) {
511
- mergedVariantsTable[key] = variantsImportMap[key];
512
- }
513
496
  const mergedCreateThemeHashTable = {};
514
497
  for (const key of Object.keys(scannedTables.createThemeHashTable)) {
515
498
  mergedCreateThemeHashTable[key] = scannedTables.createThemeHashTable[key];
@@ -543,7 +526,6 @@ async function loader(source) {
543
526
  createHashTable: mergedCreateTable,
544
527
  createStaticHashTable: mergedCreateStaticHashTable,
545
528
  createStaticObjectTable: scannedTables.createStaticObjectTable,
546
- variantsHashTable: mergedVariantsTable,
547
529
  };
548
530
  const localCreateStyles = {};
549
531
  const localStyleAliases = {};
@@ -666,7 +648,7 @@ async function loader(source) {
666
648
  }
667
649
  if (propName === 'create' &&
668
650
  utils_1.t.isObjectExpression(init.arguments[0].expression)) {
669
- const obj = (0, utils_1.objectExpressionToObject)(init.arguments[0].expression, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedCreateThemeHashTable, scannedTables.createThemeObjectTable, mergedCreateTable, mergedCreateStaticHashTable, scannedTables.createStaticObjectTable, mergedVariantsTable);
651
+ const obj = (0, utils_1.objectExpressionToObject)(init.arguments[0].expression, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedCreateThemeHashTable, scannedTables.createThemeObjectTable, mergedCreateTable, mergedCreateStaticHashTable, scannedTables.createStaticObjectTable);
670
652
  if (obj) {
671
653
  const hashMap = {};
672
654
  Object.entries(obj).forEach(([key, style]) => {
@@ -716,7 +698,7 @@ async function loader(source) {
716
698
  if (selector.startsWith('@') && !(0, zss_engine_1.isAtRule)(selector)) {
717
699
  throwCompilationError(`Plumeria: Unsupported at-rule: "${selector}". createTheme only supports nesting at-rules such as @media, @container, @supports, @layer, and @scope.`, selectorExpr);
718
700
  }
719
- const obj = (0, utils_1.objectExpressionToObject)(init.arguments[1].expression, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedCreateThemeHashTable, scannedTables.createThemeObjectTable, mergedCreateTable, mergedCreateStaticHashTable, scannedTables.createStaticObjectTable, mergedVariantsTable);
701
+ const obj = (0, utils_1.objectExpressionToObject)(init.arguments[1].expression, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedCreateThemeHashTable, scannedTables.createThemeObjectTable, mergedCreateTable, mergedCreateStaticHashTable, scannedTables.createStaticObjectTable);
720
702
  const hash = (0, utils_1.themeHashOf)(selector, obj);
721
703
  if (utils_1.t.isIdentifier(node.id)) {
722
704
  const uniqueKey = `${resourcePath}-${node.id.value}`;
@@ -754,7 +736,7 @@ async function loader(source) {
754
736
  if (utils_1.t.isIdentifier(node.id)) {
755
737
  idSpans.add(node.id.span.start);
756
738
  }
757
- const obj = (0, utils_1.objectExpressionToObject)(init.arguments[0].expression, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedCreateThemeHashTable, scannedTables.createThemeObjectTable, mergedCreateTable, mergedCreateStaticHashTable, scannedTables.createStaticObjectTable, mergedVariantsTable);
739
+ const obj = (0, utils_1.objectExpressionToObject)(init.arguments[0].expression, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedCreateThemeHashTable, scannedTables.createThemeObjectTable, mergedCreateTable, mergedCreateStaticHashTable, scannedTables.createStaticObjectTable);
758
740
  const hash = (0, zss_engine_1.genBase36Hash)(obj, 1, 8);
759
741
  if (utils_1.t.isIdentifier(node.id)) {
760
742
  const uniqueKey = `${resourcePath}-${node.id.value}`;
@@ -869,7 +851,7 @@ async function loader(source) {
869
851
  if (propName === 'keyframes' && args.length > 0) {
870
852
  const expr = args[0].expression;
871
853
  if (utils_1.t.isObjectExpression(expr)) {
872
- const obj = (0, utils_1.objectExpressionToObject)(expr, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedCreateThemeHashTable, scannedTables.createThemeObjectTable, mergedCreateTable, mergedCreateStaticHashTable, scannedTables.createStaticObjectTable, mergedVariantsTable);
854
+ const obj = (0, utils_1.objectExpressionToObject)(expr, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedCreateThemeHashTable, scannedTables.createThemeObjectTable, mergedCreateTable, mergedCreateStaticHashTable, scannedTables.createStaticObjectTable);
873
855
  const hash = (0, zss_engine_1.genBase36Hash)(obj, 1, 8);
874
856
  scannedTables.keyframesObjectTable[hash] = obj;
875
857
  replacements.push({
@@ -882,7 +864,7 @@ async function loader(source) {
882
864
  else if (propName === 'viewTransition' &&
883
865
  args.length > 0 &&
884
866
  utils_1.t.isObjectExpression(args[0].expression)) {
885
- const obj = (0, utils_1.objectExpressionToObject)(args[0].expression, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedCreateThemeHashTable, scannedTables.createThemeObjectTable, mergedCreateTable, mergedCreateStaticHashTable, scannedTables.createStaticObjectTable, mergedVariantsTable);
867
+ const obj = (0, utils_1.objectExpressionToObject)(args[0].expression, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedCreateThemeHashTable, scannedTables.createThemeObjectTable, mergedCreateTable, mergedCreateStaticHashTable, scannedTables.createStaticObjectTable);
886
868
  const hash = (0, zss_engine_1.genBase36Hash)(obj, 1, 8);
887
869
  scannedTables.viewTransitionObjectTable[hash] = obj;
888
870
  replacements.push({
@@ -903,7 +885,7 @@ async function loader(source) {
903
885
  if (selector.startsWith('@') && !(0, zss_engine_1.isAtRule)(selector)) {
904
886
  throwCompilationError(`Plumeria: Unsupported at-rule: "${selector}". createTheme only supports nesting at-rules such as @media, @container, @supports, @layer, and @scope.`, selectorExpr);
905
887
  }
906
- const obj = (0, utils_1.objectExpressionToObject)(args[1].expression, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedCreateThemeHashTable, scannedTables.createThemeObjectTable, mergedCreateTable, mergedCreateStaticHashTable, scannedTables.createStaticObjectTable, mergedVariantsTable);
888
+ const obj = (0, utils_1.objectExpressionToObject)(args[1].expression, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedCreateThemeHashTable, scannedTables.createThemeObjectTable, mergedCreateTable, mergedCreateStaticHashTable, scannedTables.createStaticObjectTable);
907
889
  const hash = (0, utils_1.themeHashOf)(selector, obj);
908
890
  scannedTables.createThemeObjectTable[hash] = obj;
909
891
  if (scannedTables.createThemeSelectorTable) {
@@ -913,14 +895,14 @@ async function loader(source) {
913
895
  else if (propName === 'createStatic' &&
914
896
  args.length > 0 &&
915
897
  utils_1.t.isObjectExpression(args[0].expression)) {
916
- const obj = (0, utils_1.objectExpressionToObject)(args[0].expression, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedCreateThemeHashTable, scannedTables.createThemeObjectTable, mergedCreateTable, mergedCreateStaticHashTable, scannedTables.createStaticObjectTable, mergedVariantsTable);
898
+ const obj = (0, utils_1.objectExpressionToObject)(args[0].expression, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedCreateThemeHashTable, scannedTables.createThemeObjectTable, mergedCreateTable, mergedCreateStaticHashTable, scannedTables.createStaticObjectTable);
917
899
  const hash = (0, zss_engine_1.genBase36Hash)(obj, 1, 8);
918
900
  scannedTables.createStaticObjectTable[hash] = obj;
919
901
  }
920
902
  else if (propName === 'create' &&
921
903
  args.length > 0 &&
922
904
  utils_1.t.isObjectExpression(args[0].expression)) {
923
- const obj = (0, utils_1.objectExpressionToObject)(args[0].expression, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedCreateThemeHashTable, scannedTables.createThemeObjectTable, mergedCreateTable, mergedCreateStaticHashTable, scannedTables.createStaticObjectTable, mergedVariantsTable);
905
+ const obj = (0, utils_1.objectExpressionToObject)(args[0].expression, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedCreateThemeHashTable, scannedTables.createThemeObjectTable, mergedCreateTable, mergedCreateStaticHashTable, scannedTables.createStaticObjectTable);
924
906
  const hash = (0, zss_engine_1.genBase36Hash)(obj, 1, 8);
925
907
  scannedTables.createObjectTable[hash] = obj;
926
908
  }
@@ -1007,7 +989,7 @@ async function loader(source) {
1007
989
  return merged;
1008
990
  }
1009
991
  if (utils_1.t.isObjectExpression(expr)) {
1010
- return (0, utils_1.objectExpressionToObject)(expr, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedCreateThemeHashTable, scannedTables.createThemeObjectTable, mergedCreateTable, mergedCreateStaticHashTable, scannedTables.createStaticObjectTable, mergedVariantsTable);
992
+ return (0, utils_1.objectExpressionToObject)(expr, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedCreateThemeHashTable, scannedTables.createThemeObjectTable, mergedCreateTable, mergedCreateStaticHashTable, scannedTables.createStaticObjectTable);
1011
993
  }
1012
994
  else if (utils_1.t.isMemberExpression(expr) &&
1013
995
  utils_1.t.isIdentifier(expr.object) &&
@@ -1050,9 +1032,6 @@ async function loader(source) {
1050
1032
  const styleInfo = localCreateStyles[varName];
1051
1033
  if (styleInfo?.obj)
1052
1034
  return styleInfo.obj;
1053
- const vHash = mergedVariantsTable[varName];
1054
- if (vHash)
1055
- return scannedTables.variantsObjectTable[vHash];
1056
1035
  }
1057
1036
  return null;
1058
1037
  };
@@ -1109,7 +1088,7 @@ async function loader(source) {
1109
1088
  properties: argExpr.properties.filter((prop) => prop.type === 'Identifier' ||
1110
1089
  (prop.type === 'KeyValueProperty' &&
1111
1090
  isStaticArgValue(prop.value))),
1112
- }, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedCreateThemeHashTable, scannedTables.createThemeObjectTable, mergedCreateTable, mergedCreateStaticHashTable, scannedTables.createStaticObjectTable, mergedVariantsTable);
1091
+ }, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedCreateThemeHashTable, scannedTables.createThemeObjectTable, mergedCreateTable, mergedCreateStaticHashTable, scannedTables.createStaticObjectTable);
1113
1092
  if (func.named) {
1114
1093
  const argExpr = callArgs[0]?.expression;
1115
1094
  if (callArgs.length > 1 ||
@@ -1524,18 +1503,8 @@ async function loader(source) {
1524
1503
  continue;
1525
1504
  if (utils_1.t.isCallExpression(expr) && utils_1.t.isIdentifier(expr.callee)) {
1526
1505
  const varName = expr.callee.value;
1527
- const uniqueKey = `${resourcePath}-${varName}`;
1528
1506
  let variantObj;
1529
- let hash = scannedTables.variantsHashTable[uniqueKey];
1530
- if (!hash)
1531
- hash = mergedVariantsTable[varName];
1532
- if (hash && scannedTables.variantsObjectTable[hash])
1533
- variantObj = scannedTables.variantsObjectTable[hash];
1534
- if (!isVisibleReference(expr))
1535
- variantObj = undefined;
1536
- if (isVisibleReference(expr) &&
1537
- !variantObj &&
1538
- localCreateStyles[varName]?.obj)
1507
+ if (isVisibleReference(expr) && localCreateStyles[varName]?.obj)
1539
1508
  variantObj = localCreateStyles[varName].obj;
1540
1509
  if (variantObj) {
1541
1510
  const callArgs = expr.arguments;
@@ -1639,18 +1608,8 @@ async function loader(source) {
1639
1608
  }
1640
1609
  else if (utils_1.t.isIdentifier(expr)) {
1641
1610
  const varName = expr.value;
1642
- const uniqueKey = `${resourcePath}-${varName}`;
1643
1611
  let variantObj;
1644
- let hash = scannedTables.variantsHashTable[uniqueKey];
1645
- if (!hash)
1646
- hash = mergedVariantsTable[varName];
1647
- if (hash && scannedTables.variantsObjectTable[hash])
1648
- variantObj = scannedTables.variantsObjectTable[hash];
1649
- if (!isVisibleReference(expr))
1650
- variantObj = undefined;
1651
- if (isVisibleReference(expr) &&
1652
- !variantObj &&
1653
- localCreateStyles[varName]?.obj)
1612
+ if (isVisibleReference(expr) && localCreateStyles[varName]?.obj)
1654
1613
  variantObj = localCreateStyles[varName].obj;
1655
1614
  if (variantObj) {
1656
1615
  Object.entries(variantObj).forEach(([groupName, groupVariants]) => {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@plumeria/turbopack-loader",
3
- "version": "18.5.2",
3
+ "version": "18.5.3",
4
4
  "description": "Plumeria Turbopack-loader",
5
5
  "author": "Refirst 11",
6
6
  "license": "MIT",
@@ -29,8 +29,8 @@
29
29
  "zero-virtual.css"
30
30
  ],
31
31
  "dependencies": {
32
- "@plumeria/compiler": "^18.5.2",
33
- "@plumeria/utils": "^18.5.2"
32
+ "@plumeria/compiler": "^18.5.3",
33
+ "@plumeria/utils": "^18.5.3"
34
34
  },
35
35
  "devDependencies": {
36
36
  "@swc/core": "1.15.47",