chore: consolidate dev deps (#4948)

Author: timdeschryver

.github/workflows/release.yml

@@ -79,4 +79,4 @@ jobs:
           DRY_RUN: ${{ inputs.dry_run }}
           RELEASE_TAG: ${{ inputs.release_tag }}
           RELEASE_VERSION: ${{ inputs.release_version }}
-        run: ./node_modules/.bin/ts-node ./build/publish-release.ts
+        run: npx tsx ./build/publish-release.ts

build/publish-latest.ts

@@ -21,7 +21,7 @@ export async function publishLatestToNpm() {
     'operators',
   ];
 
-  for (let pkg of publishablePackages) {
+  for (const pkg of publishablePackages) {
     console.log(`Publishing @ngrx/${pkg}`);
 
     const cmd = [

build/publish-next.ts

@@ -21,7 +21,7 @@ export async function publishNextToNpm() {
     'operators',
   ];
 
-  for (let pkg of publishablePackages) {
+  for (const pkg of publishablePackages) {
     console.log(`Publishing @ngrx/${pkg}`);
 
     const cmd = [

build/stackblitz.ts

@@ -1,4 +1,4 @@
-import * as globby from 'globby';
+import { glob } from 'tinyglobby';
 import * as fs from 'fs';
 import { packages as ngrxPackages } from './config';
 
@@ -15,7 +15,7 @@ const EXAMPLE_FILES = [
 ];
 
 (async () => {
-  const paths = await globby(EXAMPLE_FILES, { ignore: ['**/node_modules/**'] });
+  const paths = await glob(EXAMPLE_FILES, { ignore: ['**/node_modules/**'] });
 
   const files = paths.reduce((files, filePath) => {
     const contents = fs.readFileSync(filePath, 'utf-8');

build/tasks.ts

@@ -13,7 +13,7 @@ export async function copySchematicsCore(config: Config) {
   const filter = (name: string) =>
     !name.endsWith('.eslintrc.json') && !name.endsWith('project.json');
 
-  for (let pkg of util.getTopLevelPackages(config)) {
+  for (const pkg of util.getTopLevelPackages(config)) {
     const packageJson = fs
       .readFileSync(`${modulesDir}${pkg}/package.json`)
       .toString('utf-8');
@@ -41,7 +41,7 @@ export async function copySchematicsCore(config: Config) {
  * Deploy build artifacts to repos
  */
 export async function publishToRepo(config: Config) {
-  for (let pkg of util.getTopLevelPackages(config)) {
+  for (const pkg of util.getTopLevelPackages(config)) {
     const SOURCE_DIR = `./dist/modules/${pkg}`;
     const REPO_URL = `git@github.com:ngrx/${pkg}-builds.git`;
     const REPO_DIR = `./tmp/${pkg}`;

build/update-version-numbers.ts

@@ -1,7 +1,7 @@
 import { readFileSync, writeFileSync } from 'fs';
 import { EOL } from 'os';
 import * as readline from 'readline';
-import * as glob from 'glob';
+import { globSync } from 'tinyglobby';
 import { createBuilder } from './util';
 import { packages } from './config';
 import { join } from 'path';
@@ -13,7 +13,7 @@ const CONFIG = {
 };
 
 // get the version from the command
-// e.g. ts-node ./build/update-version-numbers.ts 10.0.0
+// e.g. npx tsx ./build/update-version-numbers.ts 10.0.0
 const [newVersion] = process.argv.slice(2);
 
 if (newVersion) {
@@ -56,9 +56,8 @@ function updateVersions(version: string) {
 function createPackageJsonBuilder(version: string) {
   const [major] = version.split('.');
   return async () => {
-    glob
-      .sync('**/package.json', { ignore: '**/node_modules/**' })
-      .map((file) => {
+    globSync('**/package.json', { ignore: '**/node_modules/**' }).map(
+      (file) => {
         const content = readFileSync(file, 'utf-8');
         const pkg = JSON.parse(content);
         let saveFile = false;
@@ -85,7 +84,8 @@ function createPackageJsonBuilder(version: string) {
         if (saveFile) {
           writeAsJson(file, pkg);
         }
-      });
+      }
+    );
   };
 }
 
@@ -94,14 +94,14 @@ function createPackageJsonBuilder(version: string) {
  */
 function createUpdateAddSchematicBuilder(version: string) {
   return async () => {
-    glob
-      .sync('**/libs-version.ts', { ignore: '**/node_modules/**' })
-      .map((file) => {
+    globSync('**/libs-version.ts', { ignore: '**/node_modules/**' }).map(
+      (file) => {
         writeFileSync(
           file,
           `export const platformVersion = '^${version}';${EOL}`
         );
-      });
+      }
+    );
   };
 }
 

build/util.ts

@@ -1,69 +1,18 @@
-import * as fs from 'fs';
+import * as path from 'node:path';
 import * as cp from 'child_process';
-import * as glob from 'glob';
-import * as fsExtra from 'fs-extra';
-import * as path from 'path';
-import * as rimraf from 'rimraf';
+import ora from 'ora';
 import { Config } from './config';
 
 export type RunnerFn = (config: Config) => Promise<any>;
 export type TaskDef = [string, RunnerFn];
 export type BaseFn = (command: string) => string;
 
-export function copy(target: string, destination: string): Promise<void> {
-  return new Promise((resolve, reject) => {
-    fsExtra.copy(target, path.resolve(destination), (err) => {
-      if (err) return reject(err);
-      resolve();
-    });
-  });
-}
-
-export function remove(target: string): Promise<void> {
-  return new Promise((resolve, reject) => {
-    fsExtra.remove(target, (err) => {
-      if (err) return reject(err);
-      resolve();
-    });
-  });
-}
-
-export function writeFile(target: string, contents: string): Promise<void> {
-  return new Promise((resolve, reject) => {
-    fs.writeFile(target, contents, (err) => {
-      if (err) return reject(err);
-      resolve();
-    });
-  });
-}
-
-export function getListOfFiles(
-  globPath: string,
-  exclude?: string | string[]
-): Promise<string[]> {
-  return new Promise((resolve, reject) => {
-    const options = exclude ? { ignore: exclude } : {};
-
-    glob(globPath, options, (error, matches) => {
-      if (error) {
-        return reject(error);
-      }
-
-      resolve(matches);
-    });
-  });
-}
-
-export function removeRecursively(glob: string): Promise<void> {
-  return new Promise((resolve, reject) => {
-    rimraf(glob, (err) => {
-      if (err) {
-        reject(err);
-      } else {
-        resolve();
-      }
-    });
-  });
+export function createBuilder(tasks: TaskDef[]) {
+  return async function (config: Config) {
+    for (const [name, runner] of tasks) {
+      await runTask(name, () => runner(config));
+    }
+  };
 }
 
 export function exec(
@@ -82,6 +31,10 @@ export function exec(
   });
 }
 
+export function getTopLevelPackages(config: Config) {
+  return config.packages.map((packageDescription) => packageDescription.name);
+}
+
 export function cmd(command: string, args: string[]): Promise<string> {
   return exec(command, args, (command: string) => command);
 }
@@ -90,19 +43,6 @@ export function git(args: string[]): Promise<string> {
   return cmd('git', args);
 }
 
-export function ignoreErrors<T>(promise: Promise<T>): Promise<T | null> {
-  return promise.catch(() => null);
-}
-
-export function fromNpm(command: string) {
-  return baseDir(`./node_modules/.bin/${command}`);
-}
-
-export function getPackageFilePath(pkg: string, filename: string) {
-  return baseDir(`./modules/${pkg}/${filename}`);
-}
-
-const ora = require('ora');
 async function runTask(name: string, taskFn: () => Promise<any>) {
   const spinner = ora(name);
 
@@ -119,40 +59,10 @@ async function runTask(name: string, taskFn: () => Promise<any>) {
   }
 }
 
-export function createBuilder(tasks: TaskDef[]) {
-  return async function (config: Config) {
-    for (let [name, runner] of tasks) {
-      await runTask(name, () => runner(config));
-    }
-  };
-}
-
-export function flatMap<K, J>(list: K[], mapFn: (item: K) => J[]): J[] {
-  return list.reduce(function (newList, nextItem) {
-    return [...newList, ...mapFn(nextItem)];
-  }, [] as J[]);
-}
-
-export function getTopLevelPackages(config: Config) {
-  return config.packages.map((packageDescription) => packageDescription.name);
-}
-
-export function baseDir(...dirs: string[]): string {
+function baseDir(...dirs: string[]): string {
   return `"${path.resolve(__dirname, '../', ...dirs)}"`;
 }
 
-export async function sleep(ms: number) {
-  return new Promise((resolve) => {
-    setTimeout(resolve, ms);
-  });
-}
-
-export function getPrNumber(prNumber: string, circlePR: string): string {
-  const PR_NUMBER = prNumber;
-
-  if (!PR_NUMBER && circlePR) {
-    return circlePR;
-  }
-
-  return PR_NUMBER;
+function fromNpm(command: string) {
+  return baseDir(`./node_modules/.bin/${command}`);
 }

modules/component-store/schematics-core/utility/change.ts

@@ -49,7 +49,11 @@ export class InsertChange implements Change {
   order: number;
   description: string;
 
-  constructor(public path: string, public pos: number, public toAdd: string) {
+  constructor(
+    public path: string,
+    public pos: number,
+    public toAdd: string
+  ) {
     if (pos < 0) {
       throw new Error('Negative positions are invalid');
     }
@@ -77,7 +81,11 @@ export class RemoveChange implements Change {
   order: number;
   description: string;
 
-  constructor(public path: string, public pos: number, public end: number) {
+  constructor(
+    public path: string,
+    public pos: number,
+    public end: number
+  ) {
     if (pos < 0 || end < 0) {
       throw new Error('Negative positions are invalid');
     }

modules/component-store/spec/component-store.spec.ts

@@ -225,9 +225,8 @@ describe('Component Store', () => {
         const UPDATED_STATE = { updatedState: 'proccessed' };
 
         // Record all the values that go through state$.
-        const recordedStateValues$ = componentStore.state$.pipe(
-          publishReplay()
-        );
+        const recordedStateValues$ =
+          componentStore.state$.pipe(publishReplay());
         // Need to "connect" to start getting notifications.
         (recordedStateValues$ as ConnectableObservable<object>).connect();
 
@@ -410,9 +409,8 @@ describe('Component Store', () => {
         );
 
         // Record all the values that go through state$.
-        const recordedStateValues$ = componentStore.state$.pipe(
-          publishReplay()
-        );
+        const recordedStateValues$ =
+          componentStore.state$.pipe(publishReplay());
         // Need to "connect" to start getting notifications.
         (recordedStateValues$ as ConnectableObservable<object>).connect();
 

modules/component-store/src/component-store.ts

@@ -131,7 +131,7 @@ export class ComponentStore<T extends object> implements OnDestroy {
     // Return either an empty callback or a function requiring specific types as inputs
     ReturnType = OriginType extends void
       ? () => void
-      : (observableOrValue: ValueType | Observable<ValueType>) => Subscription
+      : (observableOrValue: ValueType | Observable<ValueType>) => Subscription,
   >(updaterFn: (state: T, value: OriginType) => T): ReturnType {
     return ((
       observableOrValue?: OriginType | Observable<OriginType>
@@ -262,14 +262,14 @@ export class ComponentStore<T extends object> implements OnDestroy {
   select<Selectors extends Observable<unknown>[], Result>(
     ...selectorsWithProjector: [
       ...selectors: Selectors,
-      projector: Projector<Selectors, Result>
+      projector: Projector<Selectors, Result>,
     ]
   ): Observable<Result>;
   select<Selectors extends Observable<unknown>[], Result>(
     ...selectorsWithProjectorAndConfig: [
       ...selectors: Selectors,
       projector: Projector<Selectors, Result>,
-      config: SelectConfig<Result>
+      config: SelectConfig<Result>,
     ]
   ): Observable<Result>;
   select<
@@ -278,7 +278,7 @@ export class ComponentStore<T extends object> implements OnDestroy {
     >,
     Result,
     ProjectorFn extends (...a: unknown[]) => Result,
-    SelectorsObject extends Record<string, Observable<unknown>>
+    SelectorsObject extends Record<string, Observable<unknown>>,
   >(...args: Selectors): Observable<Result> {
     const { observablesOrSelectorsObject, projector, config } =
       processSelectorArgs<Selectors, Result, ProjectorFn, SelectorsObject>(
@@ -329,20 +329,20 @@ export class ComponentStore<T extends object> implements OnDestroy {
     ...args: [
       ...signals: Signals,
       projector: SignalsProjector<Signals, Result>,
-      options: SelectSignalOptions<Result>
+      options: SelectSignalOptions<Result>,
     ]
   ): Signal<Result>;
   selectSignal(
     ...args:
       | [(state: T) => unknown, SelectSignalOptions<unknown>?]
       | [
           ...signals: Signal<unknown>[],
-          projector: (...values: unknown[]) => unknown
+          projector: (...values: unknown[]) => unknown,
         ]
       | [
           ...signals: Signal<unknown>[],
           projector: (...values: unknown[]) => unknown,
-          options: SelectSignalOptions<unknown>
+          options: SelectSignalOptions<unknown>,
         ]
   ): Signal<unknown> {
     const selectSignalArgs = [...args];
@@ -391,7 +391,7 @@ export class ComponentStore<T extends object> implements OnDestroy {
         ) => Subscription
       : (
           observableOrValue: ObservableType | Observable<ObservableType>
-        ) => Subscription
+        ) => Subscription,
   >(generator: (origin$: OriginType) => Observable<unknown>): ReturnType {
     const origin$ = new Subject<ObservableType>();
     generator(origin$ as OriginType)
@@ -456,7 +456,7 @@ function processSelectorArgs<
   >,
   Result,
   ProjectorFn extends (...a: unknown[]) => Result,
-  SelectorsObject extends Record<string, Observable<unknown>>
+  SelectorsObject extends Record<string, Observable<unknown>>,
 >(
   args: Selectors
 ):