Thanks to visit codestin.com
Credit goes to github.com

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -116,11 +116,11 @@
"@semantic-release/changelog": "^6.0.3",
"@semantic-release/exec": "^6.0.3",
"@semantic-release/git": "^10.0.1",
"@storybook/addon-docs": "9.0.18",
"@storybook/addon-links": "9.0.18",
"@storybook/addon-vitest": "9.0.18",
"@storybook/angular": "9.0.18",
"@storybook/builder-vite": "9.0.18",
"@storybook/addon-docs": "10.0.0-rc.0",
"@storybook/addon-links": "10.0.0-rc.0",
"@storybook/addon-vitest": "10.0.0-rc.0",
"@storybook/angular": "10.0.0-rc.0",
"@storybook/builder-vite": "10.0.0-rc.0",
"@swc-node/register": "1.10.10",
"@swc/cli": "0.7.8",
"@swc/core": "1.5.29",
Expand Down Expand Up @@ -188,7 +188,7 @@
"sharp": "^0.33.5",
"shiki": "^1.6.1",
"start-server-and-test": "^1.15.4",
"storybook": "9.0.9",
"storybook": "10.0.0-rc.0",
"tailwindcss": "^3.1.0",
"ts-dedent": "^2.0.0",
"ts-jest": "29.4.0",
Expand Down
10 changes: 5 additions & 5 deletions packages/storybook-angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"import": "./src/index.js",
"require": "./src/index.js"
},
"./preset": "./preset.mjs",
"./preset": "./src/lib/preset.js",
"./package.json": "./package.json",
"./*": "./src/*",
"./testing": {
Expand All @@ -39,16 +39,16 @@
},
"main": "src/index.js",
"dependencies": {
"@storybook/builder-vite": ">=8.6.0 || ^9.0.0"
"@storybook/builder-vite": "^10.0.0-rc.0"
},
"peerDependencies": {
"@storybook/angular": ">=8.6.0 || ^9.0.0",
"@storybook/angular": "^10.0.0-rc.0",
"@analogjs/vite-plugin-angular": "*",
"storybook": ">=8.6.0 || ^9.0.0",
"storybook": "^10.0.0-rc.0",
"vite": "^5.0.0 || ^6.0.0 || ^7.0.0"
},
"engines": {
"node": ">=18.0.0"
"node": ">=20.0.0"
},
"builders": "src/lib/builders.json",
"ng-add": {
Expand Down
5 changes: 0 additions & 5 deletions packages/storybook-angular/preset/preset.d.ts

This file was deleted.

1 change: 0 additions & 1 deletion packages/storybook-angular/preset/preset.js.map

This file was deleted.

5 changes: 0 additions & 5 deletions packages/storybook-angular/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,6 @@
"input": "./packages/storybook-angular/src",
"glob": "**/*.d.ts",
"output": "./src"
},
{
"input": "./packages/storybook-angular/preset",
"glob": "**/(*.*)",
"output": "./"
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion packages/storybook-angular/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export * from './types';
export * from '@storybook/angular/dist/client/index.js';
export * from '@storybook/angular/client';
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import BuildStorybookBuilder from '@storybook/angular/dist/builders/build-storybook/index.js';
import BuildStorybookBuilder from '@storybook/angular/builders/build-storybook';

export default BuildStorybookBuilder;
Original file line number Diff line number Diff line change
@@ -1,15 +1,37 @@
import { dirname, join, resolve } from 'node:path';
import { createRequire } from 'node:module';
import { core as PresetCore } from '@storybook/angular/dist/preset.js';
const require = createRequire(import.meta.url);
const getAbsolutePath = (input) =>
dirname(require.resolve(join(input, 'package.json')));
import { resolve } from 'node:path';
import { core as PresetCore } from '@storybook/angular/preset';
import { fileURLToPath } from 'node:url';

export const previewAnnotations = async (entries = [], options) => {
const config = fileURLToPath(
import.meta.resolve('@storybook/angular/client/config'),
);
const annotations = [...entries, config];

if (options.enableProdMode) {
const previewProdPath = fileURLToPath(
import.meta.resolve('@storybook/angular/client/preview-prod'),
);
annotations.unshift(previewProdPath);
}

const docsConfig = await options.presets.apply('docs', {}, options);
const docsEnabled = Object.keys(docsConfig).length > 0;
if (docsEnabled) {
const docsConfigPath = fileURLToPath(
import.meta.resolve('@storybook/angular/client/docs/config'),
);
annotations.push(docsConfigPath);
}
return annotations;
};

export const core = async (config, options) => {
const presetCore = PresetCore(config, options);
return {
...presetCore,
builder: {
name: getAbsolutePath('@storybook/builder-vite'),
name: import.meta.resolve('@storybook/builder-vite'),
options: { ...presetCore.options },
},
};
Expand All @@ -29,7 +51,7 @@ export const viteFinal = async (config, options) => {
// Add dependencies to pre-optimization
optimizeDeps: {
include: [
'@storybook/angular/dist/client/index.js',
'@storybook/angular/client',
'@analogjs/storybook-angular',
'@angular/compiler',
'@angular/platform-browser',
Expand Down Expand Up @@ -145,5 +167,5 @@ function storybookEsbuildPlugin() {
};
}

export { addons, previewAnnotations } from '@storybook/angular/dist/preset.js';
export { addons } from '@storybook/angular/preset';
//# sourceMappingURL=preset.js.map
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import StartStorybookBuilder from '@storybook/angular/dist/builders/start-storybook/index.js';
import StartStorybookBuilder from '@storybook/angular/builders/start-storybook';

export default StartStorybookBuilder;
5 changes: 3 additions & 2 deletions packages/storybook-angular/src/lib/testing.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import '@angular/compiler';
import type { AngularRenderer } from '@storybook/angular';
import { setProjectAnnotations as originalSetProjectAnnotations } from '@storybook/angular/dist/client/index.mjs';
import { setProjectAnnotations as originalSetProjectAnnotations } from '@storybook/angular/client';
import {
NamedOrDefaultProjectAnnotations,
NormalizedProjectAnnotations,
RenderContext,
} from 'storybook/internal/types';
import * as configAnnotations from '@storybook/angular/dist/client/config.mjs';
import * as configAnnotations from '@storybook/angular/client/config';

export const render = configAnnotations.render;

Expand Down
10 changes: 5 additions & 5 deletions packages/storybook-angular/src/test-setup.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import '@analogjs/vite-plugin-angular/setup-vitest';
import { getTestBed } from '@angular/core/testing';
import {
BrowserDynamicTestingModule,
platformBrowserDynamicTesting,
} from '@angular/platform-browser-dynamic/testing';
BrowserTestingModule,
platformBrowserTesting,
} from '@angular/platform-browser/testing';

getTestBed().initTestEnvironment(
BrowserDynamicTestingModule,
platformBrowserDynamicTesting(),
BrowserTestingModule,
platformBrowserTesting(),
);
1 change: 1 addition & 0 deletions packages/storybook-angular/tsconfig.lib.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"compilerOptions": {
"resolveJsonModule": true,
"esModuleInterop": true,
"moduleResolution": "bundler",
"outDir": "../../dist/out-tsc",
"declaration": true,
"types": ["node"]
Expand Down
Loading