Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issues with config relative imports #170

Merged
merged 2 commits into from
Feb 24, 2021
Merged

Fix issues with config relative imports #170

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0750a4
refactor: use node's `vm` module instead of `eval`
muhammadsammy Feb 23, 2021
0b3d7c8
fix: set the vm's `__dirname` global to the path of the config file
muhammadsammy Feb 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 15 additions & 10 deletions src/cli/core/GeneratedFileWriter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
/* eslint-disable @typescript-eslint/restrict-template-expressions */

import {promises as fs} from 'fs';
import vm from 'vm';
import path from 'path';
import colors from 'colors';
import {ClassnamesGenerator} from './ClassnamesGenerator';
import {TTailwindCSSConfig} from '../types/config';
import {TailwindConfigParser} from './TailwindConfigParser';
import {FileContentGenerator} from './FileContentGenerator';
import {TTailwindCSSConfig as TConfig} from '../types/config';

type TCliOptions = {
configFilename: string | void;
Expand Down Expand Up @@ -70,22 +71,26 @@ export class GeneratedFileWriter {

private generateFileContent = (): string => {
// Evaluate the config as a JS object
const configEval = eval(
this._configFileData.replace(/(['"])?plugins(['"])? *: *\[(.*|\n)*?],?/g, ''),
) as TTailwindCSSConfig;
const evaluatedConfig = <TConfig>vm.runInNewContext(this._configFileData, {
__dirname: path.dirname(path.resolve(`./${this._configFilename}`)),
module: {},
require,
});

// Parse the config with the config scanner
const scanner = new TailwindConfigParser(configEval, {
// Parse the config with the config parser class
const configParser = new TailwindConfigParser(evaluatedConfig, {
pluginTypography: this._configFileData.includes('@tailwindcss/typography'),
pluginCustomForms: this._configFileData.includes('@tailwindcss/custom-forms'),
});

// Generate all classnames from the config
const generatedClassnames = new ClassnamesGenerator(scanner).generate();
const generatedClassnames = new ClassnamesGenerator(configParser).generate();

// Create the file content from the generated classes
const contentGenerator = new FileContentGenerator(generatedClassnames, scanner.getPrefix());
const fileContentTemplate = contentGenerator.generateFileContent();
// Create the file content from the generated classnames
const fileContentTemplate = new FileContentGenerator(
generatedClassnames,
configParser.getPrefix(),
).generateFileContent();

// Resolve the custom classes import path relative to the output file
let customClassesImportPath: string | null = null;
Expand Down