Skip to content

Commit 05d6a90

Browse files
committed
chore: upgarde tw 3.3.2 and add test case
1 parent 03dedc1 commit 05d6a90

File tree

27 files changed

+1159
-386
lines changed

27 files changed

+1159
-386
lines changed

.eslintignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
packages/unplugin-tailwindcss-mangle/test/fixtures/**/*
1+
packages/unplugin-tailwindcss-mangle/test/fixtures/**/*
2+
packages/tailwindcss-patch/test/fixtures/**/*

apps/next-app/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@
1010
"prepare": "tw-patch"
1111
},
1212
"dependencies": {
13-
"@types/node": "18.16.0",
13+
"@types/node": "18.16.1",
1414
"@types/react": "18.2.0",
15-
"@types/react-dom": "18.2.0",
15+
"@types/react-dom": "18.2.1",
1616
"autoprefixer": "10.4.14",
1717
"eslint": "8.39.0",
1818
"eslint-config-next": "13.3.1",
1919
"next": "13.3.1",
2020
"postcss": "8.4.23",
2121
"react": "18.2.0",
2222
"react-dom": "18.2.0",
23-
"tailwindcss": "3.3.1",
23+
"tailwindcss": "3.3.2",
2424
"typescript": "5.0.4"
2525
},
2626
"devDependencies": {

apps/remix-app/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
"@remix-run/dev": "^1.15.0",
2121
"@remix-run/eslint-config": "^1.15.0",
2222
"@types/react": "^18.2.0",
23-
"@types/react-dom": "^18.2.0",
23+
"@types/react-dom": "^18.2.1",
2424
"eslint": "^8.39.0",
25-
"tailwindcss": "^3.3.1",
25+
"tailwindcss": "^3.3.2",
2626
"tailwindcss-patch": "workspace:*",
2727
"typescript": "^5.0.4",
2828
"unplugin-tailwindcss-mangle": "workspace:*"

apps/solid-app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"devDependencies": {
1515
"autoprefixer": "^10.4.14",
1616
"postcss": "^8.4.23",
17-
"tailwindcss": "^3.3.1",
17+
"tailwindcss": "^3.3.2",
1818
"tailwindcss-patch": "workspace:*",
1919
"typescript": "^5.0.4",
2020
"unplugin-tailwindcss-mangle": "workspace:*",

apps/vite-lit/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
"prepare": "tw-patch"
1919
},
2020
"dependencies": {
21-
"lit": "^2.6.1"
21+
"lit": "^2.7.3"
2222
},
2323
"devDependencies": {
2424
"autoprefixer": "^10.4.14",
2525
"postcss": "^8.4.23",
26-
"tailwindcss": "^3.3.1",
26+
"tailwindcss": "^3.3.2",
2727
"tailwindcss-patch": "workspace:*",
2828
"typescript": "^5.0.4",
2929
"unplugin-tailwindcss-mangle": "workspace:*",

apps/vite-react/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
},
1616
"devDependencies": {
1717
"@types/react": "^18.2.0",
18-
"@types/react-dom": "^18.2.0",
18+
"@types/react-dom": "^18.2.1",
1919
"@vitejs/plugin-react": "^4.0.0",
2020
"autoprefixer": "^10.4.14",
2121
"postcss": "^8.4.23",
22-
"tailwindcss": "^3.3.1",
22+
"tailwindcss": "^3.3.2",
2323
"tailwindcss-patch": "workspace:*",
2424
"typescript": "^5.0.4",
2525
"unplugin-tailwindcss-mangle": "workspace:*",

apps/vite-svelte/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
"check": "svelte-check --tsconfig ./tsconfig.json"
1111
},
1212
"devDependencies": {
13-
"@sveltejs/vite-plugin-svelte": "^2.1.0",
13+
"@sveltejs/vite-plugin-svelte": "^2.1.1",
1414
"@tsconfig/svelte": "^4.0.1",
1515
"autoprefixer": "^10.4.14",
1616
"postcss": "^8.4.23",
1717
"svelte": "^3.55.1",
1818
"svelte-check": "^3.2.0",
19-
"tailwindcss": "^3.3.1",
19+
"tailwindcss": "^3.3.2",
2020
"tailwindcss-patch": "workspace:*",
2121
"tslib": "^2.5.0",
2222
"typescript": "^5.0.4",

apps/vite-vanilla/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"devDependencies": {
1313
"autoprefixer": "^10.4.14",
1414
"postcss": "^8.4.23",
15-
"tailwindcss": "^3.3.1",
15+
"tailwindcss": "^3.3.2",
1616
"tailwindcss-patch": "workspace:*",
1717
"typescript": "^5.0.4",
1818
"unplugin-tailwindcss-mangle": "workspace:*",

apps/vite-vue/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
"vue": "^3.2.47"
1414
},
1515
"devDependencies": {
16-
"@vitejs/plugin-vue": "^4.2.0",
16+
"@vitejs/plugin-vue": "^4.2.1",
1717
"autoprefixer": "^10.4.14",
1818
"postcss": "^8.4.23",
19-
"tailwindcss": "^3.3.1",
19+
"tailwindcss": "^3.3.2",
2020
"tailwindcss-patch": "workspace:*",
2121
"typescript": "^5.0.4",
2222
"unplugin-tailwindcss-mangle": "workspace:*",

apps/webpack5-vue3/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
"eslint-plugin-promise": "^6.1.1",
3232
"eslint-plugin-vue": "^9.11.0",
3333
"postcss": "^8.4.23",
34-
"sass": "^1.32.7",
34+
"sass": "^1.62.1",
3535
"sass-loader": "^13.2.2",
36-
"tailwindcss": "^3.3.1",
36+
"tailwindcss": "^3.3.2",
3737
"tailwindcss-patch": "workspace:*",
3838
"typescript": "~5.0.4",
3939
"unplugin-tailwindcss-mangle": "workspace:*"

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"@icebreakers/tsconfig": "^0.0.6",
2323
"@tsconfig/recommended": "^1.0.2",
2424
"@types/jest": "^29.5.1",
25-
"@types/node": "^18.16.0",
25+
"@types/node": "^18.16.1",
2626
"cross-env": "^7.0.3",
2727
"eslint": "^8.39.0",
2828
"jest": "^29.5.0",

packages/tailwindcss-patch/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@
3535
},
3636
"devDependencies": {
3737
"@types/babel__generator": "^7.6.4",
38-
"@types/babel__traverse": "^7.18.3",
38+
"@types/babel__traverse": "^7.18.4",
3939
"@types/resolve": "^1.20.2",
4040
"@types/semver": "^7.3.13",
4141
"defu": "^6.1.2",
4242
"pkg-types": "^1.0.2",
4343
"postcss": "^8.4.23",
44-
"tailwindcss": "^3.3.1"
44+
"tailwindcss": "^3.3.2"
4545
},
4646
"dependencies": {
4747
"@babel/generator": "^7.21.4",

packages/tailwindcss-patch/test/__snapshots__/index.test.ts.snap

Lines changed: 184 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ exports[`versions-patch patch tailwindcss 1`] = `
77
Object.defineProperty(exports, "__esModule", {
88
value: true
99
});
10-
const _setupTrackingContext = /*#__PURE__*/_interopRequireDefault(require("./lib/setupTrackingContext"));
11-
const _processTailwindFeatures = /*#__PURE__*/_interopRequireDefault(require("./processTailwindFeatures"));
10+
const _setupTrackingContext = /*#__PURE__*/_interop_require_default(require("./lib/setupTrackingContext"));
11+
const _processTailwindFeatures = /*#__PURE__*/_interop_require_default(require("./processTailwindFeatures"));
1212
const _sharedState = require("./lib/sharedState");
1313
const _findAtConfigPath = require("./lib/findAtConfigPath");
14-
function _interopRequireDefault(obj) {
14+
function _interop_require_default(obj) {
1515
return obj && obj.__esModule ? obj : {
1616
default: obj
1717
};
@@ -35,15 +35,15 @@ module.exports = function tailwindcss(configOrPath) {
3535
let context = (0, _setupTrackingContext.default)(configOrPath);
3636
if (root.type === "document") {
3737
let roots = root.nodes.filter(node => node.type === "root");
38-
for (const root1 of roots) {
39-
if (root1.type === "root") {
40-
contextRef.value.push((0, _processTailwindFeatures.default)(context)(root1, result));
38+
for (const root of roots) {
39+
if (root.type === "root") {
40+
contextRef.value.push((0, _processTailwindFeatures.default)(context)(root, result));
4141
}
4242
}
4343
return;
4444
}
4545
contextRef.value.push((0, _processTailwindFeatures.default)(context)(root, result));
46-
}, _sharedState.env.OXIDE && function lightningCssPlugin(_root, result) {
46+
}, false && function lightningCssPlugin(_root, result) {
4747
let postcss = require("postcss");
4848
let lightningcss = require("lightningcss");
4949
let browserslist = require("browserslist");
@@ -98,21 +98,23 @@ Object.defineProperty(exports, "__esModule", {
9898
});
9999
Object.defineProperty(exports, "default", {
100100
enumerable: true,
101-
get: () => processTailwindFeatures
101+
get: function () {
102+
return processTailwindFeatures;
103+
}
102104
});
103-
const _normalizeTailwindDirectives = /*#__PURE__*/_interopRequireDefault(require("./lib/normalizeTailwindDirectives"));
104-
const _expandTailwindAtRules = /*#__PURE__*/_interopRequireDefault(require("./lib/expandTailwindAtRules"));
105-
const _expandApplyAtRules = /*#__PURE__*/_interopRequireDefault(require("./lib/expandApplyAtRules"));
106-
const _evaluateTailwindFunctions = /*#__PURE__*/_interopRequireDefault(require("./lib/evaluateTailwindFunctions"));
107-
const _substituteScreenAtRules = /*#__PURE__*/_interopRequireDefault(require("./lib/substituteScreenAtRules"));
108-
const _resolveDefaultsAtRules = /*#__PURE__*/_interopRequireDefault(require("./lib/resolveDefaultsAtRules"));
109-
const _collapseAdjacentRules = /*#__PURE__*/_interopRequireDefault(require("./lib/collapseAdjacentRules"));
110-
const _collapseDuplicateDeclarations = /*#__PURE__*/_interopRequireDefault(require("./lib/collapseDuplicateDeclarations"));
111-
const _partitionApplyAtRules = /*#__PURE__*/_interopRequireDefault(require("./lib/partitionApplyAtRules"));
112-
const _detectNesting = /*#__PURE__*/_interopRequireDefault(require("./lib/detectNesting"));
105+
const _normalizeTailwindDirectives = /*#__PURE__*/_interop_require_default(require("./lib/normalizeTailwindDirectives"));
106+
const _expandTailwindAtRules = /*#__PURE__*/_interop_require_default(require("./lib/expandTailwindAtRules"));
107+
const _expandApplyAtRules = /*#__PURE__*/_interop_require_default(require("./lib/expandApplyAtRules"));
108+
const _evaluateTailwindFunctions = /*#__PURE__*/_interop_require_default(require("./lib/evaluateTailwindFunctions"));
109+
const _substituteScreenAtRules = /*#__PURE__*/_interop_require_default(require("./lib/substituteScreenAtRules"));
110+
const _resolveDefaultsAtRules = /*#__PURE__*/_interop_require_default(require("./lib/resolveDefaultsAtRules"));
111+
const _collapseAdjacentRules = /*#__PURE__*/_interop_require_default(require("./lib/collapseAdjacentRules"));
112+
const _collapseDuplicateDeclarations = /*#__PURE__*/_interop_require_default(require("./lib/collapseDuplicateDeclarations"));
113+
const _partitionApplyAtRules = /*#__PURE__*/_interop_require_default(require("./lib/partitionApplyAtRules"));
114+
const _detectNesting = /*#__PURE__*/_interop_require_default(require("./lib/detectNesting"));
113115
const _setupContextUtils = require("./lib/setupContextUtils");
114116
const _featureFlags = require("./featureFlags");
115-
function _interopRequireDefault(obj) {
117+
function _interop_require_default(obj) {
116118
return obj && obj.__esModule ? obj : {
117119
default: obj
118120
};
@@ -1384,3 +1386,166 @@ function processTailwindFeatures(setupContext) {
13841386
}",
13851387
}
13861388
`;
1389+
1390+
exports[`versions-patch patch tailwindcss3.3.2 1`] = `
1391+
{
1392+
"plugin": ""use strict";
1393+
1394+
Object.defineProperty(exports, "__esModule", {
1395+
value: true
1396+
});
1397+
const _setupTrackingContext = /*#__PURE__*/_interop_require_default(require("./lib/setupTrackingContext"));
1398+
const _processTailwindFeatures = /*#__PURE__*/_interop_require_default(require("./processTailwindFeatures"));
1399+
const _sharedState = require("./lib/sharedState");
1400+
const _findAtConfigPath = require("./lib/findAtConfigPath");
1401+
function _interop_require_default(obj) {
1402+
return obj && obj.__esModule ? obj : {
1403+
default: obj
1404+
};
1405+
}
1406+
const contextRef = {
1407+
value: []
1408+
};
1409+
module.exports = function tailwindcss(configOrPath) {
1410+
return {
1411+
postcssPlugin: "tailwindcss",
1412+
plugins: [_sharedState.env.DEBUG && function (root) {
1413+
console.log("\\n");
1414+
console.time("JIT TOTAL");
1415+
return root;
1416+
}, function (root, result) {
1417+
contextRef.value.length = 0;
1418+
var _findAtConfigPath1;
1419+
// Use the path for the \`@config\` directive if it exists, otherwise use the
1420+
// path for the file being processed
1421+
configOrPath = (_findAtConfigPath1 = (0, _findAtConfigPath.findAtConfigPath)(root, result)) !== null && _findAtConfigPath1 !== void 0 ? _findAtConfigPath1 : configOrPath;
1422+
let context = (0, _setupTrackingContext.default)(configOrPath);
1423+
if (root.type === "document") {
1424+
let roots = root.nodes.filter(node => node.type === "root");
1425+
for (const root of roots) {
1426+
if (root.type === "root") {
1427+
contextRef.value.push((0, _processTailwindFeatures.default)(context)(root, result));
1428+
}
1429+
}
1430+
return;
1431+
}
1432+
contextRef.value.push((0, _processTailwindFeatures.default)(context)(root, result));
1433+
}, false && function lightningCssPlugin(_root, result) {
1434+
let postcss = require("postcss");
1435+
let lightningcss = require("lightningcss");
1436+
let browserslist = require("browserslist");
1437+
try {
1438+
let transformed = lightningcss.transform({
1439+
filename: result.opts.from,
1440+
code: Buffer.from(result.root.toString()),
1441+
minify: false,
1442+
sourceMap: !!result.map,
1443+
inputSourceMap: result.map ? result.map.toString() : undefined,
1444+
targets: typeof process !== "undefined" && process.env.JEST_WORKER_ID ? {
1445+
chrome: 106 << 16
1446+
} : lightningcss.browserslistToTargets(browserslist(require("../package.json").browserslist)),
1447+
drafts: {
1448+
nesting: true,
1449+
customMedia: true
1450+
}
1451+
});
1452+
var _result_map;
1453+
result.map = Object.assign((_result_map = result.map) !== null && _result_map !== void 0 ? _result_map : {}, {
1454+
toJSON() {
1455+
return transformed.map.toJSON();
1456+
},
1457+
toString() {
1458+
return transformed.map.toString();
1459+
}
1460+
});
1461+
result.root = postcss.parse(transformed.code.toString("utf8"));
1462+
} catch (err) {
1463+
if (typeof process !== "undefined" && process.env.JEST_WORKER_ID) {
1464+
let lines = err.source.split("\\n");
1465+
err = new Error(["Error formatting using Lightning CSS:", "", ...["\`\`\`css", ...lines.slice(Math.max(err.loc.line - 3, 0), err.loc.line), " ".repeat(err.loc.column - 1) + "^-- " + err.toString(), ...lines.slice(err.loc.line, err.loc.line + 2), "\`\`\`"]].join("\\n"));
1466+
}
1467+
if (Error.captureStackTrace) {
1468+
Error.captureStackTrace(err, lightningCssPlugin);
1469+
}
1470+
throw err;
1471+
}
1472+
}, _sharedState.env.DEBUG && function (root) {
1473+
console.timeEnd("JIT TOTAL");
1474+
console.log("\\n");
1475+
return root;
1476+
}].filter(Boolean)
1477+
};
1478+
};
1479+
module.exports.postcss = true;
1480+
module.exports.contextRef = contextRef;",
1481+
"processTailwindFeatures": ""use strict";
1482+
1483+
Object.defineProperty(exports, "__esModule", {
1484+
value: true
1485+
});
1486+
Object.defineProperty(exports, "default", {
1487+
enumerable: true,
1488+
get: function () {
1489+
return processTailwindFeatures;
1490+
}
1491+
});
1492+
const _normalizeTailwindDirectives = /*#__PURE__*/_interop_require_default(require("./lib/normalizeTailwindDirectives"));
1493+
const _expandTailwindAtRules = /*#__PURE__*/_interop_require_default(require("./lib/expandTailwindAtRules"));
1494+
const _expandApplyAtRules = /*#__PURE__*/_interop_require_default(require("./lib/expandApplyAtRules"));
1495+
const _evaluateTailwindFunctions = /*#__PURE__*/_interop_require_default(require("./lib/evaluateTailwindFunctions"));
1496+
const _substituteScreenAtRules = /*#__PURE__*/_interop_require_default(require("./lib/substituteScreenAtRules"));
1497+
const _resolveDefaultsAtRules = /*#__PURE__*/_interop_require_default(require("./lib/resolveDefaultsAtRules"));
1498+
const _collapseAdjacentRules = /*#__PURE__*/_interop_require_default(require("./lib/collapseAdjacentRules"));
1499+
const _collapseDuplicateDeclarations = /*#__PURE__*/_interop_require_default(require("./lib/collapseDuplicateDeclarations"));
1500+
const _partitionApplyAtRules = /*#__PURE__*/_interop_require_default(require("./lib/partitionApplyAtRules"));
1501+
const _detectNesting = /*#__PURE__*/_interop_require_default(require("./lib/detectNesting"));
1502+
const _setupContextUtils = require("./lib/setupContextUtils");
1503+
const _featureFlags = require("./featureFlags");
1504+
function _interop_require_default(obj) {
1505+
return obj && obj.__esModule ? obj : {
1506+
default: obj
1507+
};
1508+
}
1509+
function processTailwindFeatures(setupContext) {
1510+
return function (root, result) {
1511+
let {
1512+
tailwindDirectives,
1513+
applyDirectives
1514+
} = (0, _normalizeTailwindDirectives.default)(root);
1515+
(0, _detectNesting.default)()(root, result);
1516+
// Partition apply rules that are found in the css
1517+
// itself.
1518+
(0, _partitionApplyAtRules.default)()(root, result);
1519+
let context = setupContext({
1520+
tailwindDirectives,
1521+
applyDirectives,
1522+
registerDependency(dependency) {
1523+
result.messages.push({
1524+
plugin: "tailwindcss",
1525+
parent: result.opts.from,
1526+
...dependency
1527+
});
1528+
},
1529+
createContext(tailwindConfig, changedContent) {
1530+
return (0, _setupContextUtils.createContext)(tailwindConfig, changedContent, root);
1531+
}
1532+
})(root, result);
1533+
if (context.tailwindConfig.separator === "-") {
1534+
throw new Error("The '-' character cannot be used as a custom separator in JIT mode due to parsing ambiguity. Please use another character like '_' instead.");
1535+
}
1536+
(0, _featureFlags.issueFlagNotices)(context.tailwindConfig);
1537+
(0, _expandTailwindAtRules.default)(context)(root, result);
1538+
// Partition apply rules that are generated by
1539+
// addComponents, addUtilities and so on.
1540+
(0, _partitionApplyAtRules.default)()(root, result);
1541+
(0, _expandApplyAtRules.default)(context)(root, result);
1542+
(0, _evaluateTailwindFunctions.default)(context)(root, result);
1543+
(0, _substituteScreenAtRules.default)(context)(root, result);
1544+
(0, _resolveDefaultsAtRules.default)(context)(root, result);
1545+
(0, _collapseAdjacentRules.default)(context)(root, result);
1546+
(0, _collapseDuplicateDeclarations.default)(context)(root, result);
1547+
return context;
1548+
};
1549+
}",
1550+
}
1551+
`;
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
"use strict";
2+
module.exports = require("./plugin");

0 commit comments

Comments
 (0)