@equinor/fusion-framework-vite-plugin-spa 1.0.0-next.5 → 1.0.0-next.6

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @equinor/fusion-framework-vite-plugin-spa
 
+## 1.0.0-next.6
+
+### Patch Changes
+
+- [#3075](https://github.com/equinor/fusion-framework/pull/3075) [`713cb15`](https://github.com/equinor/fusion-framework/commit/713cb15c5f1607e7f7285940a58165d97d8e41df) Thanks [@odinr](https://github.com/odinr)! - Refactor plugin internals for improved Vite compatibility and maintainability:
+
+  - Made `resolveId` and `config` hooks async to support dynamic import resolution for virtual modules.
+  - Improved resource alias resolution for `/@fusion-spa-bootstrap.js` and `/@fusion-spa-sw.js` using `import.meta.resolve` and `fileURLToPath`.
+  - Enhanced environment variable handling by merging plugin and loaded environments, and defining them on `config.define`.
+  - Ensured the Vite dev server allows access to the correct `../html` directory for SPA templates.
+  - Added more robust logging for environment configuration and plugin setup.
+
 ## 1.0.0-next.5
 
 ### Minor Changes

package/dist/esm/plugin.js

@@ -1,3 +1,4 @@
+import { fileURLToPath } from 'node:url';
 import mergeWith from 'lodash.mergewith';
 import defaultTemplate from './html/index.html.js';
 import { objectToEnv } from './util/object-to-env.js';
@@ -15,16 +16,20 @@ export const plugin = (options) => {
     const log = options?.logger;
     return {
         name: 'fusion-framework-plugin-spa',
-        resolveId(id) {
+        resolveId: async (id) => {
             // resolve resource aliases to the correct path
             switch (id) {
-                case '/@fusion-spa-bootstrap.js':
-                    return new URL('./html/bootstrap.js', import.meta.url).pathname;
-                case '/@fusion-spa-sw.js':
-                    return new URL('./html/sw.js', import.meta.url).pathname;
+                case '/@fusion-spa-bootstrap.js': {
+                    const file = await import.meta.resolve('@equinor/fusion-framework-vite-plugin-spa/bootstrap.js');
+                    return fileURLToPath(file);
+                }
+                case '/@fusion-spa-sw.js': {
+                    const file = await import.meta.resolve('@equinor/fusion-framework-vite-plugin-spa/sw.js');
+                    return fileURLToPath(file);
+                }
             }
         },
-        config(config, configEnv) {
+        config: async (config, configEnv) => {
             const templateEnvPrefix = options?.templateEnvPrefix ?? 'FUSION_SPA_';
             // generate environment variables from plugin options
             const pluginEnvObj = { ...defaultEnv, ...options?.generateTemplateEnv?.(configEnv) };
@@ -43,8 +48,8 @@ export const plugin = (options) => {
             config.server ??= {};
             config.server.fs ??= {};
             config.server.fs.allow ??= [];
-            // allow access to the template file
-            config.server.fs.allow.push(new URL('./html', import.meta.url).pathname);
+            // allow access to the html directory
+            config.server.fs.allow.push(new URL('../html', import.meta.url).pathname);
             log?.info(`plugin configured for ${env.FUSION_SPA_PORTAL_ID}`);
         },
         configureServer(server) {

package/dist/esm/plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../src/plugin.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../src/plugin.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,OAAO,SAAS,MAAM,kBAAkB,CAAC;AAEzC,OAAO,eAAe,MAAM,sBAAsB,CAAC;AAEnD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAsBrD;;GAEG;AACH,MAAM,UAAU,GAAyB;IACvC,KAAK,EAAE,YAAY;IACnB,SAAS,EAAE,2BAA2B;CACvC,CAAC;AAEF,MAAM,CAAC,MAAM,MAAM,GAAG,CACpB,OAA6B,EACrB,EAAE;IACV,qBAAqB;IACrB,MAAM,aAAa,GAAG,OAAO,EAAE,QAAQ,IAAI,eAAe,CAAC;IAC3D,MAAM,GAAG,GAAG,OAAO,EAAE,MAAM,CAAC;IAE5B,OAAO;QACL,IAAI,EAAE,6BAA6B;QACnC,SAAS,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE;YACtB,+CAA+C;YAC/C,QAAQ,EAAE,EAAE,CAAC;gBACX,KAAK,2BAA2B,CAAC,CAAC,CAAC;oBACjC,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,OAAO,CACpC,wDAAwD,CACzD,CAAC;oBACF,OAAO,aAAa,CAAC,IAAI,CAAC,CAAC;gBAC7B,CAAC;gBACD,KAAK,oBAAoB,CAAC,CAAC,CAAC;oBAC1B,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,iDAAiD,CAAC,CAAC;oBAC1F,OAAO,aAAa,CAAC,IAAI,CAAC,CAAC;gBAC7B,CAAC;YACH,CAAC;QACH,CAAC;QACD,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE;YAClC,MAAM,iBAAiB,GAAG,OAAO,EAAE,iBAAiB,IAAI,aAAa,CAAC;YACtE,qDAAqD;YACrD,MAAM,YAAY,GAAG,EAAE,GAAG,UAAU,EAAE,GAAG,OAAO,EAAE,mBAAmB,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC;YACrF,MAAM,SAAS,GAAG,WAAW,CAAC,YAAY,IAAI,UAAU,EAAE,iBAAiB,CAAC,CAAC;YAE7E,GAAG,EAAE,KAAK,CAAC,6BAA6B,EAAE,SAAS,CAAC,CAAC;YAErD,wCAAwC;YACxC,MAAM,SAAS,GAAG,eAAe,CAAC,MAAM,EAAE,SAAS,EAAE,iBAAiB,CAAC,CAAC;YAExE,GAAG,EAAE,KAAK,CAAC,6BAA6B,EAAE,SAAS,CAAC,CAAC;YAErD,MAAM,GAAG,GAAG,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;YAE5C,GAAG,EAAE,KAAK,CAAC,sBAAsB,EAAE,GAAG,CAAC,CAAC;YAExC,+BAA+B;YAC/B,MAAM,CAAC,MAAM,KAAK,EAAE,CAAC;YACrB,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC/C,MAAM,CAAC,MAAM,CAAC,mBAAmB,GAAG,EAAE,CAAC,GAAG,KAAK,CAAC;YAClD,CAAC;YAED,MAAM,CAAC,MAAM,KAAK,EAAE,CAAC;YACrB,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC;YACxB,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,KAAK,KAAK,EAAE,CAAC;YAC9B,qCAAqC;YACrC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC;YAE1E,GAAG,EAAE,IAAI,CAAC,yBAAyB,GAAG,CAAC,oBAAoB,EAAE,CAAC,CAAC;QACjE,CAAC;QACD,eAAe,CAAC,MAAM;YACpB,qBAAqB;YACrB,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;gBAC9C,mEAAmE;gBACnE,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,KAAK,KAAK,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;oBACnF,OAAO,IAAI,EAAE,CAAC;gBAChB,CAAC;gBAED,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,GAAG,CAAC,GAAG,EAAE,aAAa,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC;gBAEtF,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE;oBACjB,cAAc,EAAE,WAAW;oBAC3B,gBAAgB,EAAE,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC;oBACzC,eAAe,EAAE,UAAU;oBAC3B,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO;iBAChC,CAAC,CAAC;gBAEH,OAAO,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACvB,CAAC,CAAC,CAAC;QACL,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,MAAM,CAAC"}

package/dist/esm/version.js

@@ -1,3 +1,3 @@
 // Generated by genversion.
-export const version = '1.0.0-next.5';
+export const version = '1.0.0-next.6';
 //# sourceMappingURL=version.js.map

package/dist/{bin/html → html}/bootstrap.js

@@ -1,4 +1,6 @@
-import { g as getDefaultExportFromCjs } from '../_commonjsHelpers-BFTU3MAI.js';
+function getDefaultExportFromCjs (x) {
+	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
+}
 
 var re = {exports: {}};
 
@@ -9814,114 +9816,114 @@ const coerce = {
 const NEVER = INVALID;
 
 var z$1 = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  BRAND: BRAND,
-  DIRTY: DIRTY,
-  EMPTY_PATH: EMPTY_PATH,
-  INVALID: INVALID,
-  NEVER: NEVER,
-  OK: OK,
-  ParseStatus: ParseStatus,
-  Schema: ZodType,
-  ZodAny: ZodAny,
-  ZodArray: ZodArray,
-  ZodBigInt: ZodBigInt,
-  ZodBoolean: ZodBoolean,
-  ZodBranded: ZodBranded,
-  ZodCatch: ZodCatch,
-  ZodDate: ZodDate,
-  ZodDefault: ZodDefault,
-  ZodDiscriminatedUnion: ZodDiscriminatedUnion,
-  ZodEffects: ZodEffects,
-  ZodEnum: ZodEnum,
-  ZodError: ZodError,
-  get ZodFirstPartyTypeKind () { return ZodFirstPartyTypeKind; },
-  ZodFunction: ZodFunction,
-  ZodIntersection: ZodIntersection,
-  ZodIssueCode: ZodIssueCode,
-  ZodLazy: ZodLazy,
-  ZodLiteral: ZodLiteral,
-  ZodMap: ZodMap,
-  ZodNaN: ZodNaN,
-  ZodNativeEnum: ZodNativeEnum,
-  ZodNever: ZodNever,
-  ZodNull: ZodNull,
-  ZodNullable: ZodNullable,
-  ZodNumber: ZodNumber,
-  ZodObject: ZodObject,
-  ZodOptional: ZodOptional,
-  ZodParsedType: ZodParsedType,
-  ZodPipeline: ZodPipeline,
-  ZodPromise: ZodPromise,
-  ZodReadonly: ZodReadonly,
-  ZodRecord: ZodRecord,
-  ZodSchema: ZodType,
-  ZodSet: ZodSet,
-  ZodString: ZodString,
-  ZodSymbol: ZodSymbol,
-  ZodTransformer: ZodEffects,
-  ZodTuple: ZodTuple,
-  ZodType: ZodType,
-  ZodUndefined: ZodUndefined,
-  ZodUnion: ZodUnion,
-  ZodUnknown: ZodUnknown,
-  ZodVoid: ZodVoid,
-  addIssueToContext: addIssueToContext,
-  any: anyType,
-  array: arrayType,
-  bigint: bigIntType,
-  boolean: booleanType,
-  coerce: coerce,
-  custom: custom,
-  date: dateType,
-  datetimeRegex: datetimeRegex,
-  defaultErrorMap: errorMap,
-  discriminatedUnion: discriminatedUnionType,
-  effect: effectsType,
-  enum: enumType,
-  function: functionType,
-  getErrorMap: getErrorMap,
-  getParsedType: getParsedType,
-  instanceof: instanceOfType,
-  intersection: intersectionType,
-  isAborted: isAborted,
-  isAsync: isAsync,
-  isDirty: isDirty,
-  isValid: isValid,
-  late: late,
-  lazy: lazyType,
-  literal: literalType,
-  makeIssue: makeIssue,
-  map: mapType,
-  nan: nanType,
-  nativeEnum: nativeEnumType,
-  never: neverType,
-  null: nullType,
-  nullable: nullableType,
-  number: numberType,
-  object: objectType,
-  get objectUtil () { return objectUtil; },
-  oboolean: oboolean,
-  onumber: onumber,
-  optional: optionalType,
-  ostring: ostring,
-  pipeline: pipelineType,
-  preprocess: preprocessType,
-  promise: promiseType,
-  quotelessJson: quotelessJson,
-  record: recordType,
-  set: setType,
-  setErrorMap: setErrorMap,
-  strictObject: strictObjectType,
-  string: stringType,
-  symbol: symbolType,
-  transformer: effectsType,
-  tuple: tupleType,
-  undefined: undefinedType,
-  union: unionType,
-  unknown: unknownType,
-  get util () { return util; },
-  void: voidType
+	__proto__: null,
+	BRAND: BRAND,
+	DIRTY: DIRTY,
+	EMPTY_PATH: EMPTY_PATH,
+	INVALID: INVALID,
+	NEVER: NEVER,
+	OK: OK,
+	ParseStatus: ParseStatus,
+	Schema: ZodType,
+	ZodAny: ZodAny,
+	ZodArray: ZodArray,
+	ZodBigInt: ZodBigInt,
+	ZodBoolean: ZodBoolean,
+	ZodBranded: ZodBranded,
+	ZodCatch: ZodCatch,
+	ZodDate: ZodDate,
+	ZodDefault: ZodDefault,
+	ZodDiscriminatedUnion: ZodDiscriminatedUnion,
+	ZodEffects: ZodEffects,
+	ZodEnum: ZodEnum,
+	ZodError: ZodError,
+	get ZodFirstPartyTypeKind () { return ZodFirstPartyTypeKind; },
+	ZodFunction: ZodFunction,
+	ZodIntersection: ZodIntersection,
+	ZodIssueCode: ZodIssueCode,
+	ZodLazy: ZodLazy,
+	ZodLiteral: ZodLiteral,
+	ZodMap: ZodMap,
+	ZodNaN: ZodNaN,
+	ZodNativeEnum: ZodNativeEnum,
+	ZodNever: ZodNever,
+	ZodNull: ZodNull,
+	ZodNullable: ZodNullable,
+	ZodNumber: ZodNumber,
+	ZodObject: ZodObject,
+	ZodOptional: ZodOptional,
+	ZodParsedType: ZodParsedType,
+	ZodPipeline: ZodPipeline,
+	ZodPromise: ZodPromise,
+	ZodReadonly: ZodReadonly,
+	ZodRecord: ZodRecord,
+	ZodSchema: ZodType,
+	ZodSet: ZodSet,
+	ZodString: ZodString,
+	ZodSymbol: ZodSymbol,
+	ZodTransformer: ZodEffects,
+	ZodTuple: ZodTuple,
+	ZodType: ZodType,
+	ZodUndefined: ZodUndefined,
+	ZodUnion: ZodUnion,
+	ZodUnknown: ZodUnknown,
+	ZodVoid: ZodVoid,
+	addIssueToContext: addIssueToContext,
+	any: anyType,
+	array: arrayType,
+	bigint: bigIntType,
+	boolean: booleanType,
+	coerce: coerce,
+	custom: custom,
+	date: dateType,
+	datetimeRegex: datetimeRegex,
+	defaultErrorMap: errorMap,
+	discriminatedUnion: discriminatedUnionType,
+	effect: effectsType,
+	enum: enumType,
+	function: functionType,
+	getErrorMap: getErrorMap,
+	getParsedType: getParsedType,
+	instanceof: instanceOfType,
+	intersection: intersectionType,
+	isAborted: isAborted,
+	isAsync: isAsync,
+	isDirty: isDirty,
+	isValid: isValid,
+	late: late,
+	lazy: lazyType,
+	literal: literalType,
+	makeIssue: makeIssue,
+	map: mapType,
+	nan: nanType,
+	nativeEnum: nativeEnumType,
+	never: neverType,
+	null: nullType,
+	nullable: nullableType,
+	number: numberType,
+	object: objectType,
+	get objectUtil () { return objectUtil; },
+	oboolean: oboolean,
+	onumber: onumber,
+	optional: optionalType,
+	ostring: ostring,
+	pipeline: pipelineType,
+	preprocess: preprocessType,
+	promise: promiseType,
+	quotelessJson: quotelessJson,
+	record: recordType,
+	set: setType,
+	setErrorMap: setErrorMap,
+	strictObject: strictObjectType,
+	string: stringType,
+	symbol: symbolType,
+	transformer: effectsType,
+	tuple: tupleType,
+	undefined: undefinedType,
+	union: unionType,
+	unknown: unknownType,
+	get util () { return util; },
+	void: voidType
 });
 
 /**