@simplysm/sd-cli 12.5.21 → 12.5.22

package/dist/pkg-builders/client/SdClientBuildRunner.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SdClientBuildRunner.js","sourceRoot":"","sources":["../../../src/pkg-builders/client/SdClientBuildRunner.ts"],"names":[],"mappings":"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"}

package/dist/pkg-builders/client/SdNgBundler.d.ts

@@ -0,0 +1,29 @@
+import { TNormPath } from "@simplysm/sd-core-node";
+import { ISdClientBuilderCordovaConfig } from "../../types/sd-configs.type";
+import { ISdBuildMessage } from "../../types/build.type";
+export declare class SdNgBundler {
+    #private;
+    private _opt;
+    constructor(_opt: {
+        dev: boolean;
+        outputPath: TNormPath;
+        pkgPath: TNormPath;
+        builderType: string;
+        env: Record<string, string> | undefined;
+        cordovaConfig: ISdClientBuilderCordovaConfig | undefined;
+        watchScopePaths: TNormPath[];
+    });
+    markForChanges(filePaths: string[]): void;
+    bundleAsync(): Promise<{
+        watchFileSet: Set<TNormPath>;
+        affectedFileSet: Set<TNormPath>;
+        results: ISdBuildMessage[];
+        emitFileSet: Set<TNormPath>;
+    }>;
+    private _genIndexHtmlAsync;
+    private _copyAssetsAsync;
+    private _genServiceWorkerAsync;
+    private _getAppContext;
+    private _getStyleContext;
+    private _getElectronMainContext;
+}

package/dist/{build-tools → pkg-builders/client}/SdNgBundler.js

@@ -5,7 +5,6 @@ import nodeStdLibBrowser from "node-stdlib-browser";
 import nodeStdLibBrowserPlugin from "node-stdlib-browser/helpers/esbuild/plugin";
 import browserslist from "browserslist";
 import { SdNgBundlerContext } from "./SdNgBundlerContext";
-import { sdNgPlugin } from "../bundle-plugins/sdNgPlugin";
 import { MemoryLoadResultCache } from "@angular/build/src/tools/esbuild/load-result-cache";
 import { convertOutputFile, createOutputFile, transformSupportedBrowsersToTargets, } from "@angular/build/src/tools/esbuild/utils";
 import { BuildOutputFileType, } from "@angular/build/src/tools/esbuild/bundler-context";
@@ -20,11 +19,12 @@ import { SassStylesheetLanguage } from "@angular/build/src/tools/esbuild/stylesh
 import { CssStylesheetLanguage } from "@angular/build/src/tools/esbuild/stylesheets/css-language";
 import { createCssResourcePlugin } from "@angular/build/src/tools/esbuild/stylesheets/css-resource-plugin";
 import { resolveAssets } from "@angular/build/src/utils/resolve-assets";
