@granite-js/plugin-core 1.0.1 → 1.0.3

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @granite-js/plugin-core
 
+## 1.0.3
+
+### Patch Changes
+
+- 7694332: chore: RN 0.84-rc.5 -> RN 0.84 bump up
+- Updated dependencies [7694332]
+  - @granite-js/utils@1.0.3
+
+## 1.0.2
+
+### Patch Changes
+
+- d4beb3b: expose context to dynamic config plugin
+- b325495: fix(react-native-svg): buffer deps
+- Updated dependencies [b325495]
+  - @granite-js/utils@1.0.2
+
 ## 1.0.1
 
 ### Patch Changes

package/dist/index.cjs

@@ -247,10 +247,14 @@ function mergeTransformer(source, target) {
 
 //#endregion
 //#region src/utils/mergeConfig.ts
-async function mergeConfig(base, ...configs) {
-	if (!(base || configs.length)) return;
-	return configs.reduce(async (acc, curr) => {
-		const [resolvedAcc, resolvedCurr] = await Promise.all([acc, resolveDynamicConfig(curr)]);
+async function mergeConfig({ configs, context }) {
+	const [base, ...rest] = configs;
+	if (base == null) return;
+	if (rest.length === 0) return resolveDynamicConfig(base, context);
+	return rest.reduce(async (acc, curr) => {
+		const resolved = await Promise.all([acc, resolveDynamicConfig(curr, context)]);
+		const resolvedAcc = resolved[0] ?? {};
+		const resolvedCurr = resolved[1] ?? {};
 		return {
 			...resolvedAcc,
 			...resolvedCurr,
@@ -262,12 +266,12 @@ async function mergeConfig(base, ...configs) {
 			devServer: mergeDevServer(resolvedAcc?.devServer, resolvedCurr?.devServer),
 			metro: mergeMetro(resolvedAcc?.metro, resolvedCurr?.metro),
 			extra: mergeExtra(resolvedAcc?.extra, resolvedCurr?.extra),
-			reactNativePath: resolvedCurr.reactNativePath ?? resolvedAcc.reactNativePath
+			reactNativePath: resolvedCurr?.reactNativePath ?? resolvedAcc?.reactNativePath
 		};
-	}, resolveDynamicConfig(base));
+	}, resolveDynamicConfig(base, context));
 }
-async function resolveDynamicConfig(config) {
-	if (typeof config === "function") return await config();
+async function resolveDynamicConfig(config, context) {
+	if (typeof config === "function") return await config(context);
 	return config;
 }
 
@@ -342,10 +346,13 @@ function isBuildFailure(result) {
 //#endregion
 //#region src/utils/resolveConfig.ts
 const EMPTY_CONFIG = {};
-async function resolveConfig(config) {
-	const [base, ...rest] = config.pluginConfigs;
+async function resolveConfig(config, context) {
+	const [base] = config.pluginConfigs;
 	if (base == null) return EMPTY_CONFIG;
-	const mergedConfig = await mergeConfig(base, ...rest) ?? EMPTY_CONFIG;
+	const mergedConfig = await mergeConfig({
+		configs: config.pluginConfigs,
+		context
+	}) ?? EMPTY_CONFIG;
 	return {
 		...mergedConfig,
 		metro: resolveMetroConfig(mergedConfig)

package/dist/index.d.cts

@@ -551,7 +551,10 @@ type StaticPluginConfig = Omit<PluginBuildConfig, 'platform' | 'outfile'> & {
   devServer?: DevServerConfig;
   metro?: PluginMetroConfig;
 };
-type DynamicPluginConfig = (() => StaticPluginConfig) | (() => Promise<StaticPluginConfig>);
+type DynamicPluginConfig = ((context: PluginConfigContext) => StaticPluginConfig | null | undefined | void) | ((context: PluginConfigContext) => Promise<StaticPluginConfig | null | undefined | void>);
+interface PluginConfigContext {
+  command: 'build' | 'serve';
+}
 type PluginMetroConfig = Omit<ResolvedMetroConfig, 'babelConfig' | 'transformSync'>;
 type ResolvedPluginConfig = Omit<StaticPluginConfig, 'metro'> & {
   metro?: ResolvedMetroConfig;
@@ -571,7 +574,7 @@ declare const flattenPlugins: (plugin: PluginInput) => Promise<GranitePluginCore
 //#region src/utils/resolvePlugins.d.ts
 declare function resolvePlugins(plugins: PluginInput): Promise<{
   plugins: GranitePluginCore[];
-  configs: (StaticPluginConfig | (() => StaticPluginConfig) | (() => Promise<StaticPluginConfig>))[];
+  configs: (StaticPluginConfig | ((context: PluginConfigContext) => StaticPluginConfig | null | undefined | void) | ((context: PluginConfigContext) => Promise<StaticPluginConfig | null | undefined | void>))[];
   pluginHooks: {
     devServer: {
       preHandlers: GranitePluginDevPreHandler[];
@@ -585,7 +588,14 @@ declare function resolvePlugins(plugins: PluginInput): Promise<{
 }>;
 //#endregion
 //#region src/utils/mergeConfig.d.ts
-declare function mergeConfig(base: PluginConfig, ...configs: PluginConfig[]): Promise<StaticPluginConfig | undefined>;
+interface MergeConfigOptions {
+  configs: PluginConfig[];
+  context: PluginConfigContext;
+}
+declare function mergeConfig({
+  configs,
+  context
+}: MergeConfigOptions): Promise<void | StaticPluginConfig | null>;
 //#endregion
 //#region src/utils/mergeBuildConfigs.d.ts
 declare function mergeBuildConfigs(baseConfig: BuildConfig, ...otherConfigs: Partial<BuildConfig>[]): BuildConfig;
@@ -644,7 +654,7 @@ declare function isBuildSuccess(result: BuildResult): result is BuildSuccessResu
 declare function isBuildFailure(result: BuildResult): result is BuildFailureResult;
 //#endregion
 //#region src/utils/resolveConfig.d.ts
-declare function resolveConfig(config: CompleteGraniteConfig): Promise<ResolvedPluginConfig>;
+declare function resolveConfig(config: CompleteGraniteConfig, context: PluginConfigContext): Promise<ResolvedPluginConfig>;
 //#endregion
 //#region src/config/defineConfig.d.ts
 /**
@@ -719,4 +729,4 @@ interface LoadConfigOptions {
 }
 declare const loadConfig: (options?: LoadConfigOptions) => Promise<CompleteGraniteConfig>;
 //#endregion
-export { AdditionalMetroConfig, AliasConfig, AliasResolver, BabelConfig, BuildConfig, BuildFailureResult, BuildResult, BuildSuccessResult, BundleData, CompleteGraniteConfig, DevServerConfig, DynamicPluginConfig, EsbuildConfig, GraniteConfig, GranitePlugin, GranitePluginBuildPostHandler, GranitePluginBuildPreHandler, GranitePluginConfig, GranitePluginCore, GranitePluginDevHandlerArgs, GranitePluginDevPostHandler, GranitePluginDevPreHandler, GranitePluginHooks, GranitePluginPostHandlerArgs, GranitePluginPreHandlerArgs, InspectorProxyConfig, MetroDevServerConfig, MetroMiddleware, ResolutionContext as MetroResolutionContext, Middleware, ParsedGraniteConfig, PluginBuildConfig, PluginConfig, PluginContext, PluginInput, PluginMetroConfig, PluginResolvable, ProtocolConfig, ResolveResult, ResolveResultWithOptions, ResolvedMetroConfig, ResolvedPluginConfig, ResolverConfig, StaticPluginConfig, SwcConfig, TransformAsync, TransformSync, TransformerConfig, createContext, createPluginContext, createPluginHooksDriver, defineConfig, flattenPlugins, isBuildFailure, isBuildSuccess, loadConfig, mergeBuildConfigs, mergeConfig, pluginConfigSchema, resolveConfig, resolvePlugins };
+export { AdditionalMetroConfig, AliasConfig, AliasResolver, BabelConfig, BuildConfig, BuildFailureResult, BuildResult, BuildSuccessResult, BundleData, CompleteGraniteConfig, DevServerConfig, DynamicPluginConfig, EsbuildConfig, GraniteConfig, GranitePlugin, GranitePluginBuildPostHandler, GranitePluginBuildPreHandler, GranitePluginConfig, GranitePluginCore, GranitePluginDevHandlerArgs, GranitePluginDevPostHandler, GranitePluginDevPreHandler, GranitePluginHooks, GranitePluginPostHandlerArgs, GranitePluginPreHandlerArgs, InspectorProxyConfig, MergeConfigOptions, MetroDevServerConfig, MetroMiddleware, ResolutionContext as MetroResolutionContext, Middleware, ParsedGraniteConfig, PluginBuildConfig, PluginConfig, PluginConfigContext, PluginContext, PluginInput, PluginMetroConfig, PluginResolvable, ProtocolConfig, ResolveResult, ResolveResultWithOptions, ResolvedMetroConfig, ResolvedPluginConfig, ResolverConfig, StaticPluginConfig, SwcConfig, TransformAsync, TransformSync, TransformerConfig, createContext, createPluginContext, createPluginHooksDriver, defineConfig, flattenPlugins, isBuildFailure, isBuildSuccess, loadConfig, mergeBuildConfigs, mergeConfig, pluginConfigSchema, resolveConfig, resolvePlugins };

package/dist/index.d.ts

@@ -551,7 +551,10 @@ type StaticPluginConfig = Omit<PluginBuildConfig, 'platform' | 'outfile'> & {
   devServer?: DevServerConfig;
   metro?: PluginMetroConfig;
 };
-type DynamicPluginConfig = (() => StaticPluginConfig) | (() => Promise<StaticPluginConfig>);
+type DynamicPluginConfig = ((context: PluginConfigContext) => StaticPluginConfig | null | undefined | void) | ((context: PluginConfigContext) => Promise<StaticPluginConfig | null | undefined | void>);
+interface PluginConfigContext {
+  command: 'build' | 'serve';
+}
 type PluginMetroConfig = Omit<ResolvedMetroConfig, 'babelConfig' | 'transformSync'>;
 type ResolvedPluginConfig = Omit<StaticPluginConfig, 'metro'> & {
   metro?: ResolvedMetroConfig;
@@ -571,7 +574,7 @@ declare const flattenPlugins: (plugin: PluginInput) => Promise<GranitePluginCore
 //#region src/utils/resolvePlugins.d.ts
 declare function resolvePlugins(plugins: PluginInput): Promise<{
   plugins: GranitePluginCore[];
-  configs: (StaticPluginConfig | (() => StaticPluginConfig) | (() => Promise<StaticPluginConfig>))[];
+  configs: (StaticPluginConfig | ((context: PluginConfigContext) => StaticPluginConfig | null | undefined | void) | ((context: PluginConfigContext) => Promise<StaticPluginConfig | null | undefined | void>))[];
   pluginHooks: {
     devServer: {
       preHandlers: GranitePluginDevPreHandler[];
@@ -585,7 +588,14 @@ declare function resolvePlugins(plugins: PluginInput): Promise<{
 }>;
 //#endregion
 //#region src/utils/mergeConfig.d.ts
-declare function mergeConfig(base: PluginConfig, ...configs: PluginConfig[]): Promise<StaticPluginConfig | undefined>;
+interface MergeConfigOptions {
+  configs: PluginConfig[];
+  context: PluginConfigContext;
+}
+declare function mergeConfig({
+  configs,
+  context
+}: MergeConfigOptions): Promise<void | StaticPluginConfig | null>;
 //#endregion
 //#region src/utils/mergeBuildConfigs.d.ts
 declare function mergeBuildConfigs(baseConfig: BuildConfig, ...otherConfigs: Partial<BuildConfig>[]): BuildConfig;
@@ -644,7 +654,7 @@ declare function isBuildSuccess(result: BuildResult): result is BuildSuccessResu
 declare function isBuildFailure(result: BuildResult): result is BuildFailureResult;
 //#endregion
 //#region src/utils/resolveConfig.d.ts
-declare function resolveConfig(config: CompleteGraniteConfig): Promise<ResolvedPluginConfig>;
+declare function resolveConfig(config: CompleteGraniteConfig, context: PluginConfigContext): Promise<ResolvedPluginConfig>;
 //#endregion
 //#region src/config/defineConfig.d.ts
 /**
@@ -719,4 +729,4 @@ interface LoadConfigOptions {
 }
 declare const loadConfig: (options?: LoadConfigOptions) => Promise<CompleteGraniteConfig>;
 //#endregion
-export { AdditionalMetroConfig, AliasConfig, AliasResolver, BabelConfig, BuildConfig, BuildFailureResult, BuildResult, BuildSuccessResult, BundleData, CompleteGraniteConfig, DevServerConfig, DynamicPluginConfig, EsbuildConfig, GraniteConfig, GranitePlugin, GranitePluginBuildPostHandler, GranitePluginBuildPreHandler, GranitePluginConfig, GranitePluginCore, GranitePluginDevHandlerArgs, GranitePluginDevPostHandler, GranitePluginDevPreHandler, GranitePluginHooks, GranitePluginPostHandlerArgs, GranitePluginPreHandlerArgs, InspectorProxyConfig, MetroDevServerConfig, MetroMiddleware, ResolutionContext as MetroResolutionContext, Middleware, ParsedGraniteConfig, PluginBuildConfig, PluginConfig, PluginContext, PluginInput, PluginMetroConfig, PluginResolvable, ProtocolConfig, ResolveResult, ResolveResultWithOptions, ResolvedMetroConfig, ResolvedPluginConfig, ResolverConfig, StaticPluginConfig, SwcConfig, TransformAsync, TransformSync, TransformerConfig, createContext, createPluginContext, createPluginHooksDriver, defineConfig, flattenPlugins, isBuildFailure, isBuildSuccess, loadConfig, mergeBuildConfigs, mergeConfig, pluginConfigSchema, resolveConfig, resolvePlugins };
+export { AdditionalMetroConfig, AliasConfig, AliasResolver, BabelConfig, BuildConfig, BuildFailureResult, BuildResult, BuildSuccessResult, BundleData, CompleteGraniteConfig, DevServerConfig, DynamicPluginConfig, EsbuildConfig, GraniteConfig, GranitePlugin, GranitePluginBuildPostHandler, GranitePluginBuildPreHandler, GranitePluginConfig, GranitePluginCore, GranitePluginDevHandlerArgs, GranitePluginDevPostHandler, GranitePluginDevPreHandler, GranitePluginHooks, GranitePluginPostHandlerArgs, GranitePluginPreHandlerArgs, InspectorProxyConfig, MergeConfigOptions, MetroDevServerConfig, MetroMiddleware, ResolutionContext as MetroResolutionContext, Middleware, ParsedGraniteConfig, PluginBuildConfig, PluginConfig, PluginConfigContext, PluginContext, PluginInput, PluginMetroConfig, PluginResolvable, ProtocolConfig, ResolveResult, ResolveResultWithOptions, ResolvedMetroConfig, ResolvedPluginConfig, ResolverConfig, StaticPluginConfig, SwcConfig, TransformAsync, TransformSync, TransformerConfig, createContext, createPluginContext, createPluginHooksDriver, defineConfig, flattenPlugins, isBuildFailure, isBuildSuccess, loadConfig, mergeBuildConfigs, mergeConfig, pluginConfigSchema, resolveConfig, resolvePlugins };

package/dist/index.js

@@ -216,10 +216,14 @@ function mergeTransformer(source, target) {
 
 //#endregion
 //#region src/utils/mergeConfig.ts
-async function mergeConfig(base, ...configs) {
-	if (!(base || configs.length)) return;
-	return configs.reduce(async (acc, curr) => {
-		const [resolvedAcc, resolvedCurr] = await Promise.all([acc, resolveDynamicConfig(curr)]);
+async function mergeConfig({ configs, context }) {
+	const [base, ...rest] = configs;
+	if (base == null) return;
+	if (rest.length === 0) return resolveDynamicConfig(base, context);
+	return rest.reduce(async (acc, curr) => {
+		const resolved = await Promise.all([acc, resolveDynamicConfig(curr, context)]);
+		const resolvedAcc = resolved[0] ?? {};
+		const resolvedCurr = resolved[1] ?? {};
 		return {
 			...resolvedAcc,
 			...resolvedCurr,
@@ -231,12 +235,12 @@ async function mergeConfig(base, ...configs) {
 			devServer: mergeDevServer(resolvedAcc?.devServer, resolvedCurr?.devServer),
 			metro: mergeMetro(resolvedAcc?.metro, resolvedCurr?.metro),
 			extra: mergeExtra(resolvedAcc?.extra, resolvedCurr?.extra),
-			reactNativePath: resolvedCurr.reactNativePath ?? resolvedAcc.reactNativePath
+			reactNativePath: resolvedCurr?.reactNativePath ?? resolvedAcc?.reactNativePath
 		};
-	}, resolveDynamicConfig(base));
+	}, resolveDynamicConfig(base, context));
 }
-async function resolveDynamicConfig(config) {
-	if (typeof config === "function") return await config();
+async function resolveDynamicConfig(config, context) {
+	if (typeof config === "function") return await config(context);
 	return config;
 }
 
@@ -311,10 +315,13 @@ function isBuildFailure(result) {
 //#endregion
 //#region src/utils/resolveConfig.ts
 const EMPTY_CONFIG = {};
-async function resolveConfig(config) {
-	const [base, ...rest] = config.pluginConfigs;
+async function resolveConfig(config, context) {
+	const [base] = config.pluginConfigs;
 	if (base == null) return EMPTY_CONFIG;
-	const mergedConfig = await mergeConfig(base, ...rest) ?? EMPTY_CONFIG;
+	const mergedConfig = await mergeConfig({
+		configs: config.pluginConfigs,
+		context
+	}) ?? EMPTY_CONFIG;
 	return {
 		...mergedConfig,
 		metro: resolveMetroConfig(mergedConfig)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@granite-js/plugin-core",
   "type": "module",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "The core plugin module for Granite",
   "scripts": {
     "prepack": "yarn build",
@@ -41,7 +41,7 @@
     "vitest": "^4.0.12"
   },
   "dependencies": {
-    "@granite-js/utils": "1.0.1",
+    "@granite-js/utils": "1.0.3",
     "@swc/core": "1.15.8",
     "@types/babel__core": "^7",
     "@types/connect": "^3",