Skip to content

Commit 6eee3eb

Browse files
nartcnartc
committed
feat(repo): migrate 21.2 with angular 20
1 parent b2f3980 commit 6eee3eb

File tree

21 files changed

+3460
-2241
lines changed

21 files changed

+3460
-2241
lines changed

‎apps/examples/src/app/routed-rocks/cursor.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { DOCUMENT } from '@angular/common';
2-
import { Directive, ElementRef, inject } from '@angular/core';
1+
2+
import { Directive, ElementRef, inject, DOCUMENT } from '@angular/core';
33
import { getInstanceState, objectEvents } from 'angular-three';
44
import { Object3D } from 'three';
55

‎apps/examples/src/app/soba/camera-scroll/model.ts‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@ Command: npx angular-three-gltf@1.1.11 apps/kitchen-sink/src/app/soba/camera
33
**/
44

55
import {
6-
ChangeDetectionStrategy,
7-
Component,
8-
CUSTOM_ELEMENTS_SCHEMA,
9-
effect,
10-
ElementRef,
11-
inject,
12-
signal,
13-
viewChild,
6+
ChangeDetectionStrategy,
7+
Component,
8+
CUSTOM_ELEMENTS_SCHEMA,
9+
effect,
10+
ElementRef,
11+
inject,
12+
signal,
13+
viewChild,
14+
DOCUMENT
1415
} from '@angular/core';
1516
import { beforeRender, NgtArgs, NgtThreeEvent } from 'angular-three';
1617
import { NgtsPerspectiveCamera } from 'angular-three-soba/cameras';
@@ -21,7 +22,7 @@ import { BufferGeometry, Color, Group, MathUtils, Mesh, MeshStandardMaterial } f
2122
import { GLTF } from 'three-stdlib';
2223
import { SCROLL } from './camera-scroll';
2324

24-
import { DOCUMENT } from '@angular/common';
25+
2526
import modelUrl from './model-transformed.glb';
2627

2728
type ActionName = 'CameraAction.005';

‎apps/examples/src/app/soba/camera-scroll/overlay.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { DOCUMENT } from '@angular/common';
2-
import { ChangeDetectionStrategy, Component, ElementRef, inject, viewChild } from '@angular/core';
1+
2+
import { ChangeDetectionStrategy, Component, ElementRef, inject, viewChild, DOCUMENT } from '@angular/core';
33
import { SCROLL } from './camera-scroll';
44

