@granite-js/plugin-core 0.1.10 → 0.1.11

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @granite-js/plugin-core
 
+## 0.1.11
+
+### Patch Changes
+
+- d3a2b58: improve resolver plugin
+  - @granite-js/utils@0.1.11
+
 ## 0.1.10
 
 ### Patch Changes

package/dist/index.cjs

@@ -324,6 +324,15 @@ function createPluginContext() {
 	return context;
 }
 
+//#endregion
+//#region src/utils/buildResult.ts
+function isBuildSuccess(result) {
+	return "bundle" in result;
+}
+function isBuildFailure(result) {
+	return !("bundle" in result);
+}
+
 //#endregion
 //#region src/config/graniteGlobals.ts
 function prepareGraniteGlobalsScript(config) {
@@ -479,6 +488,8 @@ exports.createPluginContext = createPluginContext;
 exports.createPluginHooksDriver = createPluginHooksDriver;
 exports.defineConfig = defineConfig;
 exports.flattenPlugins = flattenPlugins;
+exports.isBuildFailure = isBuildFailure;
+exports.isBuildSuccess = isBuildSuccess;
 exports.loadConfig = loadConfig;
 exports.mergeBuildConfigs = mergeBuildConfigs;
 exports.mergeConfig = mergeConfig;

package/dist/index.d.cts

@@ -5,6 +5,7 @@ import { HandleFunction } from "connect";
 import { FastifyPluginAsync, FastifyPluginCallback } from "fastify";
 import * as babel from "@babel/core";
 import * as z from "zod";
+import { BuildFailureResult as BuildFailureResult$1, BuildResult as BuildResult$1, BuildSuccessResult as BuildSuccessResult$1 } from "@granite-js/plugin-core";
 
 //#region src/types/BuildConfig.d.ts
 interface BuildConfig {
@@ -84,7 +85,7 @@ interface ResolverConfig {
    */
   protocols?: ProtocolConfig;
 }
-interface AliasConfig {
+interface AliasConfig extends Pick<esbuild$1.ResolveOptions, 'importer' | 'kind' | 'resolveDir' | 'with'> {
   /**
    * Replacement target module path
    */
@@ -92,10 +93,7 @@ interface AliasConfig {
   /**
    * Replacement module path or function that returns module path
    */
-  to: string | ((context: {
-    args: esbuild$1.OnResolveArgs;
-    resolve: esbuild$1.PluginBuild['resolve'];
-  }) => string | Promise<string>);
+  to: ResolveResult | AliasResolver;
   /**
    * - `false`: (default) replace even if subpath exists (`^name(?:$|/)`)
    * - `true`: replace only if the target is exactly matched (`^name$`)
@@ -123,6 +121,14 @@ interface AliasConfig {
    */
   exact?: boolean;
 }
+type ResolveResult = string | ResolveResultWithOptions;
+interface ResolveResultWithOptions extends Omit<esbuild$1.ResolveOptions, 'pluginName' | 'pluginData'> {
+  path: string;
+}
+type AliasResolver = (context: {
+  args: esbuild$1.OnResolveArgs;
+  resolve: esbuild$1.PluginBuild['resolve'];
+}) => ResolveResult | Promise<ResolveResult>;
 /**
  * Custom protocol resolve configuration
  *
@@ -201,7 +207,8 @@ interface BabelConfig {
   plugins?: (string | [string, any])[];
 } //#endregion
 //#region src/types/BuildResult.d.ts
-interface BuildResult extends esbuild.BuildResult {
+type BuildResult = BuildSuccessResult | BuildFailureResult;
+interface BuildSuccessResult extends esbuild.BuildResult {
   bundle: BundleData;
   outfile: BuildConfig['outfile'];
   sourcemapOutfile: NonNullable<BuildConfig['sourcemapOutfile']>;
@@ -211,6 +218,11 @@ interface BuildResult extends esbuild.BuildResult {
   duration: number;
   size: number;
 }
+interface BuildFailureResult extends esbuild.BuildResult {
+  platform: BuildConfig['platform'];
+  extra: BuildConfig['extra'];
+  duration: number;
+}
 interface BundleData {
   source: esbuild.OutputFile;
   sourcemap: esbuild.OutputFile;
@@ -591,6 +603,11 @@ declare function createPluginHooksDriver(config: CompleteGraniteConfig): {
 };
 declare function createPluginContext(): PluginContext;
 
+//#endregion
+//#region src/utils/buildResult.d.ts
+declare function isBuildSuccess(result: BuildResult$1): result is BuildSuccessResult$1;
+declare function isBuildFailure(result: BuildResult$1): result is BuildFailureResult$1;
+
 //#endregion
 //#region src/config/defineConfig.d.ts
 /**
@@ -663,4 +680,4 @@ interface LoadConfigOptions {
 declare const loadConfig: (options?: LoadConfigOptions) => Promise<CompleteGraniteConfig>;
 
 //#endregion
-export { AdditionalMetroConfig, AliasConfig, BabelConfig, BuildConfig, BuildResult, BundleData, CompleteGraniteConfig, DevServerConfig, EsbuildConfig, GraniteConfig, GranitePlugin, GranitePluginBuildPostHandler, GranitePluginBuildPreHandler, GranitePluginConfig, GranitePluginCore, GranitePluginDevHandlerArgs, GranitePluginDevPostHandler, GranitePluginDevPreHandler, GranitePluginHooks, GranitePluginPostHandlerArgs, GranitePluginPreHandlerArgs, MetroDevServerConfig, MetroMiddleware, Middleware, ParsedGraniteConfig, PluginBuildConfig, PluginConfig, PluginContext, PluginInput, PluginMetroConfig, PluginResolvable, ProtocolConfig, ResolverConfig, SwcConfig, TransformAsync, TransformSync, TransformerConfig, createContext, createPluginContext, createPluginHooksDriver, defineConfig, flattenPlugins, loadConfig, mergeBuildConfigs, mergeConfig, pluginConfigSchema, resolvePlugins };
+export { AdditionalMetroConfig, AliasConfig, AliasResolver, BabelConfig, BuildConfig, BuildFailureResult, BuildResult, BuildSuccessResult, BundleData, CompleteGraniteConfig, DevServerConfig, EsbuildConfig, GraniteConfig, GranitePlugin, GranitePluginBuildPostHandler, GranitePluginBuildPreHandler, GranitePluginConfig, GranitePluginCore, GranitePluginDevHandlerArgs, GranitePluginDevPostHandler, GranitePluginDevPreHandler, GranitePluginHooks, GranitePluginPostHandlerArgs, GranitePluginPreHandlerArgs, MetroDevServerConfig, MetroMiddleware, Middleware, ParsedGraniteConfig, PluginBuildConfig, PluginConfig, PluginContext, PluginInput, PluginMetroConfig, PluginResolvable, ProtocolConfig, ResolveResult, ResolveResultWithOptions, ResolverConfig, SwcConfig, TransformAsync, TransformSync, TransformerConfig, createContext, createPluginContext, createPluginHooksDriver, defineConfig, flattenPlugins, isBuildFailure, isBuildSuccess, loadConfig, mergeBuildConfigs, mergeConfig, pluginConfigSchema, resolvePlugins };

package/dist/index.d.ts

@@ -5,6 +5,7 @@ import * as esbuild from "esbuild";
 import { HandleFunction } from "connect";
 import { FastifyPluginAsync, FastifyPluginCallback } from "fastify";
 import * as babel from "@babel/core";
+import { BuildFailureResult as BuildFailureResult$1, BuildResult as BuildResult$1, BuildSuccessResult as BuildSuccessResult$1 } from "@granite-js/plugin-core";
 
 //#region src/types/BuildConfig.d.ts
 interface BuildConfig {
@@ -84,7 +85,7 @@ interface ResolverConfig {
    */
   protocols?: ProtocolConfig;
 }
-interface AliasConfig {
+interface AliasConfig extends Pick<esbuild$1.ResolveOptions, 'importer' | 'kind' | 'resolveDir' | 'with'> {
   /**
    * Replacement target module path
    */
@@ -92,10 +93,7 @@ interface AliasConfig {
   /**
    * Replacement module path or function that returns module path
    */
-  to: string | ((context: {
-    args: esbuild$1.OnResolveArgs;
-    resolve: esbuild$1.PluginBuild['resolve'];
-  }) => string | Promise<string>);
+  to: ResolveResult | AliasResolver;
   /**
    * - `false`: (default) replace even if subpath exists (`^name(?:$|/)`)
    * - `true`: replace only if the target is exactly matched (`^name$`)
@@ -123,6 +121,14 @@ interface AliasConfig {
    */
   exact?: boolean;
 }
+type ResolveResult = string | ResolveResultWithOptions;
+interface ResolveResultWithOptions extends Omit<esbuild$1.ResolveOptions, 'pluginName' | 'pluginData'> {
+  path: string;
+}
+type AliasResolver = (context: {
+  args: esbuild$1.OnResolveArgs;
+  resolve: esbuild$1.PluginBuild['resolve'];
+}) => ResolveResult | Promise<ResolveResult>;
 /**
  * Custom protocol resolve configuration
  *
@@ -201,7 +207,8 @@ interface BabelConfig {
   plugins?: (string | [string, any])[];
 } //#endregion
 //#region src/types/BuildResult.d.ts
-interface BuildResult extends esbuild.BuildResult {
+type BuildResult = BuildSuccessResult | BuildFailureResult;
+interface BuildSuccessResult extends esbuild.BuildResult {
   bundle: BundleData;
   outfile: BuildConfig['outfile'];
   sourcemapOutfile: NonNullable<BuildConfig['sourcemapOutfile']>;
@@ -211,6 +218,11 @@ interface BuildResult extends esbuild.BuildResult {
   duration: number;
   size: number;
 }
+interface BuildFailureResult extends esbuild.BuildResult {
+  platform: BuildConfig['platform'];
+  extra: BuildConfig['extra'];
+  duration: number;
+}
 interface BundleData {
   source: esbuild.OutputFile;
   sourcemap: esbuild.OutputFile;
@@ -591,6 +603,11 @@ declare function createPluginHooksDriver(config: CompleteGraniteConfig): {
 };
 declare function createPluginContext(): PluginContext;
 
+//#endregion
+//#region src/utils/buildResult.d.ts
+declare function isBuildSuccess(result: BuildResult$1): result is BuildSuccessResult$1;
+declare function isBuildFailure(result: BuildResult$1): result is BuildFailureResult$1;
+
 //#endregion
 //#region src/config/defineConfig.d.ts
 /**
@@ -663,4 +680,4 @@ interface LoadConfigOptions {
 declare const loadConfig: (options?: LoadConfigOptions) => Promise<CompleteGraniteConfig>;
 
 //#endregion
-export { AdditionalMetroConfig, AliasConfig, BabelConfig, BuildConfig, BuildResult, BundleData, CompleteGraniteConfig, DevServerConfig, EsbuildConfig, GraniteConfig, GranitePlugin, GranitePluginBuildPostHandler, GranitePluginBuildPreHandler, GranitePluginConfig, GranitePluginCore, GranitePluginDevHandlerArgs, GranitePluginDevPostHandler, GranitePluginDevPreHandler, GranitePluginHooks, GranitePluginPostHandlerArgs, GranitePluginPreHandlerArgs, MetroDevServerConfig, MetroMiddleware, Middleware, ParsedGraniteConfig, PluginBuildConfig, PluginConfig, PluginContext, PluginInput, PluginMetroConfig, PluginResolvable, ProtocolConfig, ResolverConfig, SwcConfig, TransformAsync, TransformSync, TransformerConfig, createContext, createPluginContext, createPluginHooksDriver, defineConfig, flattenPlugins, loadConfig, mergeBuildConfigs, mergeConfig, pluginConfigSchema, resolvePlugins };
+export { AdditionalMetroConfig, AliasConfig, AliasResolver, BabelConfig, BuildConfig, BuildFailureResult, BuildResult, BuildSuccessResult, BundleData, CompleteGraniteConfig, DevServerConfig, EsbuildConfig, GraniteConfig, GranitePlugin, GranitePluginBuildPostHandler, GranitePluginBuildPreHandler, GranitePluginConfig, GranitePluginCore, GranitePluginDevHandlerArgs, GranitePluginDevPostHandler, GranitePluginDevPreHandler, GranitePluginHooks, GranitePluginPostHandlerArgs, GranitePluginPreHandlerArgs, MetroDevServerConfig, MetroMiddleware, Middleware, ParsedGraniteConfig, PluginBuildConfig, PluginConfig, PluginContext, PluginInput, PluginMetroConfig, PluginResolvable, ProtocolConfig, ResolveResult, ResolveResultWithOptions, ResolverConfig, SwcConfig, TransformAsync, TransformSync, TransformerConfig, createContext, createPluginContext, createPluginHooksDriver, defineConfig, flattenPlugins, isBuildFailure, isBuildSuccess, loadConfig, mergeBuildConfigs, mergeConfig, pluginConfigSchema, resolvePlugins };

package/dist/index.js

@@ -301,6 +301,15 @@ function createPluginContext() {
 	return context;
 }
 
+//#endregion
+//#region src/utils/buildResult.ts
+function isBuildSuccess(result) {
+	return "bundle" in result;
+}
+function isBuildFailure(result) {
+	return !("bundle" in result);
+}
+
 //#endregion
 //#region src/config/graniteGlobals.ts
 function prepareGraniteGlobalsScript(config) {
@@ -451,4 +460,4 @@ function getConfigExplorer(options) {
 }
 
 //#endregion
-export { createContext, createPluginContext, createPluginHooksDriver, defineConfig, flattenPlugins, loadConfig, mergeBuildConfigs, mergeConfig, pluginConfigSchema, resolvePlugins };
+export { createContext, createPluginContext, createPluginHooksDriver, defineConfig, flattenPlugins, isBuildFailure, isBuildSuccess, loadConfig, mergeBuildConfigs, mergeConfig, pluginConfigSchema, resolvePlugins };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@granite-js/plugin-core",
   "type": "module",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "description": "The core plugin module for Granite",
   "scripts": {
     "prepack": "yarn build",
@@ -31,7 +31,7 @@
     "vitest": "^3.0.9"
   },
   "dependencies": {
-    "@granite-js/utils": "0.1.10",
+    "@granite-js/utils": "0.1.11",
     "@swc/core": "1.5.24",
     "@types/babel__core": "^7",
     "@types/connect": "^3",