Skip to content

Commit 074bca9

Browse files
xusd320xusd320
authored
chore: revert utoo-web/src/webpackLoaders/loaders fmt changes (#2400)
1 parent 1d97d6d commit 074bca9

File tree

4 files changed

+35
-72
lines changed

4 files changed

+35
-72
lines changed

‎biome.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
"**/examples/**/*.json",
1515
"**/examples/**/webpack.config.js",
1616
"./packages/pack/docs/features-list.json",
17+
"!packages/utoo-web/src/webpackLoaders/workerContent.js",
18+
"!packages/utoo-web/src/webpackLoaders/loaders/**",
19+
"!packages/utoo-web/src/utoo/**",
1720
"crates/pack-core/js/**/*.ts",
1821
"!**/examples/multi-entries-heavy/*",
1922
"!**/packages/**/binding.*",

‎packages/utoo-web/src/webpackLoaders/loaders/less-loader/index.js‎

Lines changed: 15 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,37 @@
11
"use strict";
22

33
Object.defineProperty(exports, "__esModule", {
4-
value: true,
4+
value: true
55
});
66
exports.default = void 0;
77
var _path = _interopRequireDefault(require("path"));
88
var _options = _interopRequireDefault(require("./options.json"));
99
var _utils = require("./utils");
10-
function _interopRequireDefault(e) {
11-
return e && e.__esModule ? e : { default: e };
12-
}
10+
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
1311
async function lessLoader(source) {
1412
const options = this.getOptions(_options.default);
1513
const callback = this.async();
1614
let implementation;
1715
try {
18-
implementation = (0, _utils.getLessImplementation)(
19-
this,
20-
options.implementation,
21-
);
16+
implementation = (0, _utils.getLessImplementation)(this, options.implementation);
2217
} catch (error) {
2318
callback(error);
2419
return;
2520
}
2621
if (!implementation) {
27-
callback(
28-
new Error(
29-
`The Less implementation "${options.implementation}" not found`,
30-
),
31-
);
22+
callback(new Error(`The Less implementation "${options.implementation}" not found`));
3223
return;
3324
}
3425
const lessOptions = (0, _utils.getLessOptions)(this, options, implementation);
35-
const useSourceMap =
36-
typeof options.sourceMap === "boolean" ? options.sourceMap : this.sourceMap;
26+
const useSourceMap = typeof options.sourceMap === "boolean" ? options.sourceMap : this.sourceMap;
3727
if (useSourceMap) {
3828
lessOptions.sourceMap = {
39-
outputSourceFiles: true,
29+
outputSourceFiles: true
4030
};
4131
}
4232
let data = source;
4333
if (typeof options.additionalData !== "undefined") {
44-
data =
45-
typeof options.additionalData === "function"
46-
? `${await options.additionalData(data, this)}`
47-
: `${options.additionalData}\n${data}`;
34+
data = typeof options.additionalData === "function" ? `${await options.additionalData(data, this)}` : `${options.additionalData}\n${data}`;
4835
}
4936
const logger = this.getLogger("less-loader");
5037
const loaderContext = this;
@@ -70,7 +57,7 @@ async function lessLoader(source) {
7057
},
7158
debug(message) {
7259
logger.debug(message);
73-
},
60+
}
7461
};
7562
implementation.logger.addListener(loggerListener);
7663
let result;
@@ -90,8 +77,11 @@ async function lessLoader(source) {
9077
delete lessOptions.pluginManager.webpackLoaderContext;
9178
delete lessOptions.pluginManager;
9279
}
93-
const { css, imports } = result;
94-
imports.forEach((item) => {
80+
const {
81+
css,
82+
imports
83+
} = result;
84+
imports.forEach(item => {
9585
if ((0, _utils.isUnsupportedUrl)(item)) {
9686
return;
9787
}
@@ -105,11 +95,10 @@ async function lessLoader(source) {
10595
this.addDependency(normalizedItem);
10696
}
10797
});
108-
let map =
109-
typeof result.map === "string" ? JSON.parse(result.map) : result.map;
98+
let map = typeof result.map === "string" ? JSON.parse(result.map) : result.map;
11099
if (map && useSourceMap) {
111100
map = (0, _utils.normalizeSourceMap)(map, this.rootContext);
112101
}
113102
callback(null, css, map);
114103
}
115-
var _default = (exports.default = lessLoader);
104+
var _default = exports.default = lessLoader;

‎packages/utoo-web/src/webpackLoaders/loaders/less-loader/options.json‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,7 @@
4141
},
4242
{
4343
"type": "string",
44-
"enum": [
45-
"only"
46-
]
44+
"enum": ["only"]
4745
}
4846
]
4947
},

