@umijs/bundler-esbuild 4.0.0-beta.8 → 4.0.0-canary.20220317.1
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/build.d.ts +4 -1
- package/dist/build.js +13 -4
- package/dist/cli.js +1 -7
- package/dist/index.js +5 -1
- package/dist/plugins/less.d.ts +7 -2
- package/dist/plugins/less.js +133 -7
- package/dist/plugins/style.d.ts +17 -0
- package/dist/plugins/style.js +127 -0
- package/dist/utils/getBrowserlist.d.ts +1 -0
- package/dist/utils/getBrowserlist.js +11 -0
- package/dist/utils/postcssProcess.d.ts +2 -0
- package/dist/utils/postcssProcess.js +33 -0
- package/package.json +27 -23
- package/dist/build.d.ts.map +0 -1
- package/dist/cli.d.ts.map +0 -1
- package/dist/index.d.ts.map +0 -1
- package/dist/plugins/__sample.d.ts.map +0 -1
- package/dist/plugins/alias.d.ts.map +0 -1
- package/dist/plugins/externals.d.ts.map +0 -1
- package/dist/plugins/less.d.ts.map +0 -1
- package/dist/plugins/nodeGlobalsPolyfill.d.ts.map +0 -1
- package/dist/types.d.ts.map +0 -1
- package/dist/utils/sortByAffix.d.ts.map +0 -1
package/dist/build.d.ts
CHANGED
|
@@ -13,6 +13,9 @@ interface IOpts {
|
|
|
13
13
|
beforeBabelPresets?: any[];
|
|
14
14
|
extraBabelPlugins?: IBabelPlugin[];
|
|
15
15
|
extraBabelPresets?: IBabelPlugin[];
|
|
16
|
+
inlineStyle?: boolean;
|
|
16
17
|
}
|
|
17
|
-
export declare function build(opts: IOpts): Promise<import("@umijs/bundler-utils/compiled/esbuild").BuildResult
|
|
18
|
+
export declare function build(opts: IOpts): Promise<import("@umijs/bundler-utils/compiled/esbuild").BuildResult & {
|
|
19
|
+
metafile: import("@umijs/bundler-utils/compiled/esbuild").Metafile;
|
|
20
|
+
}>;
|
|
18
21
|
export {};
|
package/dist/build.js
CHANGED
|
@@ -19,6 +19,7 @@ const path_1 = require("path");
|
|
|
19
19
|
const alias_1 = __importDefault(require("./plugins/alias"));
|
|
20
20
|
const externals_1 = __importDefault(require("./plugins/externals"));
|
|
21
21
|
const less_1 = __importDefault(require("./plugins/less"));
|
|
22
|
+
const style_1 = require("./plugins/style");
|
|
22
23
|
function build(opts) {
|
|
23
24
|
return __awaiter(this, void 0, void 0, function* () {
|
|
24
25
|
const outputPath = opts.config.outputPath || (0, path_1.join)(opts.cwd, 'dist');
|
|
@@ -35,14 +36,22 @@ function build(opts) {
|
|
|
35
36
|
outdir: outputPath,
|
|
36
37
|
metafile: true,
|
|
37
38
|
plugins: [
|
|
38
|
-
(0, less_1.default)(Object.assign({ modifyVars: opts.config.theme, javascriptEnabled: true
|
|
39
|
+
(0, less_1.default)(Object.assign({ modifyVars: opts.config.theme, javascriptEnabled: true, alias: opts.config.alias,
|
|
40
|
+
// ref: https://github.com/umijs/umi-next/pull/214
|
|
41
|
+
inlineStyle: opts.inlineStyle, config: opts.config }, opts.config.lessLoader)),
|
|
39
42
|
opts.config.alias && (0, alias_1.default)(addCwdPrefix(opts.config.alias, opts.cwd)),
|
|
40
43
|
opts.config.externals && (0, externals_1.default)(opts.config.externals),
|
|
44
|
+
(0, style_1.style)({
|
|
45
|
+
inlineStyle: opts.inlineStyle,
|
|
46
|
+
config: opts.config,
|
|
47
|
+
}),
|
|
41
48
|
].filter(Boolean),
|
|
42
|
-
define: {
|
|
49
|
+
define: Object.assign({
|
|
43
50
|
// __dirname sham
|
|
44
|
-
__dirname: JSON.stringify('__dirname'),
|
|
45
|
-
|
|
51
|
+
__dirname: JSON.stringify('__dirname'), 'process.env.NODE_ENV': JSON.stringify(opts.mode || 'development') }, opts.config.define),
|
|
52
|
+
loader: {
|
|
53
|
+
'.svg': 'dataurl',
|
|
54
|
+
'.ttf': 'dataurl',
|
|
46
55
|
},
|
|
47
56
|
});
|
|
48
57
|
});
|
package/dist/cli.js
CHANGED
|
@@ -21,7 +21,7 @@ const build_1 = require("./build");
|
|
|
21
21
|
const args = (0, utils_1.yParser)(process.argv.slice(2), {});
|
|
22
22
|
const command = args._[0];
|
|
23
23
|
const cwd = process.cwd();
|
|
24
|
-
const entry = tryPaths([
|
|
24
|
+
const entry = (0, utils_1.tryPaths)([
|
|
25
25
|
(0, path_1.join)(cwd, 'src/index.tsx'),
|
|
26
26
|
(0, path_1.join)(cwd, 'src/index.ts'),
|
|
27
27
|
(0, path_1.join)(cwd, 'index.tsx'),
|
|
@@ -61,12 +61,6 @@ else {
|
|
|
61
61
|
function error(msg) {
|
|
62
62
|
console.error(utils_1.chalk.red(msg));
|
|
63
63
|
}
|
|
64
|
-
function tryPaths(paths) {
|
|
65
|
-
for (const path of paths) {
|
|
66
|
-
if ((0, fs_1.existsSync)(path))
|
|
67
|
-
return path;
|
|
68
|
-
}
|
|
69
|
-
}
|
|
70
64
|
function getEntryKey(path) {
|
|
71
65
|
return (0, path_1.basename)(path, (0, path_1.extname)(path));
|
|
72
66
|
}
|
package/dist/index.js
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
package/dist/plugins/less.d.ts
CHANGED
|
@@ -1,4 +1,9 @@
|
|
|
1
|
-
/// <reference types="less" />
|
|
2
1
|
import { Plugin } from '@umijs/bundler-utils/compiled/esbuild';
|
|
3
|
-
|
|
2
|
+
import { IConfig } from '../types';
|
|
3
|
+
export declare const aliasLessImportPath: (filePath: string, alias: Record<string, string>, importer: string) => Promise<string | null>;
|
|
4
|
+
declare const _default: (options?: Less.Options & {
|
|
5
|
+
alias?: Record<string, string>;
|
|
6
|
+
inlineStyle?: boolean;
|
|
7
|
+
config?: IConfig;
|
|
8
|
+
}) => Plugin;
|
|
4
9
|
export default _default;
|
package/dist/plugins/less.js
CHANGED
|
@@ -8,26 +8,152 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
|
+
var __rest = (this && this.__rest) || function (s, e) {
|
|
12
|
+
var t = {};
|
|
13
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
|
|
14
|
+
t[p] = s[p];
|
|
15
|
+
if (s != null && typeof Object.getOwnPropertySymbols === "function")
|
|
16
|
+
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
|
|
17
|
+
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
|
|
18
|
+
t[p[i]] = s[p[i]];
|
|
19
|
+
}
|
|
20
|
+
return t;
|
|
21
|
+
};
|
|
11
22
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
23
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
24
|
};
|
|
14
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
+
exports.aliasLessImportPath = void 0;
|
|
27
|
+
const enhanced_resolve_1 = __importDefault(require("enhanced-resolve"));
|
|
15
28
|
const fs_1 = require("fs");
|
|
16
|
-
const less_1 = __importDefault(require("less"));
|
|
29
|
+
const less_1 = __importDefault(require("@umijs/bundler-utils/compiled/less"));
|
|
30
|
+
const less_plugin_aliases_1 = __importDefault(require("less-plugin-aliases"));
|
|
17
31
|
const path_1 = __importDefault(require("path"));
|
|
32
|
+
const postcssProcess_1 = require("../utils/postcssProcess");
|
|
33
|
+
const sortByAffix_1 = require("../utils/sortByAffix");
|
|
34
|
+
const resolver = enhanced_resolve_1.default.create({
|
|
35
|
+
mainFields: ['module', 'browser', 'main'],
|
|
36
|
+
extensions: [
|
|
37
|
+
'.json',
|
|
38
|
+
'.js',
|
|
39
|
+
'.jsx',
|
|
40
|
+
'.ts',
|
|
41
|
+
'.tsx',
|
|
42
|
+
'.cjs',
|
|
43
|
+
'.mjs',
|
|
44
|
+
'.less',
|
|
45
|
+
'.css',
|
|
46
|
+
],
|
|
47
|
+
// TODO: support exports
|
|
48
|
+
exportsFields: [],
|
|
49
|
+
});
|
|
50
|
+
function resolve(context, path) {
|
|
51
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
52
|
+
return new Promise((resolve, reject) => {
|
|
53
|
+
resolver(context, path, (err, result) => err ? reject(err) : resolve(result));
|
|
54
|
+
});
|
|
55
|
+
});
|
|
56
|
+
}
|
|
57
|
+
const aliasLessImports = (ctx, alias, importer) => __awaiter(void 0, void 0, void 0, function* () {
|
|
58
|
+
const importRegex = /@import(?:\s+\((.*)\))?\s+['"](.*)['"]/;
|
|
59
|
+
const globalImportRegex = /@import(?:\s+\((.*)\))?\s+['"](.*)['"]/g;
|
|
60
|
+
const match = ctx.match(globalImportRegex) || [];
|
|
61
|
+
for (const el of match) {
|
|
62
|
+
const [imp, _, filePath] = el.match(importRegex) || [];
|
|
63
|
+
let aliaPath = yield (0, exports.aliasLessImportPath)(filePath, alias, importer);
|
|
64
|
+
if (aliaPath) {
|
|
65
|
+
ctx = ctx.replace(imp, el.replace(filePath, aliaPath));
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
return ctx;
|
|
69
|
+
});
|
|
70
|
+
const aliasLessImportPath = (filePath, alias, importer) => __awaiter(void 0, void 0, void 0, function* () {
|
|
71
|
+
// ~ 写法在 esbuild 中无实际意义
|
|
72
|
+
let aliaPath = filePath.startsWith('~')
|
|
73
|
+
? filePath.replace('~', '')
|
|
74
|
+
: filePath;
|
|
75
|
+
const keys = (0, sortByAffix_1.sortByAffix)({ arr: Object.keys(alias), affix: '$' });
|
|
76
|
+
for (const key of keys) {
|
|
77
|
+
const pathSegments = aliaPath.split('/');
|
|
78
|
+
if (pathSegments[0] === key) {
|
|
79
|
+
pathSegments[0] = alias[key];
|
|
80
|
+
aliaPath = pathSegments.join('/');
|
|
81
|
+
aliaPath = path_1.default.extname(aliaPath) ? aliaPath : `${aliaPath}.less`;
|
|
82
|
+
return yield resolve(importer, aliaPath);
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
return null;
|
|
86
|
+
});
|
|
87
|
+
exports.aliasLessImportPath = aliasLessImportPath;
|
|
18
88
|
exports.default = (options = {}) => {
|
|
89
|
+
const { alias, inlineStyle, config } = options, lessOptions = __rest(options, ["alias", "inlineStyle", "config"]);
|
|
19
90
|
return {
|
|
20
91
|
name: 'less',
|
|
21
|
-
setup({ onLoad }) {
|
|
22
|
-
|
|
23
|
-
|
|
92
|
+
setup({ onResolve, onLoad }) {
|
|
93
|
+
onResolve({ filter: /\.less$/, namespace: 'file' }, (args) => __awaiter(this, void 0, void 0, function* () {
|
|
94
|
+
let filePath = args.path;
|
|
95
|
+
let isMatchedAlias = false;
|
|
96
|
+
// first match alias
|
|
97
|
+
if (!!alias) {
|
|
98
|
+
const aliasMatchPath = yield (0, exports.aliasLessImportPath)(filePath, alias, args.path);
|
|
99
|
+
if (aliasMatchPath) {
|
|
100
|
+
isMatchedAlias = true;
|
|
101
|
+
filePath = aliasMatchPath;
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
// if alias not matched, identify whether import from deps (node_modules)
|
|
105
|
+
if (!isMatchedAlias) {
|
|
106
|
+
const isImportFromDeps = !path_1.default.isAbsolute(filePath) && !filePath.startsWith('.');
|
|
107
|
+
if (isImportFromDeps) {
|
|
108
|
+
filePath = yield resolve(process.cwd(), filePath);
|
|
109
|
+
}
|
|
110
|
+
else {
|
|
111
|
+
filePath = path_1.default.resolve(process.cwd(), path_1.default.relative(process.cwd(), args.resolveDir), args.path);
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
return {
|
|
115
|
+
path: filePath,
|
|
116
|
+
namespace: inlineStyle ? 'less-file' : 'file',
|
|
117
|
+
};
|
|
118
|
+
}));
|
|
119
|
+
if (inlineStyle) {
|
|
120
|
+
onResolve({ filter: /\.less$/, namespace: 'less-file' }, (args) => {
|
|
121
|
+
return { path: args.path, namespace: 'less-content' };
|
|
122
|
+
});
|
|
123
|
+
onResolve({ filter: /^__style_helper__$/, namespace: 'less-file' }, (args) => ({
|
|
124
|
+
path: args.path,
|
|
125
|
+
namespace: 'style-helper',
|
|
126
|
+
sideEffects: false,
|
|
127
|
+
}));
|
|
128
|
+
onLoad({ filter: /.*/, namespace: 'less-file' }, (args) => __awaiter(this, void 0, void 0, function* () {
|
|
129
|
+
return ({
|
|
130
|
+
contents: `
|
|
131
|
+
import { injectStyle } from "__style_helper__"
|
|
132
|
+
import css from ${JSON.stringify(args.path)}
|
|
133
|
+
injectStyle(css)
|
|
134
|
+
export default{}
|
|
135
|
+
`,
|
|
136
|
+
});
|
|
137
|
+
}));
|
|
138
|
+
}
|
|
139
|
+
onLoad({ filter: /\.less$/, namespace: inlineStyle ? 'less-content' : 'file' }, (args) => __awaiter(this, void 0, void 0, function* () {
|
|
140
|
+
let content = yield fs_1.promises.readFile(args.path, 'utf-8');
|
|
141
|
+
if (!!alias) {
|
|
142
|
+
content = yield aliasLessImports(content, alias, args.path);
|
|
143
|
+
}
|
|
24
144
|
const dir = path_1.default.dirname(args.path);
|
|
25
145
|
const filename = path_1.default.basename(args.path);
|
|
26
146
|
try {
|
|
27
|
-
const result = yield less_1.default.render(content, Object.assign(Object.assign({
|
|
147
|
+
const result = yield less_1.default.render(content, Object.assign(Object.assign({ plugins: [
|
|
148
|
+
new less_plugin_aliases_1.default({
|
|
149
|
+
prefix: '~',
|
|
150
|
+
aliases: alias || {},
|
|
151
|
+
}),
|
|
152
|
+
], filename, rootpath: dir }, lessOptions), { paths: [...(lessOptions.paths || []), dir] }));
|
|
153
|
+
const postcssrResult = yield (0, postcssProcess_1.postcssProcess)(config, result.css, args.path);
|
|
28
154
|
return {
|
|
29
|
-
contents:
|
|
30
|
-
loader: 'css',
|
|
155
|
+
contents: postcssrResult.css,
|
|
156
|
+
loader: inlineStyle ? 'text' : 'css',
|
|
31
157
|
resolveDir: dir,
|
|
32
158
|
};
|
|
33
159
|
}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { Charset, Plugin } from '@umijs/bundler-utils/compiled/esbuild';
|
|
2
|
+
import { IConfig } from '../types';
|
|
3
|
+
export interface StylePluginOptions {
|
|
4
|
+
/**
|
|
5
|
+
* whether to minify the css code.
|
|
6
|
+
* @default true
|
|
7
|
+
*/
|
|
8
|
+
minify?: boolean;
|
|
9
|
+
/**
|
|
10
|
+
* css charset.
|
|
11
|
+
* @default 'utf8'
|
|
12
|
+
*/
|
|
13
|
+
charset?: Charset;
|
|
14
|
+
inlineStyle?: boolean;
|
|
15
|
+
config?: IConfig;
|
|
16
|
+
}
|
|
17
|
+
export declare function style({ minify, charset, inlineStyle, config, }?: StylePluginOptions): Plugin;
|
|
@@ -0,0 +1,127 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
14
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
exports.style = void 0;
|
|
16
|
+
// ref: https://github.com/hyrious/esbuild-plugin-style/blob/main/index.ts
|
|
17
|
+
const esbuild_1 = __importDefault(require("@umijs/bundler-utils/compiled/esbuild"));
|
|
18
|
+
const utils_1 = require("@umijs/utils");
|
|
19
|
+
const fs_1 = __importDefault(require("fs"));
|
|
20
|
+
const path_1 = __importDefault(require("path"));
|
|
21
|
+
const postcssProcess_1 = require("../utils/postcssProcess");
|
|
22
|
+
// https://github.com/evanw/esbuild/issues/20#issuecomment-802269745
|
|
23
|
+
function style({ minify = true, charset = 'utf8', inlineStyle, config, } = {}) {
|
|
24
|
+
return {
|
|
25
|
+
name: 'style',
|
|
26
|
+
setup({ onResolve, onLoad }) {
|
|
27
|
+
const cwd = process.cwd();
|
|
28
|
+
const opt = {
|
|
29
|
+
logLevel: 'silent',
|
|
30
|
+
bundle: true,
|
|
31
|
+
write: false,
|
|
32
|
+
charset,
|
|
33
|
+
minify,
|
|
34
|
+
loader: {
|
|
35
|
+
'.svg': 'dataurl',
|
|
36
|
+
// file ?
|
|
37
|
+
'.ttf': 'dataurl',
|
|
38
|
+
},
|
|
39
|
+
};
|
|
40
|
+
onResolve({ filter: /\.css$/, namespace: 'file' }, (args) => {
|
|
41
|
+
const absPath = path_1.default.resolve(cwd, path_1.default.relative(cwd, args.resolveDir), args.path);
|
|
42
|
+
// 通过 resolve 往上找,依赖不一定在 node_modules,可能被提到根目录,并且没有 link
|
|
43
|
+
const resolved = fs_1.default.existsSync(absPath)
|
|
44
|
+
? absPath
|
|
45
|
+
: utils_1.resolve.sync(`${args.path}`, {
|
|
46
|
+
basedir: args.resolveDir,
|
|
47
|
+
});
|
|
48
|
+
return { path: resolved, namespace: inlineStyle ? 'style-stub' : '' };
|
|
49
|
+
});
|
|
50
|
+
if (inlineStyle) {
|
|
51
|
+
onResolve({ filter: /\.css$/, namespace: 'style-stub' }, (args) => {
|
|
52
|
+
return { path: args.path, namespace: 'style-content' };
|
|
53
|
+
});
|
|
54
|
+
onResolve({ filter: /^__style_helper__$/, namespace: 'style-stub' }, (args) => ({
|
|
55
|
+
path: args.path,
|
|
56
|
+
namespace: 'style-helper',
|
|
57
|
+
sideEffects: false,
|
|
58
|
+
}));
|
|
59
|
+
onLoad({ filter: /.*/, namespace: 'style-helper' }, () => __awaiter(this, void 0, void 0, function* () {
|
|
60
|
+
return ({
|
|
61
|
+
contents: `
|
|
62
|
+
export function injectStyle(text) {
|
|
63
|
+
if (typeof document !== 'undefined') {
|
|
64
|
+
var style = document.createElement('style')
|
|
65
|
+
var node = document.createTextNode(text)
|
|
66
|
+
style.appendChild(node)
|
|
67
|
+
document.head.appendChild(style)
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
`,
|
|
71
|
+
});
|
|
72
|
+
}));
|
|
73
|
+
onLoad({ filter: /.*/, namespace: 'style-stub' }, (args) => __awaiter(this, void 0, void 0, function* () {
|
|
74
|
+
return ({
|
|
75
|
+
contents: `
|
|
76
|
+
import { injectStyle } from "__style_helper__"
|
|
77
|
+
import css from ${JSON.stringify(args.path)}
|
|
78
|
+
injectStyle(css)
|
|
79
|
+
`,
|
|
80
|
+
});
|
|
81
|
+
}));
|
|
82
|
+
}
|
|
83
|
+
onLoad({
|
|
84
|
+
filter: inlineStyle ? /.*/ : /\.css$/,
|
|
85
|
+
namespace: inlineStyle ? 'style-content' : 'file',
|
|
86
|
+
}, (args) => __awaiter(this, void 0, void 0, function* () {
|
|
87
|
+
const options = Object.assign({ entryPoints: [args.path] }, opt);
|
|
88
|
+
const { errors, warnings, outputFiles } = yield esbuild_1.default.build(options);
|
|
89
|
+
if (errors.length > 0) {
|
|
90
|
+
return {
|
|
91
|
+
errors,
|
|
92
|
+
warnings,
|
|
93
|
+
contents: outputFiles[0].text,
|
|
94
|
+
loader: 'text',
|
|
95
|
+
};
|
|
96
|
+
}
|
|
97
|
+
const dir = path_1.default.dirname(args.path);
|
|
98
|
+
try {
|
|
99
|
+
const result = yield (0, postcssProcess_1.postcssProcess)(config, outputFiles[0].text, args.path);
|
|
100
|
+
return {
|
|
101
|
+
errors,
|
|
102
|
+
warnings,
|
|
103
|
+
contents: result.css,
|
|
104
|
+
loader: inlineStyle ? 'text' : 'css',
|
|
105
|
+
};
|
|
106
|
+
}
|
|
107
|
+
catch (error) {
|
|
108
|
+
return {
|
|
109
|
+
errors: [
|
|
110
|
+
{
|
|
111
|
+
text: error.message,
|
|
112
|
+
location: {
|
|
113
|
+
namespace: 'file',
|
|
114
|
+
file: error.filename,
|
|
115
|
+
line: error.line,
|
|
116
|
+
column: error.column,
|
|
117
|
+
},
|
|
118
|
+
},
|
|
119
|
+
],
|
|
120
|
+
resolveDir: dir,
|
|
121
|
+
};
|
|
122
|
+
}
|
|
123
|
+
}));
|
|
124
|
+
},
|
|
125
|
+
};
|
|
126
|
+
}
|
|
127
|
+
exports.style = style;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function getBrowserlist(targets: Record<string, string | boolean>): string | true | string[];
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getBrowserlist = void 0;
|
|
4
|
+
// refer: https://github.com/umijs/umi-next/blob/867e0c196296efbbdb95203cca35db2fa639808b/packages/bundler-webpack/src/utils/browsersList.ts#L5
|
|
5
|
+
function getBrowserlist(targets) {
|
|
6
|
+
return (targets.browsers ||
|
|
7
|
+
Object.keys(targets).map((key) => {
|
|
8
|
+
return `${key} >= ${targets[key] === true ? '0' : targets[key]}`;
|
|
9
|
+
}));
|
|
10
|
+
}
|
|
11
|
+
exports.getBrowserlist = getBrowserlist;
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
14
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
exports.postcssProcess = void 0;
|
|
16
|
+
const postcss_1 = __importDefault(require("postcss"));
|
|
17
|
+
const getBrowserlist_1 = require("./getBrowserlist");
|
|
18
|
+
function postcssProcess(config, css, path) {
|
|
19
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
20
|
+
return yield (0, postcss_1.default)([
|
|
21
|
+
require('postcss-flexbugs-fixes'),
|
|
22
|
+
require('postcss-preset-env')({
|
|
23
|
+
browsers: (0, getBrowserlist_1.getBrowserlist)((config === null || config === void 0 ? void 0 : config.targets) || {}),
|
|
24
|
+
autoprefixer: Object.assign({ flexbox: 'no-2009' }, config === null || config === void 0 ? void 0 : config.autoprefixer),
|
|
25
|
+
stage: 3,
|
|
26
|
+
}),
|
|
27
|
+
].concat((config === null || config === void 0 ? void 0 : config.extraPostCSSPlugins) || [])).process(css, {
|
|
28
|
+
from: path,
|
|
29
|
+
to: path,
|
|
30
|
+
});
|
|
31
|
+
});
|
|
32
|
+
}
|
|
33
|
+
exports.postcssProcess = postcssProcess;
|
package/package.json
CHANGED
|
@@ -1,40 +1,44 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@umijs/bundler-esbuild",
|
|
3
|
-
"version": "4.0.0-
|
|
3
|
+
"version": "4.0.0-canary.20220317.1",
|
|
4
4
|
"description": "@umijs/bundler-esbuild",
|
|
5
|
+
"homepage": "https://github.com/umijs/umi-next/tree/master/packages/bundler-esbuild#readme",
|
|
6
|
+
"bugs": "https://github.com/umijs/umi-next/issues",
|
|
7
|
+
"repository": {
|
|
8
|
+
"type": "git",
|
|
9
|
+
"url": "https://github.com/umijs/umi-next"
|
|
10
|
+
},
|
|
11
|
+
"license": "MIT",
|
|
5
12
|
"main": "dist/index.js",
|
|
6
13
|
"types": "dist/index.d.ts",
|
|
7
|
-
"files": [
|
|
8
|
-
"dist"
|
|
9
|
-
],
|
|
10
14
|
"bin": {
|
|
11
15
|
"bundler-esbuild": "bin/bundler-esbuild.js"
|
|
12
16
|
},
|
|
17
|
+
"files": [
|
|
18
|
+
"dist"
|
|
19
|
+
],
|
|
13
20
|
"scripts": {
|
|
14
21
|
"build": "pnpm tsc",
|
|
15
22
|
"build:deps": "pnpm esno ../../scripts/bundleDeps.ts",
|
|
16
|
-
"dev": "pnpm build -- --watch"
|
|
23
|
+
"dev": "pnpm build -- --watch",
|
|
24
|
+
"test": "jest -c ../../jest.turbo.config.ts"
|
|
17
25
|
},
|
|
18
|
-
"
|
|
19
|
-
"
|
|
20
|
-
"
|
|
26
|
+
"dependencies": {
|
|
27
|
+
"@umijs/bundler-utils": "4.0.0-canary.20220317.1",
|
|
28
|
+
"@umijs/utils": "4.0.0-canary.20220317.1",
|
|
29
|
+
"enhanced-resolve": "5.9.2",
|
|
30
|
+
"less-plugin-aliases": "^1.0.3",
|
|
31
|
+
"postcss": "^8.4.8",
|
|
32
|
+
"postcss-flexbugs-fixes": "5.0.2",
|
|
33
|
+
"postcss-preset-env": "7.4.2"
|
|
34
|
+
},
|
|
35
|
+
"devDependencies": {
|
|
36
|
+
"@alitajs/postcss-plugin-px2rem": "^0.0.1"
|
|
21
37
|
},
|
|
22
|
-
"authors": [
|
|
23
|
-
"chencheng <sorrycc@gmail.com> (https://github.com/sorrycc)"
|
|
24
|
-
],
|
|
25
|
-
"license": "MIT",
|
|
26
|
-
"bugs": "https://github.com/umijs/umi-next/issues",
|
|
27
|
-
"homepage": "https://github.com/umijs/umi-next/tree/master/packages/bundler-esbuild#readme",
|
|
28
38
|
"publishConfig": {
|
|
29
39
|
"access": "public"
|
|
30
40
|
},
|
|
31
|
-
"
|
|
32
|
-
"@
|
|
33
|
-
|
|
34
|
-
"enhanced-resolve": "5.8.3",
|
|
35
|
-
"less": "4.1.2"
|
|
36
|
-
},
|
|
37
|
-
"devDependencies": {
|
|
38
|
-
"@types/less": "^3.0.3"
|
|
39
|
-
}
|
|
41
|
+
"authors": [
|
|
42
|
+
"chencheng <sorrycc@gmail.com> (https://github.com/sorrycc)"
|
|
43
|
+
]
|
|
40
44
|
}
|
package/dist/build.d.ts.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,MAAM,EAEP,MAAM,uCAAuC,CAAC;AAM/C,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAEhD,UAAU,KAAK;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,MAAM,EAAE,OAAO,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,eAAe,CAAC,EAAE,QAAQ,CAAC;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,UAAU,GAAG,MAAM,CAAC;IACrD,kBAAkB,CAAC,EAAE,GAAG,EAAE,CAAC;IAC3B,kBAAkB,CAAC,EAAE,GAAG,EAAE,CAAC;IAC3B,iBAAiB,CAAC,EAAE,YAAY,EAAE,CAAC;IACnC,iBAAiB,CAAC,EAAE,YAAY,EAAE,CAAC;CACpC;AAED,wBAAsB,KAAK,CAAC,IAAI,EAAE,KAAK,wEA6BtC"}
|
package/dist/cli.d.ts.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":""}
|
package/dist/index.d.ts.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"__sample.d.ts","sourceRoot":"","sources":["../../src/plugins/__sample.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAE/D,wBAAgB,MAAM,IAAI,MAAM,CAE/B"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"alias.d.ts","sourceRoot":"","sources":["../../src/plugins/alias.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;mCAqBtC,OAAO,MAAM,EAAE,MAAM,CAAC,KAAQ,MAAM;AAA7D,wBA0CE"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"externals.d.ts","sourceRoot":"","sources":["../../src/plugins/externals.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;0EAEZ,MAAM;AAAzD,wBAmBE"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"less.d.ts","sourceRoot":"","sources":["../../src/plugins/less.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;mCAKtC,KAAK,OAAO,KAAQ,MAAM;AAAnD,wBAwCE"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"nodeGlobalsPolyfill.d.ts","sourceRoot":"","sources":["../../src/plugins/nodeGlobalsPolyfill.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAE/D,wBAAgB,mBAAmB,IAAI,MAAM,CAS5C"}
|
package/dist/types.d.ts.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AAEzE,oBAAY,GAAG;IACb,WAAW,gBAAgB;IAC3B,UAAU,eAAe;CAC1B;AAED,oBAAY,UAAU;IACpB,MAAM,WAAW;IACjB,OAAO,YAAY;CACpB;AAED,MAAM,WAAW,KAAK;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,oBAAY,YAAY,GAAG,MAAM,GAAG,CAAC,MAAM,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,CAAC,CAAC;AAErE,MAAM,WAAW,OAAO;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,IAAI,CAAC,EAAE,KAAK,EAAE,GAAG,MAAM,EAAE,CAAC;IAC1B,MAAM,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;IAChC,iBAAiB,CAAC,EAAE,YAAY,EAAE,CAAC;IACnC,iBAAiB,CAAC,EAAE,YAAY,EAAE,CAAC;IACnC,mBAAmB,CAAC,EAAE,GAAG,EAAE,CAAC;IAC5B,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,UAAU,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC;IAClC,iBAAiB,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;IAC3C,UAAU,CAAC,EAAE;QAAE,WAAW,EAAE,GAAG,CAAA;KAAE,CAAC;IAClC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IACjC,aAAa,CAAC,EAAE;QAAE,cAAc,EAAE,GAAG,CAAA;KAAE,CAAC;IACxC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,gBAAgB,CAAC;IACxB,OAAO,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;IACjC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"sortByAffix.d.ts","sourceRoot":"","sources":["../../src/utils/sortByAffix.ts"],"names":[],"mappings":"AAAA,wBAAgB,WAAW,CAAC,IAAI,EAAE;IAAE,GAAG,EAAE,MAAM,EAAE,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,YAOjE"}
|