Skip to content
Open
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: 0 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,6 @@ jobs:
find packages -name "*.tsbuildinfo" -delete
pnpm nx reset

# pre-build console to get around some odd bugs that seem to be related to nx 21
# TODO: Try to get rid of this later. If the build ever succeeds without
# running this step first, it's working correctly, and we can delete this.
- name: Pre-build console
shell: bash
working-directory: ./packages/console
run: |
pnpm install
pnpm nx build @storacha/ui-core
pnpm nx build @storacha/ui-react
pnpm build

# Set the base and head that `nx affected` will use
- uses: nrwl/nx-set-shas@v4
env:
Expand Down
26 changes: 2 additions & 24 deletions .github/workflows/console-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,7 @@ jobs:
working-directory: .
run: |
find packages -name "*.tsbuildinfo" -delete
pnpm nx reset
# pre-build console to get around some odd bugs that seem to be related to nx 21
# TODO: Try to get rid of this later. If the build ever succeeds without
# running this step first, it's working correctly, and we can delete this.
- name: Pre-build console
shell: bash
working-directory: ./packages/console
run: |
pnpm install
pnpm nx build @storacha/ui-core
pnpm nx build @storacha/ui-react
pnpm build
pnpm nx reset
- name: Build all dependencies
shell: bash
run: pnpm nx build
Expand Down Expand Up @@ -174,18 +163,7 @@ jobs:
working-directory: .
run: |
find packages -name "*.tsbuildinfo" -delete
pnpm nx reset
# pre-build console to get around some odd bugs that seem to be related to nx 21
# TODO: Try to get rid of this later. If the build ever succeeds without
# running this step first, it's working correctly, and we can delete this.
- name: Pre-build console
shell: bash
working-directory: ./packages/console
run: |
pnpm install
pnpm nx build @storacha/ui-core
pnpm nx build @storacha/ui-react
pnpm build
pnpm nx reset
- name: Build all dependencies
shell: bash
run: pnpm nx build
Expand Down
8 changes: 5 additions & 3 deletions packages/console/next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,11 @@ const nextConfig = {

/** @type {(phase: string) => Promise<import('next').NextConfig & import('@nx/next/plugins/with-nx').WithNxOptions & import('@sentry/nextjs').WithSentryConfig>} */
const withCustom = async (phase) => {
const nxConfig = withNx(nextConfig)
const config = await nxConfig(phase)
return withSentryConfig(config, { ...sentryWebpackPluginOptions, ...sentryOptions })
const nxConfigCreator = withNx(nextConfig)
const nxConfig = await nxConfigCreator(phase)
const config = withSentryConfig(nxConfig, { ...sentryWebpackPluginOptions, ...sentryOptions })
if ("eslint" in config) delete config.eslint;
return config
}

module.exports = withCustom
1 change: 1 addition & 0 deletions packages/console/project.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const getFrameAncestorsHeader = (() => {
}
})()

export function middleware(request: NextRequest) {
export function proxy(request: NextRequest) {
// Log iframe embedding requests for monitoring
const referer = request.headers.get('referer')
const secFetchDest = request.headers.get('sec-fetch-dest')
Expand Down
2 changes: 1 addition & 1 deletion packages/console/src/app/globals.css
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
@import 'react-tooltip/dist/react-tooltip.css';
@tailwind base;
@tailwind components;
@tailwind utilities;

@import 'react-tooltip/dist/react-tooltip.css';

:root {
--hot-red: #E91315;
Expand Down
130 changes: 65 additions & 65 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pnpm-workspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ catalog:
jsdom: '^23.0.1'
lint-staged: '^13.2.0'
multiformats: '^13.3.6'
next: '^15.5.6'
next: '^16.0.1'
npm-run-all: '^4.1.5'
nx: '22.0.2'
open: '^9.1.0'
Expand Down
Loading