Skip to content

Commit

Permalink
build: upgrade all the things (#434)
Browse files Browse the repository at this point in the history
* build: upgrade all the things

* build: use bun install in CI

* build: install first and cache

* build: use node 21 image

* build: use convenience image

* build: use bun orb
  • Loading branch information
yharaskrik authored Jan 28, 2024
1 parent 0809f02 commit 15ac112
Show file tree
Hide file tree
Showing 8 changed files with 51 additions and 16,471 deletions.
25 changes: 17 additions & 8 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,33 @@ version: 2.1

orbs:
node: circleci/node@5.0.2
bun-orb: cmgriffing/bun-orb@0.0.28

jobs:
build-and-test:
parameters:
flags:
type: string
default: ''
machine:
image: ubuntu-2004:202010-01
docker:
- image: cimg/node:21.6.1
steps:
- checkout
- node/install:
install-yarn: true
node-version: '18'
- node/install-packages:
pkg-manager: yarn
include-branch-in-cache-key: false
cache-version: v4
node-version: '21'
- bun-orb/setup
- restore_cache:
keys:
- v1-dependencies-bun-{{ checksum "bun.lockb" }}
- v1-dependencies-bun-
- run:
name: Install Packages
command: bun install --frozen-lockfile --cache-dir ~/.cache.bun
- save_cache:
name: Save Bun Package Cache
key: v1-dependencies-bun-{{ checksum "bun.lockb" }}
paths:
- ~/.cache/bun
- run:
name: Run tests
command: yarn nx affected:test --parallel << parameters.flags >>
Expand Down
4 changes: 2 additions & 2 deletions apps/ngrx-data-websocket-demo/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { DragDropModule } from '@angular/cdk/drag-drop';
import { HttpClientJsonpModule, HttpClientModule } from '@angular/common/http';
import { NgModule } from '@angular/core';
import { FormsModule } from '@angular/forms';
import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field';
import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatInputModule } from '@angular/material/input';
import { BrowserModule } from '@angular/platform-browser';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { RouterModule } from '@angular/router';
Expand Down
2 changes: 1 addition & 1 deletion apps/rx-dynamic-host/src/app/app.component.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Component } from '@angular/core';
import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog';
import { MatDialog } from '@angular/material/dialog';
import { faker } from '@faker-js/faker';
import { RxDynamicComponentService } from '@trellisorg/rx-dynamic-component';
import { interval, map, startWith, Subject, timer } from 'rxjs';
Expand Down
2 changes: 1 addition & 1 deletion apps/rx-dynamic-host/src/app/app.module.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { NgModule } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser';

import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog';
import { MatDialogModule } from '@angular/material/dialog';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { RouterModule } from '@angular/router';
import {
Expand Down
Binary file added bun.lockb
Binary file not shown.
3 changes: 2 additions & 1 deletion nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,8 @@
"{workspaceRoot}/tsconfig.base.json",
"{workspaceRoot}/tslint.json",
"{workspaceRoot}/nx.json",
"{workspaceRoot}/yarn.lock"
"{workspaceRoot}/yarn.lock",
"{workspaceRoot}/bun.lockb"
],
"production": [
"default",
Expand Down
56 changes: 28 additions & 28 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,18 @@
},
"private": true,
"dependencies": {
"@angular/animations": "17.0.9",
"@angular/cdk": "17.0.5",
"@angular/common": "17.0.9",
"@angular/compiler": "17.0.9",
"@angular/core": "17.0.9",
"@angular/forms": "17.0.9",
"@angular/material": "17.0.5",
"@angular/platform-browser": "17.0.9",
"@angular/platform-browser-dynamic": "17.0.9",
"@angular/platform-server": "17.0.9",
"@angular/router": "17.0.9",
"@angular/ssr": "17.0.10",
"@angular/animations": "17.1.1",
"@angular/cdk": "17.1.1",
"@angular/common": "17.1.1",
"@angular/compiler": "17.1.1",
"@angular/core": "17.1.1",
"@angular/forms": "17.1.1",
"@angular/material": "17.1.1",
"@angular/platform-browser": "17.1.1",
"@angular/platform-browser-dynamic": "17.1.1",
"@angular/platform-server": "17.1.1",
"@angular/router": "17.1.1",
"@angular/ssr": "17.1.1",
"@apollo/server": "^4.9.5",
"@googlemaps/js-api-loader": "^1.15.2",
"@hono/node-server": "^1.4.0",
Expand All @@ -51,13 +51,13 @@
"@nestjs/platform-express": "^10.1.0",
"@nestjs/platform-socket.io": "^10.1.0",
"@nestjs/websockets": "^10.1.0",
"@ngrx/component": "17.0.1",
"@ngrx/component-store": "17.0.1",
"@ngrx/data": "17.0.1",
"@ngrx/effects": "17.0.1",
"@ngrx/entity": "17.0.1",
"@ngrx/store": "17.0.1",
"@ngrx/store-devtools": "17.0.1",
"@ngrx/component": "17.1.0",
"@ngrx/component-store": "17.1.0",
"@ngrx/data": "17.1.0",
"@ngrx/effects": "17.1.0",
"@ngrx/entity": "17.1.0",
"@ngrx/store": "17.1.0",
"@ngrx/store-devtools": "17.1.0",
"bull": "^4.12.0",
"bullmq": "^5.0.0",
"compression": "^1.7.4",
Expand All @@ -81,15 +81,15 @@
"zone.js": "0.14.2"
},
"devDependencies": {
"@angular-devkit/build-angular": "17.0.10",
"@angular-devkit/core": "17.0.10",
"@angular-devkit/schematics": "17.0.10",
"@angular-eslint/eslint-plugin": "17.0.1",
"@angular-eslint/eslint-plugin-template": "17.0.1",
"@angular-eslint/template-parser": "17.0.1",
"@angular-devkit/build-angular": "17.1.1",
"@angular-devkit/core": "17.1.1",
"@angular-devkit/schematics": "17.1.1",
"@angular-eslint/eslint-plugin": "17.2.1",
"@angular-eslint/eslint-plugin-template": "17.2.1",
"@angular-eslint/template-parser": "17.2.1",
"@angular/cli": "~17.0.0",
"@angular/compiler-cli": "17.0.9",
"@angular/language-service": "17.0.9",
"@angular/compiler-cli": "17.1.1",
"@angular/language-service": "17.1.1",
"@betterer/cli": "^5.4.0",
"@faker-js/faker": "^8.0.2",
"@graphql-codegen/cli": "^5.0.0",
Expand Down Expand Up @@ -134,7 +134,7 @@
"jest-marbles": "^3.0.3",
"jest-preset-angular": "13.1.4",
"jsonc-eslint-parser": "^2.1.0",
"ng-packagr": "17.0.2",
"ng-packagr": "17.1.2",
"nx": "17.2.8",
"postcss": "^8.4.23",
"postcss-import": "15.1.0",
Expand Down
Loading

0 comments on commit 15ac112

Please sign in to comment.