-import { SdCliPerformanceTimer } from "../utils/SdCliPerformanceTime";
+import { createSdNgPlugin } from "./createSdNgPlugin";
+import { SdCliPerformanceTimer } from "../../utils/SdCliPerformanceTime";
 export class SdNgBundler {
     #logger = Logger.get(["simplysm", "sd-cli", "SdNgBundler"]);
     // private readonly _sourceFileCache = new SourceFileCache(
-    //   path.resolve(this.#opt.pkgPath, ".cache")
+    //   path.resolve(this._opt.pkgPath, ".cache")
     // );
     #modifiedFileSet = new Set();
     #ngResultCache = {
@@ -34,7 +34,6 @@ export class SdNgBundler {
     #styleLoadResultCache = new MemoryLoadResultCache();
     #contexts;
     #outputCache = new Map();
-    #opt;
     #pkgNpmConf;
     #mainFilePath;
     #tsConfigFilePath;
@@ -43,23 +42,26 @@ export class SdNgBundler {
     #indexHtmlFilePath;
     #pkgName;
     #baseHref;
-    // #loadFilePathSet = new Set<string>();
-    constructor(opt) {
-        this.#opt = opt;
-        this.#pkgNpmConf = FsUtil.readJson(path.resolve(opt.pkgPath, "package.json"));
-        this.#mainFilePath = path.resolve(opt.pkgPath, "src/main.ts");
-        this.#tsConfigFilePath = path.resolve(opt.pkgPath, "tsconfig.json");
-        this.#swConfFilePath = path.resolve(opt.pkgPath, "ngsw-config.json");
+    constructor(_opt) {
+        this._opt = _opt;
+        this.#pkgNpmConf = FsUtil.readJson(path.resolve(this._opt.pkgPath, "package.json"));
+        this.#mainFilePath = path.resolve(this._opt.pkgPath, "src/main.ts");
+        this.#tsConfigFilePath = path.resolve(this._opt.pkgPath, "tsconfig.json");
+        this.#swConfFilePath = path.resolve(this._opt.pkgPath, "ngsw-config.json");
         this.#browserTarget = transformSupportedBrowsersToTargets(browserslist(["Chrome > 78"]));
-        this.#indexHtmlFilePath = path.resolve(opt.pkgPath, "src/index.html");
-        this.#pkgName = path.basename(opt.pkgPath);
+        this.#indexHtmlFilePath = path.resolve(this._opt.pkgPath, "src/index.html");
+        this.#pkgName = path.basename(this._opt.pkgPath);
         this.#baseHref =
-            opt.builderType === "web" ? `/${this.#pkgName}/` : opt.dev ? `/${this.#pkgName}/${opt.builderType}/` : ``;
+            this._opt.builderType === "web"
+                ? `/${this.#pkgName}/`
+                : this._opt.dev
+                    ? `/${this.#pkgName}/${this._opt.builderType}/`
+                    : ``;
     }
     markForChanges(filePaths) {
         for (const filePath of filePaths) {
-            this.#modifiedFileSet.add(path.normalize(filePath));
-            this.#styleLoadResultCache.invalidate(path.normalize(filePath));
+            this.#modifiedFileSet.add(PathUtil.norm(filePath));
+            this.#styleLoadResultCache.invalidate(PathUtil.norm(filePath));
         }
         // this._sourceFileCache.invalidate(filePaths);
     }
@@ -70,12 +72,12 @@ export class SdNgBundler {
             this.#contexts = perf.run("get contexts", () => [
                 this._getAppContext(),
                 this._getStyleContext(),
-                ...(this.#opt.builderType === "electron" ? [this._getElectronMainContext()] : []),
+                ...(this._opt.builderType === "electron" ? [this._getElectronMainContext()] : []),
             ]);
         }
         this.#debug(`build...`);
         const bundlingResults = await perf.run("build", async () => {
-            return await this.#contexts.mapAsync(async (ctx, i) => await ctx.bundleAsync());
+            return await this.#contexts.mapAsync(async (ctx) => await ctx.bundleAsync());
         });
         //-- results
         const results = bundlingResults.mapMany((bundlingResult) => bundlingResult.results);
@@ -93,7 +95,7 @@ export class SdNgBundler {
         }
         const assetFiles = [];
         //-- cordova empty
-        if (this.#opt.builderType === "cordova" && this.#opt.cordovaConfig?.plugins) {
+        if (this._opt.builderType === "cordova" && this._opt.cordovaConfig?.plugins) {
             outputFiles.push(createOutputFile("cordova-empty.js", "export default {};", BuildOutputFileType.Root));
         }
         this.#debug(`create index.html...`);
@@ -106,8 +108,8 @@ export class SdNgBundler {
                     char: undefined,
                     code: undefined,
                     severity: "warning",
-                    message: `(gen-index) ${warning}`,
-                    type: "build",
+                    message: `${warning}`,
+                    type: "gen-index",
                 });
             }
             for (const error of genIndexHtmlResult.errors) {
@@ -117,8 +119,8 @@ export class SdNgBundler {
                     char: undefined,
                     code: undefined,
                     severity: "error",
-                    message: `(gen-index) ${error}`,
-                    type: "build",
+                    message: `${error}`,
+                    type: "gen-index",
                 });
             }
             outputFiles.push(createOutputFile("index.html", genIndexHtmlResult.csrContent, BuildOutputFileType.Root));
@@ -127,8 +129,8 @@ export class SdNgBundler {
             //-- copy assets
             assetFiles.push(...(await this._copyAssetsAsync()));
             //-- extract 3rdpartylicenses
-            if (!this.#opt.dev) {
-                outputFiles.push(createOutputFile("3rdpartylicenses.txt", await extractLicenses(metafile, this.#opt.pkgPath), BuildOutputFileType.Root));
+            if (!this._opt.dev) {
+                outputFiles.push(createOutputFile("3rdpartylicenses.txt", await extractLicenses(metafile, this._opt.pkgPath), BuildOutputFileType.Root));
             }
         });
         //-- service worker
@@ -147,42 +149,45 @@ export class SdNgBundler {
                         char: undefined,
                         code: undefined,
                         severity: "error",
-                        message: `(gen-sw) ${err.toString()}`,
-                        type: "build",
+                        message: `${err.toString()}`,
+                        type: "gen-sw",
                     });
                 }
             });
         }
         //-- write
         this.#debug(`write output files...(${outputFiles.length})`);
