@ms-cloudpack/bundler 0.23.35 → 0.23.36
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/lib/bundle.d.ts +2 -2
- package/lib/bundle.d.ts.map +1 -1
- package/lib/bundle.js +18 -6
- package/lib/bundle.js.map +1 -1
- package/package.json +9 -9
package/lib/bundle.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { BundleContext, BundleOptions, Bundler, BundleResult, BundlerResult } from '@ms-cloudpack/common-types';
|
|
1
|
+
import type { BundleContext, BundleOptions, Bundler, BundleResult, BundlerResult, CloudpackConfig } from '@ms-cloudpack/common-types';
|
|
2
2
|
/**
|
|
3
3
|
* Abstracted consumer input to the bundle method for the appropriate bundler. Provides a more
|
|
4
4
|
* advanced api surface.
|
|
@@ -9,5 +9,5 @@ export declare function bundle(options: BundleOptions, context: Pick<BundleConte
|
|
|
9
9
|
* between normal `bundle()` calls and `result.rebuild()` (if provided by the bundler plugin),
|
|
10
10
|
* and helps with testing.
|
|
11
11
|
*/
|
|
12
|
-
export declare function bundleInternal(pluginBundle: () => Promise<BundlerResult>, options: BundleOptions & Pick<Bundler, 'name' | 'version'>): Promise<BundleResult>;
|
|
12
|
+
export declare function bundleInternal(pluginBundle: () => Promise<BundlerResult>, options: BundleOptions & Pick<Bundler, 'name' | 'version'> & Pick<CloudpackConfig, 'logBundleInfo'>): Promise<BundleResult>;
|
|
13
13
|
//# sourceMappingURL=bundle.d.ts.map
|
package/lib/bundle.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundle.d.ts","sourceRoot":"","sources":["../src/bundle.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,aAAa,EAEb,aAAa,EACb,OAAO,EACP,YAAY,EACZ,aAAa,
|
|
1
|
+
{"version":3,"file":"bundle.d.ts","sourceRoot":"","sources":["../src/bundle.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,aAAa,EAEb,aAAa,EACb,OAAO,EACP,YAAY,EACZ,aAAa,EACb,eAAe,EAEhB,MAAM,4BAA4B,CAAC;AAMpC;;;GAGG;AACH,wBAAsB,MAAM,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,IAAI,CAAC,aAAa,EAAE,QAAQ,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,CAqElH;AAED;;;;GAIG;AACH,wBAAsB,cAAc,CAClC,YAAY,EAAE,MAAM,OAAO,CAAC,aAAa,CAAC,EAC1C,OAAO,EAAE,aAAa,GAAG,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC,GAAG,IAAI,CAAC,eAAe,EAAE,eAAe,CAAC,GAClG,OAAO,CAAC,YAAY,CAAC,CAgDvB"}
|
package/lib/bundle.js
CHANGED
|
@@ -61,7 +61,12 @@ export async function bundle(options, context) {
|
|
|
61
61
|
isTypescript,
|
|
62
62
|
});
|
|
63
63
|
const bundleFunc = () => bundler.bundle(options, { ...context, moduleType });
|
|
64
|
-
return bundleInternal(bundleFunc, {
|
|
64
|
+
return bundleInternal(bundleFunc, {
|
|
65
|
+
...options,
|
|
66
|
+
name: bundler.name,
|
|
67
|
+
version: bundler.version,
|
|
68
|
+
logBundleInfo: context.config.logBundleInfo,
|
|
69
|
+
});
|
|
65
70
|
}
|
|
66
71
|
/**
|
|
67
72
|
* Wrapper for bundling and normalizing the result. This is separated to allow sharing the logic
|
|
@@ -87,11 +92,18 @@ export async function bundleInternal(pluginBundle, options) {
|
|
|
87
92
|
}
|
|
88
93
|
const { rawInput, rawOutput, rebuild, ...rest } = pluginResult || {};
|
|
89
94
|
const { inputPath, entries, outputPath: logOutputPath = inputPath } = options;
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
+
if (rest.errors?.length) {
|
|
96
|
+
// If there are errors, always write them to a log file.
|
|
97
|
+
await writeJson(path.join(logOutputPath, `${bundler}-errors.json`), rest.errors);
|
|
98
|
+
}
|
|
99
|
+
if (options.logBundleInfo) {
|
|
100
|
+
// Only write the raw input and output to log files if requested.
|
|
101
|
+
// (Raw output in particular can be very large, and it's only used for occasional debugging.)
|
|
102
|
+
await Promise.all([
|
|
103
|
+
rawInput && writeJson(path.join(logOutputPath, `${bundler}-input.json`), rawInput),
|
|
104
|
+
rawOutput && writeJson(path.join(logOutputPath, `${bundler}-output.json`), rawOutput),
|
|
105
|
+
]);
|
|
106
|
+
}
|
|
95
107
|
const result = { bundler, bundlerVersion, inputPath, entries, ...rest };
|
|
96
108
|
if (options.ignoredBundlerWarnings?.length && result.warnings?.length) {
|
|
97
109
|
result.warnings = result.warnings.filter((warning) => !options.ignoredBundlerWarnings?.some((suppressed) => warning.text.includes(suppressed)));
|
package/lib/bundle.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundle.js","sourceRoot":"","sources":["../src/bundle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"bundle.js","sourceRoot":"","sources":["../src/bundle.ts"],"names":[],"mappings":"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","sourcesContent":["import { chooseBundler } from './chooseBundler.js';\nimport type {\n BundleContext,\n BundleMessage,\n BundleOptions,\n Bundler,\n BundleResult,\n BundlerResult,\n CloudpackConfig,\n ModuleType,\n} from '@ms-cloudpack/common-types';\nimport { writeJson } from '@ms-cloudpack/json-utilities';\nimport path from 'path';\nimport { detectModuleType } from '@ms-cloudpack/package-utilities';\nimport { sourceExtensions, typescriptExtensions } from '@ms-cloudpack/path-utilities';\n\n/**\n * Abstracted consumer input to the bundle method for the appropriate bundler. Provides a more\n * advanced api surface.\n */\nexport async function bundle(options: BundleOptions, context: Pick<BundleContext, 'config'>): Promise<BundleResult> {\n const configErrors: BundleMessage[] = [];\n\n if (!options.inputPath?.length) {\n configErrors.push({\n text: 'No input path provided to bundle.',\n source: 'bundle',\n });\n } else if (!path.isAbsolute(options.inputPath)) {\n configErrors.push({\n text: 'Input path must be absolute.',\n source: 'bundle',\n });\n }\n\n if (!Object.keys(options.entries || {}).length) {\n configErrors.push({\n text: `No entries provided to bundle at inputPath \"${options.inputPath}\".`,\n source: 'bundle',\n });\n } else if (Object.entries(options.entries).some(([k, v]) => path.isAbsolute(k) || path.isAbsolute(v))) {\n configErrors.push({\n text: `Entry paths must be relative.`,\n source: 'bundle',\n });\n }\n\n if (options.bundlerOptions && !options.bundler) {\n configErrors.push({\n text: '`bundlerOptions` are bundler-specific, so a `bundler` must be specified.',\n source: 'bundle',\n });\n }\n\n if (configErrors.length) {\n return { inputPath: options.inputPath, errors: configErrors };\n }\n\n // Choose the bundler type and bundle.\n const sourceEntries = Object.values(options.entries).filter((fileName) =>\n sourceExtensions.includes(path.extname(fileName)),\n );\n\n let moduleType: ModuleType = 'esm';\n\n // Check the module type of each entry, short circuiting if we find a cjs or amd file.\n for (const sourceEntry of sourceEntries) {\n const sourceType = await detectModuleType(path.resolve(options.inputPath, sourceEntry));\n if (sourceType === 'amd' || sourceType === 'cjs') {\n moduleType = sourceType;\n break;\n }\n }\n\n const isTypescript = sourceEntries.some((fileName) => typescriptExtensions.includes(path.extname(fileName)));\n\n const bundler = await chooseBundler({\n bundler: options.bundler,\n mode: context.config.mode,\n moduleType,\n isTypescript,\n });\n const bundleFunc = () => bundler.bundle(options, { ...context, moduleType });\n return bundleInternal(bundleFunc, {\n ...options,\n name: bundler.name,\n version: bundler.version,\n logBundleInfo: context.config.logBundleInfo,\n });\n}\n\n/**\n * Wrapper for bundling and normalizing the result. This is separated to allow sharing the logic\n * between normal `bundle()` calls and `result.rebuild()` (if provided by the bundler plugin),\n * and helps with testing.\n */\nexport async function bundleInternal(\n pluginBundle: () => Promise<BundlerResult>,\n options: BundleOptions & Pick<Bundler, 'name' | 'version'> & Pick<CloudpackConfig, 'logBundleInfo'>,\n): Promise<BundleResult> {\n const bundler = options.name;\n const bundlerVersion = await options.version;\n let pluginResult: BundlerResult | undefined = undefined;\n\n try {\n pluginResult = await pluginBundle();\n } catch (e) {\n const errorMessage: BundleMessage = { text: `Exception while bundling: ${e}`, source: bundler };\n if (e instanceof Error && e.stack) {\n // remove the message from the stack\n errorMessage.notes = [{ text: e.stack.includes(e.message) ? e.stack.split(e.message)[1] : '' }];\n }\n pluginResult = {\n errors: [errorMessage],\n };\n }\n\n const { rawInput, rawOutput, rebuild, ...rest } = pluginResult || {};\n const { inputPath, entries, outputPath: logOutputPath = inputPath } = options;\n\n if (rest.errors?.length) {\n // If there are errors, always write them to a log file.\n await writeJson(path.join(logOutputPath, `${bundler}-errors.json`), rest.errors);\n }\n\n if (options.logBundleInfo) {\n // Only write the raw input and output to log files if requested.\n // (Raw output in particular can be very large, and it's only used for occasional debugging.)\n await Promise.all([\n rawInput && writeJson(path.join(logOutputPath, `${bundler}-input.json`), rawInput),\n rawOutput && writeJson(path.join(logOutputPath, `${bundler}-output.json`), rawOutput),\n ]);\n }\n\n const result: BundleResult = { bundler, bundlerVersion, inputPath, entries, ...rest };\n if (options.ignoredBundlerWarnings?.length && result.warnings?.length) {\n result.warnings = result.warnings.filter(\n (warning) => !options.ignoredBundlerWarnings?.some((suppressed) => warning.text.includes(suppressed)),\n );\n }\n\n if (rebuild) {\n // Wrap rebuild with proper result handling\n result.rebuild = () => bundleInternal(rebuild, options);\n }\n\n return result;\n}\n"]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ms-cloudpack/bundler",
|
|
3
|
-
"version": "0.23.
|
|
3
|
+
"version": "0.23.36",
|
|
4
4
|
"description": "An abstraction to bundle source code.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|
|
@@ -14,16 +14,16 @@
|
|
|
14
14
|
}
|
|
15
15
|
},
|
|
16
16
|
"dependencies": {
|
|
17
|
-
"@ms-cloudpack/bundler-ori": "^0.2.
|
|
18
|
-
"@ms-cloudpack/bundler-rollup": "^0.2.
|
|
19
|
-
"@ms-cloudpack/bundler-rspack": "^0.2.
|
|
20
|
-
"@ms-cloudpack/bundler-webpack": "^0.2.
|
|
21
|
-
"@ms-cloudpack/common-types": "^0.24.
|
|
22
|
-
"@ms-cloudpack/config": "^0.33.
|
|
17
|
+
"@ms-cloudpack/bundler-ori": "^0.2.18",
|
|
18
|
+
"@ms-cloudpack/bundler-rollup": "^0.2.12",
|
|
19
|
+
"@ms-cloudpack/bundler-rspack": "^0.2.23",
|
|
20
|
+
"@ms-cloudpack/bundler-webpack": "^0.2.20",
|
|
21
|
+
"@ms-cloudpack/common-types": "^0.24.5",
|
|
22
|
+
"@ms-cloudpack/config": "^0.33.12",
|
|
23
23
|
"@ms-cloudpack/json-utilities": "^0.1.10",
|
|
24
|
-
"@ms-cloudpack/package-utilities": "^11.3.
|
|
24
|
+
"@ms-cloudpack/package-utilities": "^11.3.2",
|
|
25
25
|
"@ms-cloudpack/path-string-parsing": "^1.2.6",
|
|
26
|
-
"@ms-cloudpack/path-utilities": "^3.0.
|
|
26
|
+
"@ms-cloudpack/path-utilities": "^3.0.2"
|
|
27
27
|
},
|
|
28
28
|
"devDependencies": {
|
|
29
29
|
"@ms-cloudpack/eslint-plugin-internal": "^0.0.1",
|