@modern-js/plugin-tailwindcss 2.60.6 → 2.62.0
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.
- package/dist/cjs/cli.js +15 -8
- package/dist/cjs/config.js +7 -2
- package/dist/esm/cli.js +16 -9
- package/dist/esm/config.js +7 -2
- package/dist/esm-node/cli.js +15 -8
- package/dist/esm-node/config.js +7 -2
- package/dist/types/config.d.ts +7 -1
- package/package.json +12 -12
package/dist/cjs/cli.js
CHANGED
|
@@ -54,7 +54,7 @@ const tailwindcssPlugin = ({ pluginName } = {
|
|
|
54
54
|
const haveTwinMacro = await (0, import_macro.checkTwinMacroExist)(appDirectory);
|
|
55
55
|
const tailwindPath = (0, import_utils2.getTailwindPath)(appDirectory);
|
|
56
56
|
const tailwindVersion = (0, import_utils2.getTailwindVersion)(appDirectory);
|
|
57
|
-
const userTailwindConfig = await (0, import_config.loadConfigFile)(appDirectory);
|
|
57
|
+
const { content: userTailwindConfig, path: userTailwindConfigPath } = await (0, import_config.loadConfigFile)(appDirectory);
|
|
58
58
|
return {
|
|
59
59
|
prepare() {
|
|
60
60
|
if (haveTwinMacro) {
|
|
@@ -78,13 +78,20 @@ const tailwindcssPlugin = ({ pluginName } = {
|
|
|
78
78
|
if (!tailwindConfig) {
|
|
79
79
|
var _modernConfig_tools, _modernConfig_source;
|
|
80
80
|
const modernConfig = api.useResolvedConfigContext();
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
81
|
+
if (tailwindVersion === "3" && userTailwindConfig.content && !(modernConfig === null || modernConfig === void 0 ? void 0 : (_modernConfig_tools = modernConfig.tools) === null || _modernConfig_tools === void 0 ? void 0 : _modernConfig_tools.tailwindcss) && !(modernConfig === null || modernConfig === void 0 ? void 0 : (_modernConfig_source = modernConfig.source) === null || _modernConfig_source === void 0 ? void 0 : _modernConfig_source.designSystem)) {
|
|
82
|
+
tailwindConfig = {
|
|
83
|
+
config: userTailwindConfigPath
|
|
84
|
+
};
|
|
85
|
+
} else {
|
|
86
|
+
var _modernConfig_tools1, _modernConfig_source1;
|
|
87
|
+
tailwindConfig = (0, import_config.getTailwindConfig)({
|
|
88
|
+
appDirectory,
|
|
89
|
+
tailwindVersion,
|
|
90
|
+
userConfig: userTailwindConfig,
|
|
91
|
+
extraConfig: modernConfig === null || modernConfig === void 0 ? void 0 : (_modernConfig_tools1 = modernConfig.tools) === null || _modernConfig_tools1 === void 0 ? void 0 : _modernConfig_tools1.tailwindcss,
|
|
92
|
+
designSystem: modernConfig === null || modernConfig === void 0 ? void 0 : (_modernConfig_source1 = modernConfig.source) === null || _modernConfig_source1 === void 0 ? void 0 : _modernConfig_source1.designSystem
|
|
93
|
+
});
|
|
94
|
+
}
|
|
88
95
|
}
|
|
89
96
|
};
|
|
90
97
|
return {
|
package/dist/cjs/config.js
CHANGED
|
@@ -71,9 +71,14 @@ async function loadConfigFile(appDirectory) {
|
|
|
71
71
|
const configFile = (0, import_utils.findExists)(configs);
|
|
72
72
|
if (configFile) {
|
|
73
73
|
const mod = await (0, import_node_bundle_require.bundleRequire)(configFile);
|
|
74
|
-
return
|
|
74
|
+
return {
|
|
75
|
+
path: configFile,
|
|
76
|
+
content: mod.default || mod
|
|
77
|
+
};
|
|
75
78
|
}
|
|
76
|
-
return {
|
|
79
|
+
return {
|
|
80
|
+
content: {}
|
|
81
|
+
};
|
|
77
82
|
}
|
|
78
83
|
const getTailwindConfig = ({ tailwindVersion, appDirectory, userConfig, extraConfig, designSystem }) => {
|
|
79
84
|
const content = getDefaultContent(appDirectory);
|
package/dist/esm/cli.js
CHANGED
|
@@ -20,7 +20,7 @@ var tailwindcssPlugin = function() {
|
|
|
20
20
|
],
|
|
21
21
|
setup: function() {
|
|
22
22
|
var _ref = _async_to_generator(function(api) {
|
|
23
|
-
var _api_useAppContext, appDirectory, internalDirectory, internalTwConfigPath, haveTwinMacro, tailwindPath, tailwindVersion, userTailwindConfig;
|
|
23
|
+
var _api_useAppContext, appDirectory, internalDirectory, internalTwConfigPath, haveTwinMacro, tailwindPath, tailwindVersion, _ref2, userTailwindConfig, userTailwindConfigPath;
|
|
24
24
|
return _ts_generator(this, function(_state) {
|
|
25
25
|
switch (_state.label) {
|
|
26
26
|
case 0:
|
|
@@ -39,7 +39,7 @@ var tailwindcssPlugin = function() {
|
|
|
39
39
|
loadConfigFile(appDirectory)
|
|
40
40
|
];
|
|
41
41
|
case 2:
|
|
42
|
-
|
|
42
|
+
_ref2 = _state.sent(), userTailwindConfig = _ref2.content, userTailwindConfigPath = _ref2.path;
|
|
43
43
|
return [
|
|
44
44
|
2,
|
|
45
45
|
{
|
|
@@ -65,13 +65,20 @@ var tailwindcssPlugin = function() {
|
|
|
65
65
|
if (!tailwindConfig) {
|
|
66
66
|
var _modernConfig_tools, _modernConfig_source;
|
|
67
67
|
var modernConfig = api.useResolvedConfigContext();
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
68
|
+
if (tailwindVersion === "3" && userTailwindConfig.content && !(modernConfig === null || modernConfig === void 0 ? void 0 : (_modernConfig_tools = modernConfig.tools) === null || _modernConfig_tools === void 0 ? void 0 : _modernConfig_tools.tailwindcss) && !(modernConfig === null || modernConfig === void 0 ? void 0 : (_modernConfig_source = modernConfig.source) === null || _modernConfig_source === void 0 ? void 0 : _modernConfig_source.designSystem)) {
|
|
69
|
+
tailwindConfig = {
|
|
70
|
+
config: userTailwindConfigPath
|
|
71
|
+
};
|
|
72
|
+
} else {
|
|
73
|
+
var _modernConfig_tools1, _modernConfig_source1;
|
|
74
|
+
tailwindConfig = getTailwindConfig({
|
|
75
|
+
appDirectory,
|
|
76
|
+
tailwindVersion,
|
|
77
|
+
userConfig: userTailwindConfig,
|
|
78
|
+
extraConfig: modernConfig === null || modernConfig === void 0 ? void 0 : (_modernConfig_tools1 = modernConfig.tools) === null || _modernConfig_tools1 === void 0 ? void 0 : _modernConfig_tools1.tailwindcss,
|
|
79
|
+
designSystem: modernConfig === null || modernConfig === void 0 ? void 0 : (_modernConfig_source1 = modernConfig.source) === null || _modernConfig_source1 === void 0 ? void 0 : _modernConfig_source1.designSystem
|
|
80
|
+
});
|
|
81
|
+
}
|
|
75
82
|
}
|
|
76
83
|
};
|
|
77
84
|
return {
|
package/dist/esm/config.js
CHANGED
|
@@ -62,12 +62,17 @@ function _loadConfigFile() {
|
|
|
62
62
|
mod = _state.sent();
|
|
63
63
|
return [
|
|
64
64
|
2,
|
|
65
|
-
|
|
65
|
+
{
|
|
66
|
+
path: configFile,
|
|
67
|
+
content: mod.default || mod
|
|
68
|
+
}
|
|
66
69
|
];
|
|
67
70
|
case 2:
|
|
68
71
|
return [
|
|
69
72
|
2,
|
|
70
|
-
{
|
|
73
|
+
{
|
|
74
|
+
content: {}
|
|
75
|
+
}
|
|
71
76
|
];
|
|
72
77
|
}
|
|
73
78
|
});
|
package/dist/esm-node/cli.js
CHANGED
|
@@ -20,7 +20,7 @@ const tailwindcssPlugin = ({ pluginName } = {
|
|
|
20
20
|
const haveTwinMacro = await checkTwinMacroExist(appDirectory);
|
|
21
21
|
const tailwindPath = getTailwindPath(appDirectory);
|
|
22
22
|
const tailwindVersion = getTailwindVersion(appDirectory);
|
|
23
|
-
const userTailwindConfig = await loadConfigFile(appDirectory);
|
|
23
|
+
const { content: userTailwindConfig, path: userTailwindConfigPath } = await loadConfigFile(appDirectory);
|
|
24
24
|
return {
|
|
25
25
|
prepare() {
|
|
26
26
|
if (haveTwinMacro) {
|
|
@@ -44,13 +44,20 @@ const tailwindcssPlugin = ({ pluginName } = {
|
|
|
44
44
|
if (!tailwindConfig) {
|
|
45
45
|
var _modernConfig_tools, _modernConfig_source;
|
|
46
46
|
const modernConfig = api.useResolvedConfigContext();
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
47
|
+
if (tailwindVersion === "3" && userTailwindConfig.content && !(modernConfig === null || modernConfig === void 0 ? void 0 : (_modernConfig_tools = modernConfig.tools) === null || _modernConfig_tools === void 0 ? void 0 : _modernConfig_tools.tailwindcss) && !(modernConfig === null || modernConfig === void 0 ? void 0 : (_modernConfig_source = modernConfig.source) === null || _modernConfig_source === void 0 ? void 0 : _modernConfig_source.designSystem)) {
|
|
48
|
+
tailwindConfig = {
|
|
49
|
+
config: userTailwindConfigPath
|
|
50
|
+
};
|
|
51
|
+
} else {
|
|
52
|
+
var _modernConfig_tools1, _modernConfig_source1;
|
|
53
|
+
tailwindConfig = getTailwindConfig({
|
|
54
|
+
appDirectory,
|
|
55
|
+
tailwindVersion,
|
|
56
|
+
userConfig: userTailwindConfig,
|
|
57
|
+
extraConfig: modernConfig === null || modernConfig === void 0 ? void 0 : (_modernConfig_tools1 = modernConfig.tools) === null || _modernConfig_tools1 === void 0 ? void 0 : _modernConfig_tools1.tailwindcss,
|
|
58
|
+
designSystem: modernConfig === null || modernConfig === void 0 ? void 0 : (_modernConfig_source1 = modernConfig.source) === null || _modernConfig_source1 === void 0 ? void 0 : _modernConfig_source1.designSystem
|
|
59
|
+
});
|
|
60
|
+
}
|
|
54
61
|
}
|
|
55
62
|
};
|
|
56
63
|
return {
|
package/dist/esm-node/config.js
CHANGED
|
@@ -37,9 +37,14 @@ async function loadConfigFile(appDirectory) {
|
|
|
37
37
|
const configFile = findExists(configs);
|
|
38
38
|
if (configFile) {
|
|
39
39
|
const mod = await bundleRequire(configFile);
|
|
40
|
-
return
|
|
40
|
+
return {
|
|
41
|
+
path: configFile,
|
|
42
|
+
content: mod.default || mod
|
|
43
|
+
};
|
|
41
44
|
}
|
|
42
|
-
return {
|
|
45
|
+
return {
|
|
46
|
+
content: {}
|
|
47
|
+
};
|
|
43
48
|
}
|
|
44
49
|
const getTailwindConfig = ({ tailwindVersion, appDirectory, userConfig, extraConfig, designSystem }) => {
|
|
45
50
|
const content = getDefaultContent(appDirectory);
|
package/dist/types/config.d.ts
CHANGED
|
@@ -1,5 +1,11 @@
|
|
|
1
1
|
import type { DesignSystem, ExtraTailwindConfig, TailwindConfig } from './types';
|
|
2
|
-
export declare function loadConfigFile(appDirectory: string): Promise<
|
|
2
|
+
export declare function loadConfigFile(appDirectory: string): Promise<{
|
|
3
|
+
path: string;
|
|
4
|
+
content: any;
|
|
5
|
+
} | {
|
|
6
|
+
content: {};
|
|
7
|
+
path?: undefined;
|
|
8
|
+
}>;
|
|
3
9
|
/**
|
|
4
10
|
* Config priority:
|
|
5
11
|
* `source.designSystem` > `tools.tailwindcss` (extraConfig) > `tailwind.config.*` (userConfig) > `defaultConfig`
|
package/package.json
CHANGED
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
"modern",
|
|
16
16
|
"modern.js"
|
|
17
17
|
],
|
|
18
|
-
"version": "2.
|
|
18
|
+
"version": "2.62.0",
|
|
19
19
|
"jsnext:source": "./src/index.ts",
|
|
20
20
|
"types": "./dist/types/index.d.ts",
|
|
21
21
|
"main": "./dist/cjs/index.js",
|
|
@@ -49,9 +49,9 @@
|
|
|
49
49
|
"dependencies": {
|
|
50
50
|
"@swc/helpers": "0.5.13",
|
|
51
51
|
"babel-plugin-macros": "3.1.0",
|
|
52
|
-
"@modern-js/node-bundle-require": "2.
|
|
53
|
-
"@modern-js/
|
|
54
|
-
"@modern-js/utils": "2.
|
|
52
|
+
"@modern-js/node-bundle-require": "2.62.0",
|
|
53
|
+
"@modern-js/utils": "2.62.0",
|
|
54
|
+
"@modern-js/runtime-utils": "2.62.0"
|
|
55
55
|
},
|
|
56
56
|
"devDependencies": {
|
|
57
57
|
"@types/jest": "^29",
|
|
@@ -61,17 +61,17 @@
|
|
|
61
61
|
"react": "^18.3.1",
|
|
62
62
|
"tailwindcss": "^3.3.3",
|
|
63
63
|
"typescript": "^5",
|
|
64
|
-
"@modern-js/
|
|
65
|
-
"@modern-js/
|
|
66
|
-
"@modern-js/
|
|
67
|
-
"@modern-js/
|
|
68
|
-
"@scripts/
|
|
69
|
-
"@modern-js/
|
|
70
|
-
"@scripts/
|
|
64
|
+
"@modern-js/core": "2.62.0",
|
|
65
|
+
"@modern-js/module-tools": "2.62.0",
|
|
66
|
+
"@modern-js/runtime": "2.62.0",
|
|
67
|
+
"@modern-js/types": "2.62.0",
|
|
68
|
+
"@scripts/build": "2.62.0",
|
|
69
|
+
"@modern-js/app-tools": "2.62.0",
|
|
70
|
+
"@scripts/jest-config": "2.62.0"
|
|
71
71
|
},
|
|
72
72
|
"peerDependencies": {
|
|
73
73
|
"tailwindcss": ">= 2.0.0 || >= 3.0.0",
|
|
74
|
-
"@modern-js/runtime": "^2.
|
|
74
|
+
"@modern-js/runtime": "^2.62.0"
|
|
75
75
|
},
|
|
76
76
|
"peerDependenciesMeta": {
|
|
77
77
|
"@modern-js/runtime": {
|