@analogjs/storybook-angular 2.2.1 → 2.2.2-beta.1

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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@analogjs/storybook-angular",
3
- "version": "2.2.1",
3
+ "version": "2.2.2-beta.1",
4
4
  "description": "Storybook Integration for Angular & Vite",
5
5
  "type": "module",
6
6
  "keywords": [
package/src/lib/preset.js CHANGED
@@ -77,18 +77,23 @@ export const viteFinal = async (config, options) => {
77
77
  });
78
78
  };
79
79
  function angularOptionsPlugin(options, { normalizePath }) {
80
+ let resolvedConfig;
80
81
  return {
81
82
  name: 'analogjs-storybook-options-plugin',
82
- config() {
83
+ config(userConfig) {
84
+ resolvedConfig = userConfig;
83
85
  const loadPaths = options?.angularBuilderOptions?.stylePreprocessorOptions?.loadPaths;
84
86
  const sassOptions = options?.angularBuilderOptions?.stylePreprocessorOptions?.sass;
85
87
  if (Array.isArray(loadPaths)) {
88
+ const workspaceRoot = options.angularBuilderContext?.workspaceRoot ??
89
+ userConfig?.root ??
90
+ process.cwd();
86
91
  return {
87
92
  css: {
88
93
  preprocessorOptions: {
89
94
  scss: {
90
95
  ...sassOptions,
91
- loadPaths: loadPaths.map((loadPath) => `${resolve(options.angularBuilderContext.workspaceRoot, loadPath)}`),
96
+ loadPaths: loadPaths.map((loadPath) => `${resolve(workspaceRoot, loadPath)}`),
92
97
  },
93
98
  },
94
99
  },
@@ -109,7 +114,9 @@ function angularOptionsPlugin(options, { normalizePath }) {
109
114
  if (!zoneless) {
110
115
  imports.push('zone.js');
111
116
  }
112
- const projectConfig = await options.angularBuilderContext.getProjectMetadata(options.angularBuilderContext.target.project);
117
+ // Use vite config root when angularBuilderContext is not available
118
+ // (e.g., when running via Vitest instead of Angular builders)
119
+ const projectRoot = resolvedConfig?.root ?? process.cwd();
113
120
  return {
114
121
  code: `
115
122
  ${imports
@@ -117,7 +124,7 @@ function angularOptionsPlugin(options, { normalizePath }) {
117
124
  if (extraImport.startsWith('.') ||
118
125
  extraImport.startsWith('src')) {
119
126
  // relative to root
120
- return `import '${resolve(options.angularBuilderContext.workspaceRoot, projectConfig.root, extraImport)}';`;
127
+ return `import '${resolve(projectRoot, extraImport)}';`;
121
128
  }
122
129
  // absolute import
123
130
  return `import '${extraImport}';`;
@@ -1 +1 @@
1
- {"version":3,"file":"preset.js","sourceRoot":"","sources":["../../../../../packages/storybook-angular/src/lib/preset.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"preset.js","sourceRoot":"","sources":["../../../../../packages/storybook-angular/src/lib/preset.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,IAAI,IAAI,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EAAE,OAAO,GAAG,EAAE,EAAE,OAAO,EAAE,EAAE;IAChE,MAAM,MAAM,GAAG,aAAa,CAC1B,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,kCAAkC,CAAC,CACxD,CAAC;IACF,MAAM,WAAW,GAAG,CAAC,GAAG,OAAO,EAAE,MAAM,CAAC,CAAC;IAEzC,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;QAC3B,MAAM,eAAe,GAAG,aAAa,CACnC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,wCAAwC,CAAC,CAC9D,CAAC;QACF,WAAW,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;IACvC,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;IACpE,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;IACvD,IAAI,WAAW,EAAE,CAAC;QAChB,MAAM,cAAc,GAAG,aAAa,CAClC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,uCAAuC,CAAC,CAC7D,CAAC;QACF,WAAW,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IACnC,CAAC;IACD,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,IAAI,GAAG,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;IAC5C,MAAM,UAAU,GAAG,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/C,OAAO;QACL,GAAG,UAAU;QACb,OAAO,EAAE;YACP,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,yBAAyB,CAAC;YACpD,OAAO,EAAE,EAAE,GAAG,UAAU,CAAC,OAAO,EAAE;SACnC;KACF,CAAC;AACJ,CAAC,CAAC;AACF,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;IACjD,mEAAmE;IACnE,MAAM,CAAC,OAAO,GAAG,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC;SACpC,IAAI,EAAE;SACN,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;IAEzD,qDAAqD;IACrD,MAAM,EAAE,WAAW,EAAE,aAAa,EAAE,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC;IAC5D,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,MAAM,MAAM,CAAC,+BAA+B,CAAC,CAAC;IAC3E,aAAa;IACb,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAC3D,OAAO,WAAW,CAAC,MAAM,EAAE;QACzB,uCAAuC;QACvC,YAAY,EAAE;YACZ,OAAO,EAAE;gBACP,2BAA2B;gBAC3B,6BAA6B;gBAC7B,mBAAmB;gBACnB,2BAA2B;gBAC3B,sCAAsC;gBACtC,OAAO;gBACP,GAAG,CAAC,OAAO,EAAE,qBAAqB,EAAE,oBAAoB;oBACtD,CAAC,CAAC,EAAE;oBACJ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;aACjB;SACF;QACD,OAAO,EAAE;YACP,OAAO,CAAC;gBACN,GAAG,EACD,OAAO,SAAS,CAAC,OAAO,EAAE,GAAG,KAAK,WAAW;oBAC3C,CAAC,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG;oBACxB,CAAC,CAAC,IAAI;gBACV,UAAU,EACR,OAAO,SAAS,CAAC,OAAO,EAAE,UAAU,KAAK,WAAW;oBAClD,CAAC,CAAC,SAAS,CAAC,OAAO,EAAE,UAAU;oBAC/B,CAAC,CAAC,KAAK;gBACX,QAAQ,EACN,OAAO,SAAS,CAAC,OAAO,EAAE,QAAQ,KAAK,WAAW;oBAChD,CAAC,CAAC,SAAS,CAAC,OAAO,EAAE,QAAQ;oBAC7B,CAAC,CAAC,CAAC,OAAO,EAAE,QAAQ,IAAI,4BAA4B,CAAC;gBACzD,qBAAqB,EACnB,OAAO,SAAS,CAAC,OAAO,EAAE,qBAAqB,KAAK,WAAW;oBAC7D,CAAC,CAAC,SAAS,CAAC,OAAO,EAAE,qBAAqB;oBAC1C,CAAC,CAAC,KAAK;aACZ,CAAC;YACF,oBAAoB,CAAC,OAAO,EAAE,EAAE,aAAa,EAAE,CAAC;YAChD,sBAAsB,EAAE;SACzB;QACD,MAAM,EAAE;YACN,yBAAyB,EAAE,IAAI,CAAC,SAAS,CAAC;gBACxC,oBAAoB,EAClB,CAAC,CAAC,OAAO,EAAE,qBAAqB,EAAE,oBAAoB;aACzD,CAAC;SACH;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,SAAS,oBAAoB,CAAC,OAAO,EAAE,EAAE,aAAa,EAAE;IACtD,IAAI,cAAc,CAAC;IACnB,OAAO;QACL,IAAI,EAAE,mCAAmC;QACzC,MAAM,CAAC,UAAU;YACf,cAAc,GAAG,UAAU,CAAC;YAC5B,MAAM,SAAS,GACb,OAAO,EAAE,qBAAqB,EAAE,wBAAwB,EAAE,SAAS,CAAC;YACtE,MAAM,WAAW,GACf,OAAO,EAAE,qBAAqB,EAAE,wBAAwB,EAAE,IAAI,CAAC;YAEjE,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC7B,MAAM,aAAa,GACjB,OAAO,CAAC,qBAAqB,EAAE,aAAa;oBAC5C,UAAU,EAAE,IAAI;oBAChB,OAAO,CAAC,GAAG,EAAE,CAAC;gBAChB,OAAO;oBACL,GAAG,EAAE;wBACH,mBAAmB,EAAE;4BACnB,IAAI,EAAE;gCACJ,GAAG,WAAW;gCACd,SAAS,EAAE,SAAS,CAAC,GAAG,CACtB,CAAC,QAAQ,EAAE,EAAE,CAAC,GAAG,OAAO,CAAC,aAAa,EAAE,QAAQ,CAAC,EAAE,CACpD;6BACF;yBACF;qBACF;iBACF,CAAC;YACJ,CAAC;YAED,OAAO;QACT,CAAC;QACD,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE;YACtB,IACE,aAAa,CAAC,EAAE,CAAC,CAAC,QAAQ,CACxB,aAAa,CAAC,GAAG,OAAO,CAAC,SAAS,aAAa,CAAC,CACjD,EACD,CAAC;gBACD,MAAM,OAAO,GAAG,EAAE,CAAC;gBACnB,MAAM,MAAM,GAAG,OAAO,EAAE,qBAAqB,EAAE,MAAM,CAAC;gBAEtD,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;oBAC1B,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;wBACvB,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;oBACtB,CAAC,CAAC,CAAC;gBACL,CAAC;gBAED,MAAM,QAAQ,GAAG,OAAO,EAAE,qBAAqB,EAAE,oBAAoB,CAAC;gBAEtE,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACd,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBAC1B,CAAC;gBAED,mEAAmE;gBACnE,8DAA8D;gBAC9D,MAAM,WAAW,GAAG,cAAc,EAAE,IAAI,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;gBAE1D,OAAO;oBACL,IAAI,EAAE;cACF,OAAO;yBACN,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE;wBACnB,IACE,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC;4BAC3B,WAAW,CAAC,UAAU,CAAC,KAAK,CAAC,EAC7B,CAAC;4BACD,mBAAmB;4BACnB,OAAO,WAAW,OAAO,CAAC,WAAW,EAAE,WAAW,CAAC,IAAI,CAAC;wBAC1D,CAAC;wBAED,kBAAkB;wBAClB,OAAO,WAAW,WAAW,IAAI,CAAC;oBACpC,CAAC,CAAC;yBACD,IAAI,CAAC,IAAI,CAAC;cACX,IAAI;WACP;iBACF,CAAC;YACJ,CAAC;YAED,OAAO;QACT,CAAC;KACF,CAAC;AACJ,CAAC;AAED,SAAS,sBAAsB;IAC7B,OAAO;QACL,IAAI,EAAE,mCAAmC;QACzC,KAAK,EAAE,OAAO;QACd,MAAM;YACJ,OAAO;gBACL,OAAO,EAAE;oBACP,4CAA4C;oBAC5C,0CAA0C;oBAC1C,SAAS,EAAE,IAAI;iBAChB;aACF,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC;AAED,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AACnD,kCAAkC"}