Skip to content

Commit

Permalink
fix(webpack): fallback to default resolver if async plugin is detected
Browse files Browse the repository at this point in the history
  • Loading branch information
Anber committed Nov 28, 2021
1 parent c0c48c5 commit 1e382d8
Show file tree
Hide file tree
Showing 5 changed files with 99 additions and 26 deletions.
3 changes: 2 additions & 1 deletion packages/logger/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"@types/debug": "^4.1.5"
},
"dependencies": {
"debug": "^4.1.1"
"debug": "^4.1.1",
"picocolors": "^1.0.0"
}
}
13 changes: 12 additions & 1 deletion packages/logger/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import genericDebug from 'debug';
import type { Debugger } from 'debug';
import pc from 'picocolors';

type LogLevel = 'error' | 'warn' | 'info' | 'debug';

const levels = ['error', 'warn', 'info', 'debug'];
const currentLevel = levels.indexOf(process.env.LINARIA_LOG || 'error');
const currentLevel = levels.indexOf(process.env.LINARIA_LOG || 'warn');

const linariaLogger = genericDebug('linaria');

Expand Down Expand Up @@ -61,3 +62,13 @@ export const debug = log.bind(null, 'debug');
export const info = log.bind(null, 'info');
export const warn = log.bind(null, 'warn');
export const error = log.bind(null, 'error');

export const notify = (message: string) => {
console.log(
pc.red(
message.replace(/(`.*?`)/g, (s) =>
pc.italic(s.substring(1, s.length - 1))
)
)
);
};
52 changes: 40 additions & 12 deletions packages/webpack4-loader/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import findYarnWorkspaceRoot from 'find-yarn-workspace-root';
import type { RawSourceMap } from 'source-map';
import cosmiconfig from 'cosmiconfig';
import { EvalCache, Module, transform } from '@linaria/babel-preset';
import { debug } from '@linaria/logger';
import { debug, notify } from '@linaria/logger';

const workspaceRoot = findYarnWorkspaceRoot();
const lernaConfig = cosmiconfig('lerna', {
Expand Down Expand Up @@ -44,6 +44,11 @@ export default function webpack4Loader(

EvalCache.clearForFile(this.resourcePath);

const resolveOptionsDefaults = {
conditionNames: ['require'],
extensions: ['.js', '.jsx', '.ts', '.tsx', '.json'],
};

const {
sourceMap = undefined,
cacheDirectory = '.linaria-cache',
Expand All @@ -68,18 +73,41 @@ export default function webpack4Loader(
)
);

const resolveSync = enhancedResolve.create.sync(
// this._compilation is a deprecated API
// However there seems to be no other way to access webpack's resolver
// There is this.resolve, but it's asynchronous
// Another option is to read the webpack.config.js, but it won't work for programmatic usage
// This API is used by many loaders/plugins, so hope we're safe for a while
{
...(this._compilation?.options.resolve ?? {}),
// this._compilation is a deprecated API
// However there seems to be no other way to access webpack's resolver
// There is this.resolve, but it's asynchronous
// Another option is to read the webpack.config.js, but it won't work for programmatic usage
// This API is used by many loaders/plugins, so hope we're safe for a while
const webpackResolveOptions = this._compilation?.options.resolve;

// Let's try to create a resolver with the webpack config
let resolveSync = enhancedResolve.create.sync({
...resolveOptionsDefaults,
...(this._compilation?.options.resolve ?? {}),
...resolveOptions,
mainFields: ['main'],
});

try {
// Try to resolve the current file
resolveSync(__dirname, __filename);
} catch (e) {
// Looks like one of the webpack plugins is async and the whole resolver became async
notify(
'The default webpack configuration cannot be used because some of the plugins are asynchronous. All plugins have been ignored. Please override `resolveOptions.plugins` in the Linaria configuration.'
);

// Fallback to synchronous resolve
resolveSync = enhancedResolve.create.sync({
...resolveOptionsDefaults,
...((webpackResolveOptions && {
alias: webpackResolveOptions.alias,
modules: webpackResolveOptions.modules,
}) ||
{}),
...resolveOptions,
mainFields: ['main'],
}
);
});
}

let result;

Expand Down
52 changes: 40 additions & 12 deletions packages/webpack5-loader/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import findYarnWorkspaceRoot from 'find-yarn-workspace-root';
import type { RawSourceMap } from 'source-map';
import cosmiconfig from 'cosmiconfig';
import { EvalCache, Module, transform } from '@linaria/babel-preset';
import { debug } from '@linaria/logger';
import { debug, notify } from '@linaria/logger';

const workspaceRoot = findYarnWorkspaceRoot();
const lernaConfig = cosmiconfig('lerna', {
Expand All @@ -32,6 +32,11 @@ export default function webpack5Loader(

EvalCache.clearForFile(this.resourcePath);

const resolveOptionsDefaults = {
conditionNames: ['require'],
extensions: ['.js', '.jsx', '.ts', '.tsx', '.json'],
};

const {
sourceMap = undefined,
cacheDirectory = '.linaria-cache',
Expand All @@ -56,18 +61,41 @@ export default function webpack5Loader(
)
);

const resolveSync = enhancedResolve.create.sync(
// this._compilation is a deprecated API
// However there seems to be no other way to access webpack's resolver
// There is this.resolve, but it's asynchronous
// Another option is to read the webpack.config.js, but it won't work for programmatic usage
// This API is used by many loaders/plugins, so hope we're safe for a while
{
...(this._compilation?.options.resolve ?? {}),
// this._compilation is a deprecated API
// However there seems to be no other way to access webpack's resolver
// There is this.resolve, but it's asynchronous
// Another option is to read the webpack.config.js, but it won't work for programmatic usage
// This API is used by many loaders/plugins, so hope we're safe for a while
const webpackResolveOptions = this._compilation?.options.resolve;

// Let's try to create a resolver with the webpack config
let resolveSync = enhancedResolve.create.sync({
...resolveOptionsDefaults,
...(webpackResolveOptions ?? {}),
...resolveOptions,
mainFields: ['main'],
});

try {
// Try to resolve the current file
resolveSync(__dirname, __filename);
} catch (e) {
// Looks like one of the webpack plugins is async and the whole resolver became async
notify(
'The default webpack configuration cannot be used because some of the plugins are asynchronous. All plugins have been ignored. Please override `resolveOptions.plugins` in the Linaria configuration.'
);

// Fallback to synchronous resolve
resolveSync = enhancedResolve.create.sync({
...resolveOptionsDefaults,
...((webpackResolveOptions && {
alias: webpackResolveOptions.alias,
modules: webpackResolveOptions.modules,
}) ||
{}),
...resolveOptions,
mainFields: ['main'],
}
);
});
}

let result;

Expand Down
5 changes: 5 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11251,6 +11251,11 @@ performance-now@^2.1.0:
resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=

picocolors@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==

picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3:
version "2.3.0"
resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972"
Expand Down

0 comments on commit 1e382d8

Please sign in to comment.