@pinnacle0/webpack-util 0.8.0-beta.2 → 0.8.0-beta.3
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/README.md +5 -5
- package/package.json +5 -3
- package/src/Builder.d.ts +1 -1
- package/src/Builder.js +1 -1
- package/src/CodeStyleChecker.d.ts +1 -1
- package/src/CodeStyleChecker.js +5 -5
- package/src/CodeStyleChecker.js.map +1 -1
- package/src/ProjectStructureChecker.d.ts +1 -1
- package/src/ProjectStructureChecker.js +22 -20
- package/src/ProjectStructureChecker.js.map +1 -1
- package/src/WebpackConfigGenerator/Rule/stylesheet.rule.js +2 -2
- package/src/WebpackConfigGenerator/Rule/stylesheet.rule.js.map +1 -1
- package/src/WebpackConfigGenerator/WebpackConfigSerializationUtil.js +4 -15
- package/src/WebpackConfigGenerator/WebpackConfigSerializationUtil.js.map +1 -1
- package/src/WebpackConfigGenerator/index.js +2 -18
- package/src/WebpackConfigGenerator/index.js.map +1 -1
package/README.md
CHANGED
|
@@ -26,7 +26,7 @@ new WebpackBuilder({
|
|
|
26
26
|
```
|
|
27
27
|
|
|
28
28
|
- Checks if the project structure complies to convention described below.
|
|
29
|
-
- Checks if source files complies with project `
|
|
29
|
+
- Checks if source files complies with project `biome` / `stylelint` / `eslint` rules.
|
|
30
30
|
- Run test if supported by `package.json` scripts.
|
|
31
31
|
- Creates a `webpack` compiler instance (production mode) and bundle into an `index.html` with related CSS/JS/images etc.
|
|
32
32
|
|
|
@@ -40,7 +40,7 @@ new WebpackBuilder({
|
|
|
40
40
|
|
|
41
41
|
- stylelint
|
|
42
42
|
|
|
43
|
-
-
|
|
43
|
+
- biome
|
|
44
44
|
|
|
45
45
|
Note: CSS/LESS only website also supported, without any JavaScript.
|
|
46
46
|
|
|
@@ -65,8 +65,8 @@ The following structure can be used for a basic project setup.
|
|
|
65
65
|
│ (TypeScript config)
|
|
66
66
|
├── .eslintrc.js
|
|
67
67
|
│ (ESLint config, can be moved to upper directories)
|
|
68
|
-
├──
|
|
69
|
-
│ (
|
|
68
|
+
├── biome.json
|
|
69
|
+
│ (Biome config, can be moved to upper directories)
|
|
70
70
|
├── stylelint.config.js
|
|
71
71
|
│ (Stylelint config, can be moved to upper directories)
|
|
72
72
|
└── package.json
|
|
@@ -112,7 +112,7 @@ The following structure can be used for a npm/yarn/pnpm workspace setup.
|
|
|
112
112
|
│ └── package.json
|
|
113
113
|
├── tsconfig.base.json (Define common options to be extended by other tsconfig files)
|
|
114
114
|
├── .eslintrc.js
|
|
115
|
-
├──
|
|
115
|
+
├── biome.json
|
|
116
116
|
├── stylelint.config.js
|
|
117
117
|
└── package.json
|
|
118
118
|
```
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pinnacle0/webpack-util",
|
|
3
|
-
"version": "0.8.0-beta.
|
|
3
|
+
"version": "0.8.0-beta.3",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": {
|
|
@@ -25,13 +25,15 @@
|
|
|
25
25
|
"socks-proxy-agent": "8.0.3",
|
|
26
26
|
"style-loader": "4.0.0",
|
|
27
27
|
"swc-plugin-core-fe-hmr": "1.0.5",
|
|
28
|
-
"yargs": "17.7.2"
|
|
28
|
+
"yargs": "17.7.2",
|
|
29
|
+
"@biomejs/js-api": "0.7.1",
|
|
30
|
+
"@biomejs/wasm-nodejs": "1.9.4"
|
|
29
31
|
},
|
|
30
32
|
"devDependencies": {
|
|
31
33
|
"@types/express": "4.17.21",
|
|
32
34
|
"@types/html-webpack-plugin": "3.2.9",
|
|
33
35
|
"@types/yargs": "17.0.32",
|
|
34
|
-
"@pinnacle0/devtool-util": "1.3.0-beta.
|
|
36
|
+
"@pinnacle0/devtool-util": "1.3.0-beta.3"
|
|
35
37
|
},
|
|
36
38
|
"engines": {
|
|
37
39
|
"node": ">=20"
|
package/src/Builder.d.ts
CHANGED
|
@@ -5,7 +5,7 @@ export interface WebpackBuilderOptions extends WebpackConfigGeneratorOptions, Om
|
|
|
5
5
|
/**
|
|
6
6
|
* Build the website by webpack.
|
|
7
7
|
*
|
|
8
|
-
* Runs static analysis checkers before starting the webpack build (`
|
|
8
|
+
* Runs static analysis checkers before starting the webpack build (`biome format`, `eslint`, `stylelint`).
|
|
9
9
|
*
|
|
10
10
|
***************************************
|
|
11
11
|
*
|
package/src/Builder.js
CHANGED
|
@@ -10,7 +10,7 @@ import { CodeStyleChecker } from "./CodeStyleChecker.js";
|
|
|
10
10
|
/**
|
|
11
11
|
* Build the website by webpack.
|
|
12
12
|
*
|
|
13
|
-
* Runs static analysis checkers before starting the webpack build (`
|
|
13
|
+
* Runs static analysis checkers before starting the webpack build (`biome format`, `eslint`, `stylelint`).
|
|
14
14
|
*
|
|
15
15
|
***************************************
|
|
16
16
|
*
|
package/src/CodeStyleChecker.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { BiomeUtil } from "@pinnacle0/devtool-util/BiomeUtil";
|
|
2
2
|
import { Utility } from "@pinnacle0/devtool-util/Utility";
|
|
3
3
|
import fs from "fs";
|
|
4
4
|
import path from "path";
|
|
@@ -13,14 +13,14 @@ export class CodeStyleChecker {
|
|
|
13
13
|
}
|
|
14
14
|
}
|
|
15
15
|
run() {
|
|
16
|
-
this.
|
|
16
|
+
this.checkBiome();
|
|
17
17
|
this.checkESLint();
|
|
18
18
|
this.checkStylelint();
|
|
19
19
|
}
|
|
20
|
-
|
|
21
|
-
this.logger.task("Checking
|
|
20
|
+
checkBiome() {
|
|
21
|
+
this.logger.task("Checking Biome");
|
|
22
22
|
for (const srcDirectory of this.checkableSrcDirectories) {
|
|
23
|
-
|
|
23
|
+
BiomeUtil.check(srcDirectory);
|
|
24
24
|
}
|
|
25
25
|
}
|
|
26
26
|
checkESLint() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CodeStyleChecker.js","sourceRoot":"","sources":["../../src/CodeStyleChecker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"CodeStyleChecker.js","sourceRoot":"","sources":["../../src/CodeStyleChecker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,mCAAmC,CAAC;AAC5D,OAAO,EAAC,OAAO,EAAC,MAAM,iCAAiC,CAAC;AACxD,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AAGxB,MAAM,OAAO,gBAAgB;IACR,uBAAuB,CAAwB;IAC/C,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,kBAAkB,CAAC,CAAC;IAE1E,YAAY,EAAC,gBAAgB,EAAE,qBAAqB,GAAG,EAAE,EAAyB;QAC9E,IAAI,CAAC,uBAAuB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC,CAAC;QACpE,KAAK,MAAM,SAAS,IAAI,qBAAqB,EAAE,CAAC;YAC5C,MAAM,MAAM,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;YAClH,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,EAAE,GAAG,MAAM,CAAC,CAAC;QAC9E,CAAC;IACL,CAAC;IAED,GAAG;QACC,IAAI,CAAC,UAAU,EAAE,CAAC;QAClB,IAAI,CAAC,WAAW,EAAE,CAAC;QACnB,IAAI,CAAC,cAAc,EAAE,CAAC;IAC1B,CAAC;IAEO,UAAU;QACd,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QACnC,KAAK,MAAM,YAAY,IAAI,IAAI,CAAC,uBAAuB,EAAE,CAAC;YACtD,SAAS,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAClC,CAAC;IACL,CAAC;IAEO,WAAW;QACf,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QACpC,KAAK,MAAM,YAAY,IAAI,IAAI,CAAC,uBAAuB,EAAE,CAAC;YACtD,OAAO,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,mBAAmB,EAAE,iCAAiC,EAAE,kBAAkB,EAAE,IAAI,YAAY,MAAM,CAAC,CAAC,CAAC;QACvI,CAAC;IACL,CAAC;IAEO,cAAc;QAClB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QACvC,KAAK,MAAM,YAAY,IAAI,IAAI,CAAC,uBAAuB,EAAE,CAAC;YACtD,OAAO,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC,qBAAqB,EAAE,kBAAkB,EAAE,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC;QAC7H,CAAC;IACL,CAAC;CACJ"}
|
|
@@ -11,7 +11,7 @@ export declare class ProjectStructureChecker {
|
|
|
11
11
|
private checkExtraDirectories;
|
|
12
12
|
private checkPackageJSON;
|
|
13
13
|
private checkTSConfig;
|
|
14
|
-
private
|
|
14
|
+
private checkBiomeInstallation;
|
|
15
15
|
private checkESLintInstallation;
|
|
16
16
|
private checkStyleLintInstallation;
|
|
17
17
|
}
|
|
@@ -18,7 +18,7 @@ export class ProjectStructureChecker {
|
|
|
18
18
|
this.checkExtraDirectories();
|
|
19
19
|
this.checkPackageJSON();
|
|
20
20
|
this.checkTSConfig();
|
|
21
|
-
this.
|
|
21
|
+
this.checkBiomeInstallation();
|
|
22
22
|
this.checkESLintInstallation();
|
|
23
23
|
this.checkStyleLintInstallation();
|
|
24
24
|
}
|
|
@@ -55,26 +55,27 @@ export class ProjectStructureChecker {
|
|
|
55
55
|
}
|
|
56
56
|
}
|
|
57
57
|
}
|
|
58
|
-
// TODO/David: revert
|
|
59
58
|
checkPackageJSON() {
|
|
60
|
-
|
|
61
|
-
|
|
59
|
+
const startWithDigit = /^\d/;
|
|
60
|
+
const startWithWorkSpace = /^workspace:/;
|
|
62
61
|
if (!(fs.existsSync(this.packageJSONPath) && fs.statSync(this.packageJSONPath).isFile())) {
|
|
63
62
|
throw new Error(`Cannot find package.json at "${this.packageJSONPath}".`);
|
|
64
63
|
}
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
64
|
+
const packageJSONContents = JSON.parse(fs.readFileSync(this.packageJSONPath, { encoding: "utf8" }));
|
|
65
|
+
for (const [depName, depVersion] of Object.entries(packageJSONContents.dependencies || {})) {
|
|
66
|
+
if (startWithWorkSpace.test(depVersion))
|
|
67
|
+
continue;
|
|
68
|
+
if (!startWithDigit.test(depVersion)) {
|
|
69
|
+
throw new Error(`Dependency "${depName}" must be an exact version, but found "${depVersion}" in package.json at "${this.packageJSONPath}".`);
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
for (const [depName, depVersion] of Object.entries(packageJSONContents.devDependencies || {})) {
|
|
73
|
+
if (startWithWorkSpace.test(depVersion))
|
|
74
|
+
continue;
|
|
75
|
+
if (!startWithDigit.test(depVersion)) {
|
|
76
|
+
throw new Error(`Dependency "${depName}" must be an exact version, but found "${depVersion}" in package.json at "${this.packageJSONPath}".`);
|
|
77
|
+
}
|
|
78
|
+
}
|
|
78
79
|
}
|
|
79
80
|
checkTSConfig() {
|
|
80
81
|
const mainProjectSrcDirectory = path.join(this.projectDirectory, "src");
|
|
@@ -85,12 +86,13 @@ export class ProjectStructureChecker {
|
|
|
85
86
|
throw new Error(`Cannot find tsconfig.json: "${this.tsConfigFilePath}".`);
|
|
86
87
|
}
|
|
87
88
|
}
|
|
88
|
-
|
|
89
|
+
checkBiomeInstallation() {
|
|
89
90
|
try {
|
|
90
|
-
|
|
91
|
+
// @ts-ignore
|
|
92
|
+
import("@biomejs/biome");
|
|
91
93
|
}
|
|
92
94
|
catch {
|
|
93
|
-
throw new Error(`Cannot load
|
|
95
|
+
throw new Error(`Cannot load biome module (requiring from "webpack-util"), make sure biome is installed.`);
|
|
94
96
|
}
|
|
95
97
|
}
|
|
96
98
|
checkESLintInstallation() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProjectStructureChecker.js","sourceRoot":"","sources":["../../src/ProjectStructureChecker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAC;AAGvC,MAAM,OAAO,uBAAuB;IACf,gBAAgB,CAAS;IACzB,qBAAqB,CAAW;IAChC,eAAe,CAAS;IACxB,gBAAgB,CAAS;IAE1C,YAAY,OAA+B;QACvC,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;QACjD,IAAI,CAAC,qBAAqB,GAAG,OAAO,CAAC,qBAAqB,IAAI,EAAE,CAAC;QACjE,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAC;QAC3E,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IACrD,CAAC;IAED,GAAG;QACC,IAAI,CAAC,yBAAyB,EAAE,CAAC;QACjC,IAAI,CAAC,4BAA4B,EAAE,CAAC;QACpC,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAC7B,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxB,IAAI,CAAC,aAAa,EAAE,CAAC;QAErB,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"ProjectStructureChecker.js","sourceRoot":"","sources":["../../src/ProjectStructureChecker.ts"],"names":[],"mappings":"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"}
|
|
@@ -49,13 +49,13 @@ function styleLoader() {
|
|
|
49
49
|
export function stylesheetRule({ minimize }) {
|
|
50
50
|
const use = minimize
|
|
51
51
|
? [
|
|
52
|
-
//
|
|
52
|
+
// biome-ignore lint: preserve
|
|
53
53
|
miniCssExtractPluginLoader(),
|
|
54
54
|
cssLoader(1),
|
|
55
55
|
lessLoader(),
|
|
56
56
|
]
|
|
57
57
|
: [
|
|
58
|
-
//
|
|
58
|
+
// biome-ignore lint: preserve
|
|
59
59
|
styleLoader(),
|
|
60
60
|
cssLoader(1),
|
|
61
61
|
lessLoader(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stylesheet.rule.js","sourceRoot":"","sources":["../../../../src/WebpackConfigGenerator/Rule/stylesheet.rule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,cAAc,CAAC;AACpC,OAAO,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAC,aAAa,EAAC,MAAM,aAAa,CAAC;AAO1C;;;;;GAKG;AAEH,SAAS,SAAS,CAAC,aAAqB;IACpC,OAAO;QACH,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC;QAC5D,OAAO,EAAE;YACL,aAAa;SAChB;KACJ,CAAC;AACN,CAAC;AAED,SAAS,UAAU;IACf,OAAO;QACH,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC;QAC7D,OAAO,EAAE;YACL,WAAW,EAAE;gBACT,iBAAiB,EAAE,IAAI;aAC1B;SACJ;KACJ,CAAC;AACN,CAAC;AAED,SAAS,0BAA0B;IAC/B,OAAO;QACH,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,sBAAsB,CAAC,MAAM,CAAC;KACvF,CAAC;AACN,CAAC;AAED,SAAS,WAAW;IAChB,OAAO;QACH,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC;KACjE,CAAC;AACN,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,cAAc,CAAC,EAAC,QAAQ,EAAqB;IACzD,MAAM,GAAG,GAAqB,QAAQ;QAClC,CAAC,CAAC;YACI,
|
|
1
|
+
{"version":3,"file":"stylesheet.rule.js","sourceRoot":"","sources":["../../../../src/WebpackConfigGenerator/Rule/stylesheet.rule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,cAAc,CAAC;AACpC,OAAO,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAC,aAAa,EAAC,MAAM,aAAa,CAAC;AAO1C;;;;;GAKG;AAEH,SAAS,SAAS,CAAC,aAAqB;IACpC,OAAO;QACH,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC;QAC5D,OAAO,EAAE;YACL,aAAa;SAChB;KACJ,CAAC;AACN,CAAC;AAED,SAAS,UAAU;IACf,OAAO;QACH,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC;QAC7D,OAAO,EAAE;YACL,WAAW,EAAE;gBACT,iBAAiB,EAAE,IAAI;aAC1B;SACJ;KACJ,CAAC;AACN,CAAC;AAED,SAAS,0BAA0B;IAC/B,OAAO;QACH,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,sBAAsB,CAAC,MAAM,CAAC;KACvF,CAAC;AACN,CAAC;AAED,SAAS,WAAW;IAChB,OAAO;QACH,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC;KACjE,CAAC;AACN,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,cAAc,CAAC,EAAC,QAAQ,EAAqB;IACzD,MAAM,GAAG,GAAqB,QAAQ;QAClC,CAAC,CAAC;YACI,8BAA8B;YAC9B,0BAA0B,EAAE;YAC5B,SAAS,CAAC,CAAC,CAAC;YACZ,UAAU,EAAE;SACf;QACH,CAAC,CAAC;YACI,8BAA8B;YAC9B,WAAW,EAAE;YACb,SAAS,CAAC,CAAC,CAAC;YACZ,UAAU,EAAE;SACf,CAAC;IAER,OAAO;QACH,IAAI,EAAE,iBAAiB;QACvB,IAAI,EAAE,UAAU,CAAC,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC;QAC/C,GAAG;QACH,qEAAqE;QACrE,mEAAmE;QACnE,uDAAuD;QACvD,sEAAsE;QACtE,sDAAsD;QACtD,WAAW,EAAE,IAAI;KACpB,CAAC;AACN,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { format as prettyFormat } from "pretty-format";
|
|
2
|
+
import { Biome } from "@biomejs/js-api";
|
|
2
3
|
export class WebpackConfigSerializationUtil {
|
|
3
4
|
static serializablePlugin(name, PluginConstructor, options) {
|
|
4
5
|
const plugin = new PluginConstructor(options);
|
|
@@ -36,21 +37,9 @@ export class WebpackConfigSerializationUtil {
|
|
|
36
37
|
},
|
|
37
38
|
],
|
|
38
39
|
});
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
arrowParens: "avoid",
|
|
43
|
-
bracketSpacing: false,
|
|
44
|
-
printWidth: 120,
|
|
45
|
-
tabWidth: 1,
|
|
46
|
-
useTabs: false,
|
|
47
|
-
filepath: "webpack.config.js",
|
|
48
|
-
});
|
|
49
|
-
}
|
|
50
|
-
catch {
|
|
51
|
-
// Either prettier cannot be loaded, or formatting failed, return the unformatted config as a fallback.
|
|
52
|
-
return configString;
|
|
53
|
-
}
|
|
40
|
+
const biome = await Biome.create({ distribution: 1 });
|
|
41
|
+
biome.applyConfiguration({ javascript: { formatter: { enabled: true, indentStyle: "space", indentWidth: 1 } } });
|
|
42
|
+
return biome.formatContent("export default " + configString, { filePath: "webpack.config.js" }).content;
|
|
54
43
|
}
|
|
55
44
|
}
|
|
56
45
|
//# sourceMappingURL=WebpackConfigSerializationUtil.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebpackConfigSerializationUtil.js","sourceRoot":"","sources":["../../../src/WebpackConfigGenerator/WebpackConfigSerializationUtil.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,IAAI,YAAY,EAAC,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"WebpackConfigSerializationUtil.js","sourceRoot":"","sources":["../../../src/WebpackConfigGenerator/WebpackConfigSerializationUtil.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,IAAI,YAAY,EAAC,MAAM,eAAe,CAAC;AACrD,OAAO,EAAC,KAAK,EAAC,MAAM,iBAAiB,CAAC;AAWtC,MAAM,OAAO,8BAA8B;IAIvC,MAAM,CAAC,kBAAkB,CAAU,IAAY,EAAE,iBAAgE,EAAE,OAAiB;QAChI,MAAM,MAAM,GAAG,IAAI,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAC9C,OAAO,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,iCAAiC,EAAE;YACpE,KAAK;gBACD,OAAO;oBACH,sBAAsB,EAAE,8BAA8B;oBACtD,UAAU,EAAE,IAAI;oBAChB,aAAa,EAAE,OAAO;iBACzB,CAAC;YACN,CAAC;SACJ,CAAC,CAAC;IACP,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,MAAqB;QAC7C,MAAM,YAAY,GAAG,YAAY,CAAC,MAAM,EAAE;YACtC,UAAU,EAAE,IAAI;YAChB,WAAW,EAAE,KAAK;YAClB,YAAY,EAAE,KAAK;YACnB,GAAG,EAAE,IAAI;YACT,iBAAiB,EAAE,KAAK;YACxB,OAAO,EAAE;gBACL;oBACI,IAAI,CAAC,GAAQ;wBACT,IAAI,CAAC;4BACD,OAAO,OAAO,GAAG,CAAC,+BAA+B,KAAK,UAAU,CAAC;wBACrE,CAAC;wBAAC,MAAM,CAAC;4BACL,OAAO,KAAK,CAAC;wBACjB,CAAC;oBACL,CAAC;oBACD,SAAS,CAAC,GAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO;wBACzD,MAAM,CAAC,GAAG,GAAG,CAAC,+BAA+B,EAAyC,CAAC;wBACvF,OAAO,OAAO,CAAC,CAAC,UAAU,IAAI,OAAO,CAAC,CAAC,CAAC,aAAa,EAAE,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC;oBAChG,CAAC;iBACJ;aACJ;SACJ,CAAC,CAAC;QAEH,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,EAAC,YAAY,EAAE,CAAC,EAAC,CAAC,CAAC;QACpD,KAAK,CAAC,kBAAkB,CAAC,EAAC,UAAU,EAAE,EAAC,SAAS,EAAE,EAAC,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,EAAC,EAAC,EAAC,CAAC,CAAC;QAC3G,OAAO,KAAK,CAAC,aAAa,CAAC,iBAAiB,GAAG,YAAY,EAAE,EAAC,QAAQ,EAAE,mBAAmB,EAAC,CAAC,CAAC,OAAO,CAAC;IAC1G,CAAC;CACJ"}
|
|
@@ -17,7 +17,6 @@ import { Rule } from "./Rule/index.js";
|
|
|
17
17
|
*/
|
|
18
18
|
export class WebpackConfigGenerator {
|
|
19
19
|
env;
|
|
20
|
-
// private readonly projectDirectory: string;
|
|
21
20
|
projectSrcDirectory;
|
|
22
21
|
tsconfigFilePath;
|
|
23
22
|
enableProfiling;
|
|
@@ -40,7 +39,6 @@ export class WebpackConfigGenerator {
|
|
|
40
39
|
logger = Utility.createConsoleLogger("WebpackConfigGenerator");
|
|
41
40
|
constructor(options) {
|
|
42
41
|
this.env = ArgsUtil.currentEnv();
|
|
43
|
-
// this.projectDirectory = options.projectDirectory;
|
|
44
42
|
this.projectSrcDirectory = path.join(options.projectDirectory, "src");
|
|
45
43
|
this.tsconfigFilePath = options.tsconfigFilePath ? options.tsconfigFilePath : path.join(options.projectDirectory, options.tsconfigFilename ?? "tsconfig.json");
|
|
46
44
|
this.enableProfiling = ArgsUtil.profilingEnabled();
|
|
@@ -116,7 +114,6 @@ export class WebpackConfigGenerator {
|
|
|
116
114
|
},
|
|
117
115
|
module: {
|
|
118
116
|
rules: [
|
|
119
|
-
// prettier
|
|
120
117
|
Rule.ts({ fastRefresh: true }),
|
|
121
118
|
Rule.stylesheet({ minimize: false }),
|
|
122
119
|
Rule.image(),
|
|
@@ -128,7 +125,6 @@ export class WebpackConfigGenerator {
|
|
|
128
125
|
outputModule: true,
|
|
129
126
|
},
|
|
130
127
|
plugins: [
|
|
131
|
-
// prettier
|
|
132
128
|
...this.htmlWebpackPluginInstances,
|
|
133
129
|
Plugin.reactRefresh(this.indirectCodeExclude),
|
|
134
130
|
Plugin.webpack.progress({ enableProfiling: false }),
|
|
@@ -168,11 +164,7 @@ export class WebpackConfigGenerator {
|
|
|
168
164
|
automaticNameDelimiter: "-",
|
|
169
165
|
maxAsyncRequests: 30,
|
|
170
166
|
},
|
|
171
|
-
minimizer: [
|
|
172
|
-
// prettier
|
|
173
|
-
Plugin.minimizer.js(),
|
|
174
|
-
Plugin.minimizer.css(),
|
|
175
|
-
],
|
|
167
|
+
minimizer: [Plugin.minimizer.js(), Plugin.minimizer.css()],
|
|
176
168
|
},
|
|
177
169
|
performance: {
|
|
178
170
|
maxEntrypointSize: this.enableProfiling ? Number.MAX_SAFE_INTEGER : this.maxEntryPointKiloByte * 1000,
|
|
@@ -180,17 +172,9 @@ export class WebpackConfigGenerator {
|
|
|
180
172
|
assetFilter: (filename) => Constant.mediaExtensions.concat(this.extraExtensionsForOtherRule).every(_ => !filename.endsWith(_)),
|
|
181
173
|
},
|
|
182
174
|
module: {
|
|
183
|
-
rules: [
|
|
184
|
-
// prettier
|
|
185
|
-
Rule.ts(),
|
|
186
|
-
Rule.stylesheet({ minimize: true }),
|
|
187
|
-
Rule.image(),
|
|
188
|
-
Rule.other({ extraExtensionsForOtherRule: this.extraExtensionsForOtherRule }),
|
|
189
|
-
...this.customizedLoaders,
|
|
190
|
-
],
|
|
175
|
+
rules: [Rule.ts(), Rule.stylesheet({ minimize: true }), Rule.image(), Rule.other({ extraExtensionsForOtherRule: this.extraExtensionsForOtherRule }), ...this.customizedLoaders],
|
|
191
176
|
},
|
|
192
177
|
plugins: [
|
|
193
|
-
// prettier
|
|
194
178
|
...this.htmlWebpackPluginInstances,
|
|
195
179
|
Plugin.scriptTagCrossOriginPlugin(),
|
|
196
180
|
Plugin.typeChecker({ tsconfigFilePath: this.tsconfigFilePath }),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/WebpackConfigGenerator/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,iCAAiC,CAAC;AACxD,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAC,QAAQ,EAAC,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAC,QAAQ,EAAC,MAAM,gBAAgB,CAAC;AAExC,OAAO,EAAC,6BAA6B,EAAC,MAAM,oCAAoC,CAAC;AACjF,OAAO,EAAC,yBAAyB,EAAC,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAAC,8BAA8B,EAAC,MAAM,qCAAqC,CAAC;AACnF,OAAO,EAAC,mBAAmB,EAAC,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAC,6BAA6B,EAAC,MAAM,oCAAoC,CAAC;AACjF,OAAO,EAAC,0BAA0B,EAAC,MAAM,iCAAiC,CAAC;AAC3E,OAAO,EAAC,+BAA+B,EAAC,MAAM,sCAAsC,CAAC;AACrF,OAAO,EAAC,4BAA4B,EAAC,MAAM,mCAAmC,CAAC;AAC/E,OAAO,EAAC,MAAM,EAAC,MAAM,mBAAmB,CAAC;AACzC,OAAO,EAAC,IAAI,EAAC,MAAM,iBAAiB,CAAC;AAErC;;GAEG;AACH,MAAM,OAAO,sBAAsB;IACd,GAAG,CAAgB;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/WebpackConfigGenerator/index.ts"],"names":[],"mappings":"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"}
|