‎packages/utoo-web/src/webpackLoaders/loaders/less-loader/utils.js‎

Lines changed: 16 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,15 @@
33
const { type } = require("os");
44

55
Object.defineProperty(exports, "__esModule", {
6-
value: true,
6+
value: true
77
});
88
exports.errorFactory = errorFactory;
99
exports.getLessImplementation = getLessImplementation;
1010
exports.getLessOptions = getLessOptions;
1111
exports.isUnsupportedUrl = isUnsupportedUrl;
1212
exports.normalizeSourceMap = normalizeSourceMap;
1313
var _path = _interopRequireDefault(require("path"));
14-
function _interopRequireDefault(e) {
15-
return e && e.__esModule ? e : { default: e };
16-
}
14+
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
1715
/* eslint-disable class-methods-use-this */
1816
const trailingSlash = /[/\\]$/;
1917

@@ -32,8 +30,7 @@ const IS_NATIVE_WIN32_PATH = /^[a-z]:[/\\]|^\\\\/i;
3230
// - ~@org/
3331
// - ~@org/package
3432
// - ~@org/package/
35-
const IS_MODULE_IMPORT =
36-
/^~([^/]+|[^/]+\/|@[^/]+[/][^/]+|@[^/]+\/?|@[^/]+[/][^/]+\/)$/;
33+
const IS_MODULE_IMPORT = /^~([^/]+|[^/]+\/|@[^/]+[/][^/]+|@[^/]+\/?|@[^/]+[/][^/]+\/)$/;
3734
const MODULE_REQUEST_REGEX = /^[^?]*~/;
3835

