Skip to content

fix: typescript loader #635

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

Merged
merged 1 commit into from
Apr 3, 2023
Merged

fix: typescript loader #635

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
175 changes: 107 additions & 68 deletions src/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,70 +49,76 @@ async function loadConfig(loaderContext, config, postcssOptions) {
throw new Error(`No PostCSS config found in: ${searchPath}`);
}

const moduleName = "postcss";
const explorer = cosmiconfig(moduleName, {
searchPlaces: [
"package.json",
`.${moduleName}rc`,
`.${moduleName}rc.json`,
`.${moduleName}rc.yaml`,
`.${moduleName}rc.yml`,
`.${moduleName}rc.js`,
`.${moduleName}rc.mjs`,
`.${moduleName}rc.cjs`,
`.${moduleName}rc.ts`,
`.${moduleName}rc.mts`,
`.${moduleName}rc.cts`,
`.config/${moduleName}rc`,
`.config/${moduleName}rc.json`,
`.config/${moduleName}rc.yaml`,
`.config/${moduleName}rc.yml`,
`.config/${moduleName}rc.js`,
`.config/${moduleName}rc.mjs`,
`.config/${moduleName}rc.cjs`,
`.config/${moduleName}rc.ts`,
`.config/${moduleName}rc.mts`,
`.config/${moduleName}rc.cts`,
`${moduleName}.config.js`,
`${moduleName}.config.mjs`,
`${moduleName}.config.cjs`,
`${moduleName}.config.ts`,
`${moduleName}.config.mts`,
`${moduleName}.config.cts`,
],
loaders: {
".js": async (...args) => {
let result;

try {
result = defaultLoaders[".js"](...args);
} catch (error) {
let importESM;

try {
// eslint-disable-next-line no-new-func
importESM = new Function("id", "return import(id);");
} catch (e) {
importESM = null;
}
let isTsNodeInstalled = false;

if (
error.code === "ERR_REQUIRE_ESM" &&
url.pathToFileURL &&
importESM
) {
const urlForConfig = url.pathToFileURL(args[0]);
try {
// eslint-disable-next-line import/no-extraneous-dependencies, global-require
require("ts-node");

result = await importESM(urlForConfig);
} else {
throw error;
}
}
isTsNodeInstalled = true;
} catch (_) {
// Nothing
}

return result;
},
".mjs": async (...args) => {
let result;
const moduleName = "postcss";
const searchPlaces = isTsNodeInstalled
? [
"package.json",
`.${moduleName}rc`,
`.${moduleName}rc.json`,
`.${moduleName}rc.yaml`,
`.${moduleName}rc.yml`,
`.${moduleName}rc.js`,
`.${moduleName}rc.mjs`,
`.${moduleName}rc.cjs`,
`.${moduleName}rc.ts`,
`.${moduleName}rc.mts`,
`.${moduleName}rc.cts`,
`.config/${moduleName}rc`,
`.config/${moduleName}rc.json`,
`.config/${moduleName}rc.yaml`,
`.config/${moduleName}rc.yml`,
`.config/${moduleName}rc.js`,
`.config/${moduleName}rc.mjs`,
`.config/${moduleName}rc.cjs`,
`.config/${moduleName}rc.ts`,
`.config/${moduleName}rc.mts`,
`.config/${moduleName}rc.cts`,
`${moduleName}.config.js`,
`${moduleName}.config.mjs`,
`${moduleName}.config.cjs`,
`${moduleName}.config.ts`,
`${moduleName}.config.mts`,
`${moduleName}.config.cts`,
]
: [
"package.json",
`.${moduleName}rc`,
`.${moduleName}rc.json`,
`.${moduleName}rc.yaml`,
`.${moduleName}rc.yml`,
`.${moduleName}rc.js`,
`.${moduleName}rc.mjs`,
`.${moduleName}rc.cjs`,
`.config/${moduleName}rc`,
`.config/${moduleName}rc.json`,
`.config/${moduleName}rc.yaml`,
`.config/${moduleName}rc.yml`,
`.config/${moduleName}rc.js`,
`.config/${moduleName}rc.mjs`,
`.config/${moduleName}rc.cjs`,
`${moduleName}.config.js`,
`${moduleName}.config.mjs`,
`${moduleName}.config.cjs`,
];

const loaders = {
".js": async (...args) => {
let result;

try {
result = defaultLoaders[".js"](...args);
} catch (error) {
let importESM;

try {
Expand All @@ -122,20 +128,53 @@ async function loadConfig(loaderContext, config, postcssOptions) {
importESM = null;
}

if (url.pathToFileURL && importESM) {
if (
error.code === "ERR_REQUIRE_ESM" &&
url.pathToFileURL &&
importESM
) {
const urlForConfig = url.pathToFileURL(args[0]);

result = await importESM(urlForConfig);
} else {
throw new Error("ESM is not supported");
throw error;
}
}

return result;
},
".mjs": async (...args) => {
let result;
let importESM;

try {
// eslint-disable-next-line no-new-func
importESM = new Function("id", "return import(id);");
} catch (e) {
importESM = null;
}

if (url.pathToFileURL && importESM) {
const urlForConfig = url.pathToFileURL(args[0]);

result = await importESM(urlForConfig);
} else {
throw new Error("ESM is not supported");
}

return result;
},
".cts": TypeScriptLoader(),
".mts": TypeScriptLoader(),
".ts": TypeScriptLoader(),
return result;
},
};

if (isTsNodeInstalled) {
loaders[".cts"] = TypeScriptLoader();
loaders[".mts"] = TypeScriptLoader();
loaders[".ts"] = TypeScriptLoader();
}

const explorer = cosmiconfig(moduleName, {
searchPlaces,
loaders,
});

let result;
Expand Down