55
@Component({

‎apps/examples/src/app/soba/shoe-configuration/scene.ts‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
import { DOCUMENT, NgTemplateOutlet } from '@angular/common';
1+
import { NgTemplateOutlet } from '@angular/common';
22
import {
3-
ChangeDetectionStrategy,
4-
Component,
5-
computed,
6-
CUSTOM_ELEMENTS_SCHEMA,
7-
effect,
8-
inject,
9-
signal,
3+
ChangeDetectionStrategy,
4+
Component,
5+
computed,
6+
CUSTOM_ELEMENTS_SCHEMA,
7+
effect,
8+
inject,
9+
signal,
10+
DOCUMENT
1011
} from '@angular/core';
1112
import { NgtArgs, signalState } from 'angular-three';
1213
import { NgtsOrbitControls } from 'angular-three-soba/controls';

‎doctor-storybook.log‎

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,27 @@
11
🩺 The doctor is checking the health of your Storybook..
2-
╭ Duplicated dependencies found ─────────────────────────────────────────────────────────────────────────╮
3-
│ │
4-
│ Attention: The following dependencies are duplicated which might cause unexpected behavior: │
5-
│ @storybook/preview-api: │
6-
│ 8.2.6, 8.2.9 │
7-
│ │
8-
│ │
9-
│ Please try de-duplicating these dependencies by running pnpm dedupe │
10-
│ │
11-
│ │
12-
│ You can find more information for a given dependency by running pnpm list --depth=1 <package-name> │
13-
│ │
14-
╰────────────────────────────────────────────────────────────────────────────────────────────────────────╯
2+
╭ Incompatible packages found ─────────────────────────────────────────────────────────────────────────────────╮
3+
│ │
4+
│ You are currently using Storybook 9.0.9 but you have packages which are incompatible with it: │
5+
│ - @chromatic-com/[email protected] which depends on ^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0 │
6+
│ - @storybook/[email protected] which depends on 8.6.14 │
7+
│ Repo: https://github.com/storybookjs/storybook/tree/next/code/addons/interactions │
8+
│ - @storybook/[email protected] which depends on ^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0 │
9+
│ Repo: https://github.com/storybookjs/storybook/tree/next/code/lib/core-server │
10+
│ - @storybook/[email protected] which depends on ^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0 │
11+
│ Repo: https://github.com/storybookjs/storybook/tree/next/code/lib/manager-api │
12+
│ - @storybook/[email protected] which depends on 8.6.14 │
13+
│ Repo: https://github.com/storybookjs/storybook/tree/next/code/lib/test │
14+
│ - @storybook/[email protected] which depends on ^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0 │
15+
│ Repo: https://github.com/storybookjs/storybook/tree/next/code/lib/theming │
16+
│ - [email protected] which depends on 7.x.x || 8.x.x │
17+
│ Repo: https://github.com/eliasm307/storybook-addon-deep-controls#readme │
18+
│ │
19+
│ │
20+
│ Please consider updating your packages or contacting the maintainers for compatibility details. │
21+
│ For more on Storybook 9 compatibility, see the linked GitHub issue: │
22+
│ https://github.com/storybookjs/storybook/issues/30944 │
23+
│ │
24+
╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────╯
1525

1626
You can always recheck the health of your project by running:
1727
npx storybook doctor

‎eslint.config.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// For more info, see https://github.com/storybookjs/eslint-plugin-storybook#configuration-flat-config-format
2+
import storybook from "eslint-plugin-storybook";
3+
14
const { FlatCompat } = require('@eslint/eslintrc');
25
const js = require('@eslint/js');
36
const nxEslintPlugin = require('@nx/eslint-plugin');

‎libs/core/src/lib/pipes/hexify.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { DOCUMENT } from '@angular/common';
2-
import { inject, Pipe } from '@angular/core';
1+
2+
import { inject, Pipe, DOCUMENT } from '@angular/core';
33

44
const RGBA_REGEX = /rgba?\((\d+),\s*(\d+),\s*(\d+),?\s*(\d*\.?\d+)?\)/;
55
const DEFAULT_COLOR = 0x000000;

‎libs/core/src/lib/renderer/renderer.ts‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
import { DOCUMENT } from '@angular/common';
1+
22
import {
3-
inject,
4-
Injectable,
5-
InjectionToken,
6-
Injector,
7-
Renderer2,
8-
RendererFactory2,
9-
RendererType2,
10-
Type,
11-
untracked,
3+
inject,
4+
Injectable,
5+
InjectionToken,
6+
Injector,
7+
Renderer2,
8+
RendererFactory2,
9+
RendererType2,
10+
Type,
11+
untracked,
12+
DOCUMENT
1213
} from '@angular/core';
1314
import * as THREE from 'three';
1415
import { NgtArgs } from '../directives/args';

‎libs/core/src/lib/store.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { DOCUMENT } from '@angular/common';
2-
import { ElementRef, InjectOptions, InjectionToken, effect, inject } from '@angular/core';
1+
2+
import { ElementRef, InjectOptions, InjectionToken, effect, inject, DOCUMENT } from '@angular/core';
33
import { Subject } from 'rxjs';
44
import * as THREE from 'three';
55
import { injectLoop } from './loop';

‎libs/soba/.storybook/main.ts‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
import { StorybookConfig } from '@storybook/angular';
22

33
const config: StorybookConfig = {
4-
stories: ['../**/*.mdx', '../**/*.stories.@(js|ts)'],
5-
addons: ['@storybook/addon-essentials', 'storybook-addon-deep-controls', '@chromatic-com/storybook'],
6-
staticDirs: ['./public', './public/cube'],
7-
framework: '@storybook/angular',
8-
docs: {
9-
autodocs: true
10-
},
4+
stories: ['../**/*.mdx', '../**/*.stories.@(js|ts)'],
5+
6+
addons: [
7+
'storybook-addon-deep-controls',
8+
'@chromatic-com/storybook',
9+
'@storybook/addon-docs'
10+
],
11+
12+
staticDirs: ['./public', './public/cube'],
13+
framework: '@storybook/angular'
1114
};
1215

1316
export default config;

0 commit comments

Comments
 (0)