3936
/**
@@ -51,7 +48,7 @@ function createWebpackLessPlugin(loaderContext, implementation) {
5148
mainFields: ["less", "style", "main", "..."],
5249
mainFiles: ["index", "..."],
5350
extensions: [".less", ".css"],
54-
preferRelative: true,
51+
preferRelative: true
5552
});
5653
class WebpackFileManager extends implementation.FileManager {
5754
supports(filename) {
@@ -105,10 +102,7 @@ function createWebpackLessPlugin(loaderContext, implementation) {
105102
async loadFile(filename, ...args) {
106103
let result;
107104
try {
108-
if (
109-
IS_SPECIAL_MODULE_IMPORT.test(filename) ||
110-
lessOptions.webpackImporter === "only"
111-
) {
105+
if (IS_SPECIAL_MODULE_IMPORT.test(filename) || lessOptions.webpackImporter === "only") {
112106
const error = new Error();
113107
error.type = "Next";
114108
throw error;
@@ -121,18 +115,13 @@ function createWebpackLessPlugin(loaderContext, implementation) {
121115
try {
122116
result = await this.resolveFilename(filename, ...args);
123117
} catch (webpackResolveError) {
124-
error.message =
125-
`Less resolver error:\n${error.message}\n\n` +
126-
`Webpack resolver error details:\n${webpackResolveError.details}\n\n` +
127-
`Webpack resolver error missing:\n${webpackResolveError.missing}\n\n`;
118+
error.message = `Less resolver error:\n${error.message}\n\n` + `Webpack resolver error details:\n${webpackResolveError.details}\n\n` + `Webpack resolver error missing:\n${webpackResolveError.missing}\n\n`;
128119
return Promise.reject(error);
129120
}
130121
loaderContext.addDependency(result);
131122
return super.loadFile(result, ...args);
132123
}
133-
const absoluteFilename = _path.default.isAbsolute(result.filename)
134-
? result.filename
135-
: _path.default.resolve(".", result.filename);
124+
const absoluteFilename = _path.default.isAbsolute(result.filename) ? result.filename : _path.default.resolve(".", result.filename);
136125
loaderContext.addDependency(_path.default.normalize(absoluteFilename));
137126
return result;
138127
}
@@ -141,7 +130,7 @@ function createWebpackLessPlugin(loaderContext, implementation) {
141130
install(lessInstance, pluginManager) {
142131
pluginManager.addFileManager(new WebpackFileManager());
143132
},
144-
minVersion: [3, 0, 0],
133+
minVersion: [3, 0, 0]
145134
};
146135
}
147136

@@ -154,23 +143,16 @@ function createWebpackLessPlugin(loaderContext, implementation) {
154143
* @returns {Object}
155144
*/
156145
function getLessOptions(loaderContext, loaderOptions, implementation) {
157-
const options =
158-
typeof loaderOptions.lessOptions === "function"
159-
? loaderOptions.lessOptions(loaderContext) || {}
160-
: loaderOptions.lessOptions || {};
146+
const options = typeof loaderOptions.lessOptions === "function" ? loaderOptions.lessOptions(loaderContext) || {} : loaderOptions.lessOptions || {};
161147
const lessOptions = {
162148
plugins: [],
163149
relativeUrls: true,
164150
// We need to set the filename because otherwise our WebpackFileManager will receive an undefined path for the entry
165151
filename: loaderContext.resourcePath,
166-
...options,
152+
...options
167153
};
168154
const plugins = lessOptions.plugins.slice();
169-
const shouldUseWebpackImporter =
170-
typeof loaderOptions.webpackImporter === "boolean" ||
171-
loaderOptions.webpackImporter === "only"
172-
? loaderOptions.webpackImporter
173-
: true;
155+
const shouldUseWebpackImporter = typeof loaderOptions.webpackImporter === "boolean" || loaderOptions.webpackImporter === "only" ? loaderOptions.webpackImporter : true;
174156
if (shouldUseWebpackImporter) {
175157
plugins.unshift(createWebpackLessPlugin(loaderContext, implementation));
176158
}
@@ -179,7 +161,7 @@ function getLessOptions(loaderContext, loaderOptions, implementation) {
179161
// eslint-disable-next-line no-param-reassign
180162
pluginManager.webpackLoaderContext = loaderContext;
181163
lessOptions.pluginManager = pluginManager;
182-
},
164+
}
183165
});
184166
lessOptions.plugins = plugins;
185167
return lessOptions;
@@ -207,9 +189,7 @@ function normalizeSourceMap(map) {
207189

208190
// `less` returns POSIX paths, that's why we need to transform them back to native paths.
209191
// eslint-disable-next-line no-param-reassign
210-
newMap.sources = newMap.sources.map((source) =>
211-
_path.default.normalize(source),
212-
);
192+
newMap.sources = newMap.sources.map(source => _path.default.normalize(source));
213193
return newMap;
214194
}
215195
function getLessImplementation(loaderContext, implementation) {
@@ -219,7 +199,7 @@ function getLessImplementation(loaderContext, implementation) {
219199
resolvedImplementation = require("less/lib/less-node/index.js").default;
220200
} else if (typeof implementation === "string") {
221201
// eslint-disable-next-line import/no-dynamic-require, global-require
222-
resolvedImplementation = require(implementation);
202+
resolvedImplementation = require(implementation)
223203
}
224204
// eslint-disable-next-line consistent-return
225205
return resolvedImplementation;
@@ -237,16 +217,9 @@ function getFileExcerptIfPossible(error) {
237217
return excerpt;
238218
}
239219
function errorFactory(error) {
240-
const message = [
241-
"\n",
242-
...getFileExcerptIfPossible(error),
243-
error.message.charAt(0).toUpperCase() + error.message.slice(1),
244-
error.filename
245-
? ` Error in ${_path.default.normalize(error.filename)} (line ${error.line}, column ${error.column})`
246-
: "",
247-
].join("\n");
220+
const message = ["\n", ...getFileExcerptIfPossible(error), error.message.charAt(0).toUpperCase() + error.message.slice(1), error.filename ? ` Error in ${_path.default.normalize(error.filename)} (line ${error.line}, column ${error.column})` : ""].join("\n");
248221
const obj = new Error(message, {
249-
cause: error,
222+
cause: error
250223
});
251224
obj.stack = null;
252225
return obj;

0 commit comments

Comments
 (0)