Skip to content

WIP: nx v21 migration #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft
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
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,6 @@ Thumbs.db
.nx/workspace-data

vite.config.*.timestamp*
vitest.config.*.timestamp*
vitest.config.*.timestamp*
.cursor/rules/nx-rules.mdc
.github/instructions/nx.instructions.md
3 changes: 2 additions & 1 deletion apps/ionic-app/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,8 @@
"buildTarget": "ionic-app:build:development"
}
},
"defaultConfiguration": "development"
"defaultConfiguration": "development",
"continuous": true
},
"extract-i18n": {
"executor": "@angular-devkit/build-angular:extract-i18n",
Expand Down
4 changes: 2 additions & 2 deletions apps/ionic-app/src/app/app.component.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { CommonModule } from '@angular/common';

import { Component } from '@angular/core';
import { IonicModule } from '@ionic/angular';

@Component({
selector: 'platform-root',
imports: [CommonModule, IonicModule],
imports: [IonicModule],
template: `
<ion-app>
<ion-router-outlet></ion-router-outlet>
Expand Down
4 changes: 2 additions & 2 deletions apps/kitchen-sink/src/app/routed-rocks/cursor.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { DOCUMENT } from '@angular/common';
import { Directive, ElementRef, inject } from '@angular/core';

import { Directive, ElementRef, inject, DOCUMENT } from '@angular/core';
import { getLocalState, injectObjectEvents } from 'angular-three';
import { Object3D } from 'three';

Expand Down
19 changes: 10 additions & 9 deletions apps/kitchen-sink/src/app/soba/camera-scroll/model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@ Command: npx angular-three-gltf&#64;1.1.11 apps/kitchen-sink/src/app/soba/camera
**/

import {
ChangeDetectionStrategy,
Component,
CUSTOM_ELEMENTS_SCHEMA,
effect,
ElementRef,
inject,
signal,
viewChild,
ChangeDetectionStrategy,
Component,
CUSTOM_ELEMENTS_SCHEMA,
effect,
ElementRef,
inject,
signal,
viewChild,
DOCUMENT
} from '@angular/core';
import { injectBeforeRender, NgtArgs, NgtThreeEvent } from 'angular-three';
import { NgtsPerspectiveCamera } from 'angular-three-soba/cameras';
Expand All @@ -21,7 +22,7 @@ import { BufferGeometry, Color, Group, MathUtils, Mesh, MeshStandardMaterial } f
import { GLTF } from 'three-stdlib';
import { SCROLL } from './camera-scroll';

import { DOCUMENT } from '@angular/common';

import modelUrl from './model-transformed.glb';

type ActionName = 'CameraAction.005';
Expand Down
4 changes: 2 additions & 2 deletions apps/kitchen-sink/src/app/soba/camera-scroll/overlay.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { DOCUMENT } from '@angular/common';
import { ChangeDetectionStrategy, Component, ElementRef, inject, viewChild } from '@angular/core';

import { ChangeDetectionStrategy, Component, ElementRef, inject, viewChild, DOCUMENT } from '@angular/core';
import { SCROLL } from './camera-scroll';

@Component({
Expand Down
17 changes: 9 additions & 8 deletions apps/kitchen-sink/src/app/soba/html-chart/html-chart.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import { DOCUMENT } from '@angular/common';

import {
afterNextRender,
ChangeDetectionStrategy,
Component,
DestroyRef,
effect,
inject,
Injector,
afterNextRender,
ChangeDetectionStrategy,
Component,
DestroyRef,
effect,
inject,
Injector,
DOCUMENT
} from '@angular/core';
import { NgtCanvas } from 'angular-three';
import { Experience } from './experience';
Expand Down
3 changes: 3 additions & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,7 @@ module.exports = [
'@angular-eslint/prefer-standalone': 'off',
},
},
{
ignores: ['**/vite.config.*.timestamp*', '**/vitest.config.*.timestamp*'],
},
];
37 changes: 19 additions & 18 deletions libs/core/nativescript/src/lib/canvas.ts
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
import '@nativescript/canvas-three';

import { DOCUMENT } from '@angular/common';

import {
booleanAttribute,
ChangeDetectionStrategy,
Component,
ComponentRef,
createEnvironmentInjector,
DestroyRef,
EnvironmentInjector,
inject,
Injector,
input,
NgZone,
NO_ERRORS_SCHEMA,
output,
Type,
untracked,
viewChild,
ViewContainerRef,
booleanAttribute,
ChangeDetectionStrategy,
Component,
ComponentRef,
createEnvironmentInjector,
DestroyRef,
EnvironmentInjector,
inject,
Injector,
input,
NgZone,
NO_ERRORS_SCHEMA,
output,
Type,
untracked,
viewChild,
ViewContainerRef,
DOCUMENT
} from '@angular/core';
import { registerElement } from '@nativescript/angular';
import { Canvas } from '@nativescript/canvas';
Expand Down
4 changes: 2 additions & 2 deletions libs/core/src/lib/pipes/hexify.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { DOCUMENT } from '@angular/common';
import { inject, Pipe } from '@angular/core';

import { inject, Pipe, DOCUMENT } from '@angular/core';

const RGBA_REGEX = /rgba?\((\d+),\s*(\d+),\s*(\d+),?\s*(\d*\.?\d+)?\)/;
const DEFAULT_COLOR = 0x000000;
Expand Down
21 changes: 11 additions & 10 deletions libs/core/src/lib/renderer/index.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
import { DOCUMENT } from '@angular/common';

import {
DebugNode,
Injectable,
Renderer2,
RendererFactory2,
RendererType2,
Type,
inject,
makeEnvironmentProviders,
untracked,
DebugNode,
Injectable,
Renderer2,
RendererFactory2,
RendererType2,
Type,
inject,
makeEnvironmentProviders,
untracked,
DOCUMENT
} from '@angular/core';
import { NgtArgs } from '../directives/args';
import { NgtParent } from '../directives/parent';
Expand Down
25 changes: 12 additions & 13 deletions libs/core/src/lib/routed-scene.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
import {
ChangeDetectorRef,
Component,
createEnvironmentInjector,
Directive,
effect,
EnvironmentInjector,
inject,
InjectFlags,
InjectOptions,
ProviderToken,
RendererFactory2,
runInInjectionContext,
ChangeDetectorRef,
Component,
createEnvironmentInjector,
Directive,
effect,
EnvironmentInjector,
inject,
InjectOptions,
ProviderToken,
RendererFactory2,
runInInjectionContext
} from '@angular/core';
import { ActivatedRoute, ActivationEnd, Router, RouterOutlet } from '@angular/router';
import { filter } from 'rxjs';
Expand All @@ -31,7 +30,7 @@ class NgtOutletEnvironmentInjector extends EnvironmentInjector {
override get<T>(
token: ProviderToken<T>,
notFoundValue?: unknown,
flags: InjectFlags | InjectOptions = InjectFlags.Default,
flags: InjectFlags | InjectOptions = {},
): any {
const options: InjectOptions = {};

Expand Down
4 changes: 2 additions & 2 deletions libs/core/src/lib/store.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { DOCUMENT } from '@angular/common';
import { ElementRef, InjectOptions, InjectionToken, effect, inject } from '@angular/core';

import { ElementRef, InjectOptions, InjectionToken, effect, inject, DOCUMENT } from '@angular/core';
import { Subject } from 'rxjs';
import { Clock, Vector2, Vector3 } from 'three';
import { injectLoop } from './loop';
Expand Down
2 changes: 1 addition & 1 deletion libs/soba/.storybook/documentation-template.mdx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Meta, Title, Subtitle, Description, Primary, Controls } from '@storybook/blocks';
import { Meta, Title, Subtitle, Description, Primary, Controls } from '@storybook/addon-docs/blocks';

{/\*

Expand Down
16 changes: 14 additions & 2 deletions libs/soba/.storybook/main.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,23 @@
import { createRequire } from "node:module";
import { dirname, join } from "node:path";
import { StorybookConfig } from '@storybook/angular';

const require = createRequire(import.meta.url);

const config: StorybookConfig = {
stories: ['../**/*.mdx', '../**/*.stories.@(js|ts)'],
addons: ['@storybook/addon-essentials', 'storybook-addon-deep-controls', '@chromatic-com/storybook'],
addons: [
getAbsolutePath("storybook-addon-deep-controls"),
getAbsolutePath("@chromatic-com/storybook"),
getAbsolutePath("@storybook/addon-docs")
],
staticDirs: ['./public', './public/cube'],
framework: '@storybook/angular',
framework: getAbsolutePath("@storybook/angular"),
docs: {},
};

export default config;

function getAbsolutePath(value: string): any {
return dirname(require.resolve(join(value, "package.json")));
}
2 changes: 1 addition & 1 deletion libs/soba/.storybook/manager.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { addons } from '@storybook/manager-api';
import { addons } from 'storybook/manager-api';
import theme from './theme';

addons.setConfig({ theme });
Expand Down
2 changes: 1 addition & 1 deletion libs/soba/.storybook/theme.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { create } from '@storybook/theming';
import { create } from 'storybook/theming';

export default create({
base: 'light',
Expand Down
17 changes: 9 additions & 8 deletions libs/soba/abstractions/src/lib/gradient-texture.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import { DOCUMENT } from '@angular/common';

import {
ChangeDetectionStrategy,
Component,
computed,
CUSTOM_ELEMENTS_SCHEMA,
inject,
input,
untracked,
ChangeDetectionStrategy,
Component,
computed,
CUSTOM_ELEMENTS_SCHEMA,
inject,
input,
untracked,
DOCUMENT
} from '@angular/core';
import { extend, injectStore, NgtArgs, NgtAttachable, NgtTexture, omit } from 'angular-three';
import { mergeInputs } from 'ngxtension/inject-inputs';
Expand Down
21 changes: 11 additions & 10 deletions libs/soba/controls/src/lib/scroll-controls.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
import { DOCUMENT } from '@angular/common';

import {
ChangeDetectionStrategy,
Component,
Directive,
effect,
ElementRef,
inject,
input,
model,
untracked,
ChangeDetectionStrategy,
Component,
Directive,
effect,
ElementRef,
inject,
input,
model,
untracked,
DOCUMENT
} from '@angular/core';
import { injectBeforeRender, injectStore, NgtHTML, pick, provideHTMLDomElement } from 'angular-three';
import { easing } from 'maath';
Expand Down
3 changes: 3 additions & 0 deletions libs/soba/eslint.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// For more info, see https://github.com/storybookjs/eslint-plugin-storybook#configuration-flat-config-format
import storybook from "eslint-plugin-storybook";

const { FlatCompat } = require('@eslint/eslintrc');
const js = require('@eslint/js');
const baseConfig = require('../../eslint.config.js');
Expand Down
19 changes: 10 additions & 9 deletions libs/soba/gizmos/src/lib/gizmo-helper/gizmo-viewcube.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import { DOCUMENT } from '@angular/common';

import {
ChangeDetectionStrategy,
Component,
computed,
CUSTOM_ELEMENTS_SCHEMA,
inject,
input,
output,
signal,
ChangeDetectionStrategy,
Component,
computed,
CUSTOM_ELEMENTS_SCHEMA,
inject,
input,
output,
signal,
DOCUMENT
} from '@angular/core';
import {
extend,
Expand Down
19 changes: 10 additions & 9 deletions libs/soba/gizmos/src/lib/gizmo-helper/gizmo-viewport.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import { DOCUMENT } from '@angular/common';

import {
ChangeDetectionStrategy,
Component,
computed,
CUSTOM_ELEMENTS_SCHEMA,
inject,
input,
output,
signal,
ChangeDetectionStrategy,
Component,
computed,
CUSTOM_ELEMENTS_SCHEMA,
inject,
input,
output,
signal,
DOCUMENT
} from '@angular/core';
import {
extend,
Expand Down
4 changes: 2 additions & 2 deletions libs/soba/stats/src/lib/stats.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { DOCUMENT } from '@angular/common';
import { computed, Directive, effect, ElementRef, inject, input, untracked } from '@angular/core';

import { computed, Directive, effect, ElementRef, inject, input, untracked, DOCUMENT } from '@angular/core';
import { addAfterEffect, injectStore, omit, pick, resolveRef } from 'angular-three';
import { mergeInputs } from 'ngxtension/inject-inputs';
import Stats from 'stats-gl';
Expand Down
Loading