-        await perf.run("write output file", async () => {
+        const emitFileSet = new Set();
+        perf.run("write output file", () => {
             for (const outputFile of outputFiles) {
-                const distFilePath = path.resolve(this.#opt.outputPath, outputFile.path);
+                const distFilePath = PathUtil.norm(this._opt.outputPath, outputFile.path);
                 const prev = this.#outputCache.get(distFilePath);
                 if (prev !== Buffer.from(outputFile.contents).toString("base64")) {
-                    await FsUtil.writeFileAsync(distFilePath, outputFile.contents);
+                    FsUtil.writeFile(distFilePath, outputFile.contents);
                     this.#outputCache.set(distFilePath, Buffer.from(outputFile.contents).toString("base64"));
+                    emitFileSet.add(PathUtil.norm(outputFile.path));
                 }
             }
             for (const assetFile of assetFiles) {
-                const prev = this.#outputCache.get(assetFile.source);
+                const prev = this.#outputCache.get(PathUtil.norm(assetFile.source));
                 const curr = FsUtil.lstat(assetFile.source).mtime.getTime();
                 if (prev !== curr) {
-                    await FsUtil.copyAsync(assetFile.source, path.resolve(this.#opt.outputPath, assetFile.destination));
-                    this.#outputCache.set(assetFile.source, curr);
+                    FsUtil.copy(assetFile.source, path.resolve(this._opt.outputPath, assetFile.destination));
+                    this.#outputCache.set(PathUtil.norm(assetFile.source), curr);
+                    emitFileSet.add(PathUtil.norm(assetFile.destination));
                 }
             }
         });
         this.#debug(perf.toString());
         return {
-            program: this.#ngResultCache.program,
             watchFileSet: new Set([
                 ...this.#ngResultCache.watchFileSet,
-                ...this.#styleLoadResultCache.watchFiles,
-                this.#indexHtmlFilePath,
+                ...this.#styleLoadResultCache.watchFiles.map((item) => PathUtil.norm(item)),
+                PathUtil.norm(this.#indexHtmlFilePath),
             ]),
             affectedFileSet: this.#ngResultCache.affectedFileSet,
             results,
+            emitFileSet: emitFileSet,
         };
     }
     async _genIndexHtmlAsync(outputFiles, initialFiles) {
@@ -202,13 +207,13 @@ export class SdNgBundler {
                 ["styles", false],
                 ["vendor", true],
                 ["main", true],
-                ...(this.#opt.builderType === "cordova" ? [["cordova-entry", true]] : []),
+                ...(this._opt.builderType === "cordova" ? [["cordova-entry", true]] : []),
             ],
             optimization: {
-                scripts: !this.#opt.dev,
-                fonts: { inline: !this.#opt.dev },
+                scripts: !this._opt.dev,
+                fonts: { inline: !this._opt.dev },
                 styles: {
-                    minify: !this.#opt.dev,
+                    minify: !this._opt.dev,
                     inlineCritical: false,
                 },
             },
@@ -216,7 +221,7 @@ export class SdNgBundler {
         });
         indexHtmlGenerator.readAsset = readAsset;
         const hints = [];
-        if (!this.#opt.dev) {
+        if (!this._opt.dev) {
             for (const [key, value] of initialFiles) {
                 if (value.entrypoint) {
                     continue;
@@ -241,7 +246,7 @@ export class SdNgBundler {
             })),
             hints,
         });
-        if (this.#opt.dev) {
+        if (this._opt.dev) {
             return transformResult;
         }
         else {
@@ -266,9 +271,9 @@ export class SdNgBundler {
             { input: "src", glob: "manifest.webmanifest", output: "" },
             { input: "src", glob: "manifest.json", output: "" },
             { input: "src/assets", glob: "**/*", output: "assets" },
-            ...(this.#opt.dev ? [{ input: "src/assets-dev", glob: "**/*", output: "assets-dev" }] : []),
-            ...(this.#opt.dev && this.#opt.builderType === "cordova"
-                ? Object.keys(this.#opt.cordovaConfig?.platform ?? { browser: {} }).mapMany((platform) => [
+            ...(this._opt.dev ? [{ input: "src/assets-dev", glob: "**/*", output: "assets-dev" }] : []),
+            ...(this._opt.dev && this._opt.builderType === "cordova"
+                ? Object.keys(this._opt.cordovaConfig?.platform ?? { browser: {} }).mapMany((platform) => [
                     {
                         input: `.cordova/platforms/${platform}/platform_www/plugins`,
                         glob: "**/*",
@@ -291,15 +296,15 @@ export class SdNgBundler {
                     },
                 ])
                 : []),
-        ], this.#opt.pkgPath);
+        ], this._opt.pkgPath);
     }
     async _genServiceWorkerAsync(outputFiles, assetFiles) {
-        return await augmentAppWithServiceWorkerEsbuild(this.#opt.pkgPath, this.#swConfFilePath, this.#baseHref, "index.html", outputFiles, assetFiles);
+        return await augmentAppWithServiceWorkerEsbuild(this._opt.pkgPath, this.#swConfFilePath, this.#baseHref, "index.html", outputFiles, assetFiles);
     }
     _getAppContext() {
-        const workerEntries = FsUtil.glob(path.resolve(this.#opt.pkgPath, "src/workers/*.ts")).toObject((p) => "worker/" + path.basename(p, path.extname(p)));
-        return new SdNgBundlerContext(this.#opt.pkgPath, {
-            absWorkingDir: this.#opt.pkgPath,
+        const workerEntries = FsUtil.glob(path.resolve(this._opt.pkgPath, "src/workers/*.ts")).toObject((p) => "worker/" + path.basename(p, path.extname(p)));
+        return new SdNgBundlerContext(this._opt.pkgPath, {
+            absWorkingDir: this._opt.pkgPath,
             bundle: true,
             keepNames: true,
             format: "esm",
@@ -307,30 +312,30 @@ export class SdNgBundler {
             conditions: ["es2020", "es2015", "module"],
             resolveExtensions: [".js", ".mjs", ".cjs", ".ts"],
             metafile: true,
-            legalComments: this.#opt.dev ? "eof" : "none",
+            legalComments: this._opt.dev ? "eof" : "none",
             logLevel: "silent",
-            minifyIdentifiers: !this.#opt.dev,
-            minifySyntax: !this.#opt.dev,
-            minifyWhitespace: !this.#opt.dev,
+            minifyIdentifiers: !this._opt.dev,
+            minifySyntax: !this._opt.dev,
+            minifyWhitespace: !this._opt.dev,
             pure: ["forwardRef"],
-            outdir: this.#opt.pkgPath,
+            outdir: this._opt.pkgPath,
             outExtension: undefined,
-            sourcemap: true, //this.#opt.dev,
+            sourcemap: true, //this._opt.dev,
             splitting: true,
             chunkNames: "[name]-[hash]",
             tsconfig: this.#tsConfigFilePath,
             write: false,
             preserveSymlinks: false,
             define: {
-                ...(!this.#opt.dev ? { ngDevMode: "false" } : {}),
+                ...(!this._opt.dev ? { ngDevMode: "false" } : {}),
                 "ngJitMode": "false",
                 "global": "global",
                 "process": "process",
                 "Buffer": "Buffer",
                 "process.env.SD_VERSION": JSON.stringify(this.#pkgNpmConf.version),
-                "process.env.NODE_ENV": JSON.stringify(this.#opt.dev ? "development" : "production"),
-                ...(this.#opt.env
-                    ? Object.keys(this.#opt.env).toObject((key) => `process.env.${key}`, (key) => JSON.stringify(this.#opt.env[key]))
+                "process.env.NODE_ENV": JSON.stringify(this._opt.dev ? "development" : "production"),
+                ...(this._opt.env
+                    ? Object.keys(this._opt.env).toObject((key) => `process.env.${key}`, (key) => JSON.stringify(this._opt.env[key]))
                     : {}),
             },
             platform: "browser",
@@ -339,8 +344,8 @@ export class SdNgBundler {
             entryPoints: {
                 main: this.#mainFilePath,
                 // polyfills: 'angular:polyfills',
-                polyfills: path.resolve(this.#opt.pkgPath, "src/polyfills.ts"),
-                ...(this.#opt.builderType === "cordova"
+                polyfills: path.resolve(this._opt.pkgPath, "src/polyfills.ts"),
+                ...(this._opt.builderType === "cordova"
                     ? {
                         "cordova-entry": path.resolve(path.dirname(fileURLToPath(import.meta.url)), `../../lib/cordova-entry.js`),
                     }
@@ -379,12 +384,12 @@ export class SdNgBundler {
             },
             inject: [PathUtil.posix(fileURLToPath(import.meta.resolve("node-stdlib-browser/helpers/esbuild/shim")))],
             plugins: [
-                ...(this.#opt.builderType === "cordova" && this.#opt.cordovaConfig?.plugins
+                ...(this._opt.builderType === "cordova" && this._opt.cordovaConfig?.plugins
                     ? [
                         {
                             name: "cordova:plugin-empty",
                             setup: ({ onResolve }) => {
-                                onResolve({ filter: new RegExp("(" + this.#opt.cordovaConfig.plugins.join("|") + ")") }, () => {
+                                onResolve({ filter: new RegExp("(" + this._opt.cordovaConfig.plugins.join("|") + ")") }, () => {
                                     return {
                                         path: `./cordova-empty.js`,
                                         external: true,
@@ -399,19 +404,19 @@ export class SdNgBundler {
                 //   loadContent: () => ({
                 //     contents: `import "./src/polyfills.ts";`,
                 //     loader: 'js',
-                //     resolveDir: this.#opt.pkgPath
+                //     resolveDir: this._opt.pkgPath
                 //   })
                 // }) as esbuild.Plugin,
                 createSourcemapIgnorelistPlugin(),
-                sdNgPlugin({
+                createSdNgPlugin({
                     modifiedFileSet: this.#modifiedFileSet,
-                    dev: this.#opt.dev,
-                    pkgPath: this.#opt.pkgPath,
+                    dev: this._opt.dev,
+                    pkgPath: this._opt.pkgPath,
                     result: this.#ngResultCache,
-                    watchScopePaths: this.#opt.watchScopePaths,
+                    watchScopePaths: this._opt.watchScopePaths,
                 }),
                 // createCompilerPlugin({
-                //   sourcemap: this.#opt.dev,
+                //   sourcemap: this._opt.dev,
                 //   tsconfig: this._tsConfigFilePath,
                 //   jit: false,
                 //   advancedOptimizations: true,
@@ -419,11 +424,11 @@ export class SdNgBundler {
                 //   fileReplacements: undefined,
                 //   sourceFileCache: this._sourceFileCache,
                 //   loadResultCache: this._sourceFileCache.loadResultCache,
-                //   incremental: this.#opt.dev
+                //   incremental: this._opt.dev
                 // }, {
-                //   workspaceRoot: this.#opt.pkgPath,
-                //   optimization: !this.#opt.dev,
-                //   sourcemap: this.#opt.dev ? 'inline' : false,
+                //   workspaceRoot: this._opt.pkgPath,
+                //   optimization: !this._opt.dev,
+                //   sourcemap: this._opt.dev ? 'inline' : false,
                 //   outputNames: {bundles: '[name]', media: 'media/[name]'},
                 //   includePaths: [],
                 //   externalDependencies: [],
@@ -447,19 +452,19 @@ export class SdNgBundler {
     }
     _getStyleContext() {
         const pluginFactory = new StylesheetPluginFactory({
-            sourcemap: true, //this.#opt.dev,
+            sourcemap: true, //this._opt.dev,
             includePaths: [],
         }, this.#styleLoadResultCache);
-        return new SdNgBundlerContext(this.#opt.pkgPath, {
-            absWorkingDir: this.#opt.pkgPath,
+        return new SdNgBundlerContext(this._opt.pkgPath, {
+            absWorkingDir: this._opt.pkgPath,
             bundle: true,
             entryNames: "[name]",
             assetNames: "media/[name]",
             logLevel: "silent",
-            minify: !this.#opt.dev,
+            minify: !this._opt.dev,
             metafile: true,
-            sourcemap: true, //this.#opt.dev,
-            outdir: this.#opt.pkgPath,
+            sourcemap: true, //this._opt.dev,
+            outdir: this._opt.pkgPath,
             write: false,
             platform: "browser",
             target: this.#browserTarget,
@@ -467,10 +472,10 @@ export class SdNgBundler {
             external: [],
             conditions: ["style", "sass"],
             mainFields: ["style", "sass"],
-            legalComments: !this.#opt.dev ? "none" : "eof",
+            legalComments: !this._opt.dev ? "none" : "eof",
             entryPoints: {
                 // styles: 'angular:styles/global;styles'
-                styles: path.resolve(this.#opt.pkgPath, "src/styles.scss"),
+                styles: path.resolve(this._opt.pkgPath, "src/styles.scss"),
             },
             plugins: [
                 // createVirtualModulePlugin({
@@ -479,7 +484,7 @@ export class SdNgBundler {
                 //   loadContent: () => ({
                 //     contents: `@import 'src/styles.scss';`,
                 //     loader: 'css',
-                //     resolveDir: this.#opt.pkgPath
+                //     resolveDir: this._opt.pkgPath
                 //   }),
                 // }) as esbuild.Plugin,
                 pluginFactory.create(SassStylesheetLanguage),
@@ -489,39 +494,39 @@ export class SdNgBundler {
         });
     }
     _getElectronMainContext() {
-        return new SdNgBundlerContext(this.#opt.pkgPath, {
-            absWorkingDir: this.#opt.pkgPath,
+        return new SdNgBundlerContext(this._opt.pkgPath, {
+            absWorkingDir: this._opt.pkgPath,
             bundle: true,
             entryNames: "[name]",
             assetNames: "media/[name]",
             conditions: ["es2020", "es2015", "module"],
             resolveExtensions: [".js", ".mjs", ".cjs", ".ts"],
             metafile: true,
-            legalComments: this.#opt.dev ? "eof" : "none",
+            legalComments: this._opt.dev ? "eof" : "none",
             logLevel: "silent",
-            minify: !this.#opt.dev,
-            outdir: this.#opt.pkgPath,
-            sourcemap: true, //this.#opt.dev,
+            minify: !this._opt.dev,
+            outdir: this._opt.pkgPath,
+            sourcemap: true, //this._opt.dev,
             tsconfig: this.#tsConfigFilePath,
             write: false,
             preserveSymlinks: false,
             external: ["electron"],
             define: {
-                ...(!this.#opt.dev ? { ngDevMode: "false" } : {}),
+                ...(!this._opt.dev ? { ngDevMode: "false" } : {}),
                 "process.env.SD_VERSION": JSON.stringify(this.#pkgNpmConf.version),
-                "process.env.NODE_ENV": JSON.stringify(this.#opt.dev ? "development" : "production"),
-                ...(this.#opt.env
-                    ? Object.keys(this.#opt.env).toObject((key) => `process.env.${key}`, (key) => JSON.stringify(this.#opt.env[key]))
+                "process.env.NODE_ENV": JSON.stringify(this._opt.dev ? "development" : "production"),
+                ...(this._opt.env
+                    ? Object.keys(this._opt.env).toObject((key) => `process.env.${key}`, (key) => JSON.stringify(this._opt.env[key]))
                     : {}),
             },
             platform: "node",
             entryPoints: {
-                "electron-main": path.resolve(this.#opt.pkgPath, "src/electron-main.ts"),
+                "electron-main": path.resolve(this._opt.pkgPath, "src/electron-main.ts"),
             },
         });
     }
     #debug(...msg) {
-        this.#logger.debug(`[${path.basename(this.#opt.pkgPath)}]`, ...msg);
+        this.#logger.debug(`[${path.basename(this._opt.pkgPath)}]`, ...msg);
     }
 }
 //# sourceMappingURL=SdNgBundler.js.map

package/dist/pkg-builders/client/SdNgBundler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SdNgBundler.js","sourceRoot":"","sources":["../../../src/pkg-builders/client/SdNgBundler.ts"],"names":[],"mappings":"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"}

package/dist/{build-tools → pkg-builders/client}/SdNgBundlerContext.d.ts

@@ -1,5 +1,4 @@
 import esbuild from "esbuild";
-import { ISdCliPackageBuildResult } from "../commons";
 import { InitialFileRecord } from "@angular/build/src/tools/esbuild/bundler-context";
 export declare class SdNgBundlerContext {
     #private;
@@ -8,7 +7,7 @@ export declare class SdNgBundlerContext {
     private _context?;
     constructor(_pkgPath: string, _esbuildOptions: esbuild.BuildOptions);
     bundleAsync(): Promise<{
-        results: ISdCliPackageBuildResult[];
+        results: import("../..").ISdBuildMessage[];
         initialFiles: Map<string, InitialFileRecord>;
         outputFiles: esbuild.OutputFile[] | undefined;
         metafile: esbuild.Metafile | undefined;