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
7 changes: 0 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,6 @@ docs-shopify.dev/commands/interfaces/
vite.config.ts.timestamp*

# from nested gitignores
packages/app/assets/dev-console
packages/ui-extensions-server-kit/*.d.ts
packages/ui-extensions-server-kit/!typings.d.ts
packages/ui-extensions-server-kit/index.*
Expand All @@ -196,12 +195,6 @@ packages/store/src/cli/api/graphql/business-platform-organizations/organizations
packages/ui-extensions-test-utils/*.d.ts
packages/ui-extensions-test-utils/!typings.d.ts
packages/ui-extensions-test-utils/dist
packages/ui-extensions-dev-console/*.js
packages/ui-extensions-dev-console/*.d.ts
packages/ui-extensions-dev-console/!typings.d.ts
packages/ui-extensions-dev-console/.eslintrc.js
packages/ui-extensions-dev-console/css-transform.js
packages/ui-extensions-dev-console/dist
packages/cli-kit/src/cli/api/graphql/*/*_schema.graphql
packages/organizations/src/cli/api/graphql/*/*_schema.graphql
packages/store/src/cli/api/graphql/*/*_schema.graphql
Expand Down
6 changes: 0 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -359,12 +359,6 @@
]
}
},
"packages/ui-extensions-dev-console": {
"entry": [
"**/src/main.tsx!"
],
"project": "**/*.{ts,tsx}!"
},
"packages/ui-extensions-server-kit": {
"entry": [
"**/src/index.ts!",
Expand Down
1 change: 0 additions & 1 deletion packages/app/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"sourceRoot": "packages/app/src",
"projectType": "library",
"tags": ["scope:feature"],
"implicitDependencies": ["ui-extensions-dev-console"],
"targets": {
"clean": {
"executor": "nx:run-commands",
Expand Down
9 changes: 3 additions & 6 deletions packages/app/src/cli/services/dev/extension/server.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
import {
corsMiddleware,
devConsoleAssetsMiddleware,
devConsoleIndexMiddleware,
getExtensionAssetMiddleware,
getExtensionPayloadMiddleware,
getExtensionPointMiddleware,
getExtensionsPayloadMiddleware,
getLogMiddleware,
noCacheMiddleware,
redirectToDevConsoleMiddleware,
redirectToExtensionsMiddleware,
} from './server/middlewares.js'
import {ExtensionsPayloadStore, ExtensionsPayloadStoreOptions} from './payload/store.js'
import {ExtensionInstance} from '../../../models/extensions/extension-instance.js'
Expand All @@ -28,15 +26,14 @@ export function setupHTTPServer(options: SetupHTTPServerOptions) {
httpApp.use(getLogMiddleware(options))
httpApp.use(corsMiddleware)
httpApp.use(noCacheMiddleware)
httpRouter.use('/extensions/dev-console', devConsoleIndexMiddleware)
httpRouter.use('/extensions/dev-console/assets/**:assetPath', devConsoleAssetsMiddleware)
httpRouter.use('/extensions/dev-console', redirectToExtensionsMiddleware)
httpRouter.use('/extensions/:extensionId', getExtensionPayloadMiddleware(options))
httpRouter.use('/extensions/:extensionId/', getExtensionPayloadMiddleware(options))
httpRouter.use('/extensions/:extensionId/:extensionPointTarget', getExtensionPointMiddleware(options))
httpRouter.use('/extensions/:extensionId/assets/**:assetPath', getExtensionAssetMiddleware(options))
httpRouter.use('/extensions', getExtensionsPayloadMiddleware(options))
httpRouter.use('/extensions/', getExtensionsPayloadMiddleware(options))
httpRouter.use('/', redirectToDevConsoleMiddleware)
httpRouter.use('/', redirectToExtensionsMiddleware)

httpApp.use(httpRouter)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
getExtensionPayloadMiddleware,
fileServerMiddleware,
noCacheMiddleware,
redirectToDevConsoleMiddleware,
redirectToExtensionsMiddleware,
getExtensionPointMiddleware,
} from './middlewares.js'
import * as utilities from './utilities.js'
Expand Down Expand Up @@ -100,13 +100,13 @@ describe('noCacheMiddleware()', () => {
})
})

describe('redirectToDevConsoleMiddleware()', () => {
test('redirects to /extensions/dev-console', async () => {
describe('redirectToExtensionsMiddleware()', () => {
test('redirects to /extensions', async () => {
const event = getMockEvent()

await redirectToDevConsoleMiddleware(event)
await redirectToExtensionsMiddleware(event)

expect(h3.sendRedirect).toHaveBeenCalledWith(event, '/extensions/dev-console', 307)
expect(h3.sendRedirect).toHaveBeenCalledWith(event, '/extensions', 307)
})
})

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import {getUIExtensionPayload} from '../payload.js'
import {getHTML} from '../templates.js'
import {getWebSocketUrl} from '../../extension.js'
import {resolveOutputDir} from '../../../build/steps/include-assets/generate-manifest.js'
import {fileExists, isDirectory, readFile, findPathUp} from '@shopify/cli-kit/node/fs'
import {fileExists, isDirectory, readFile} from '@shopify/cli-kit/node/fs'
import {sendRedirect, defineEventHandler, getRequestHeader, getRouterParams, setResponseHeader} from 'h3'
import {joinPath, resolvePath, isSubpath, extname, moduleDirectory} from '@shopify/cli-kit/node/path'
import {joinPath, resolvePath, isSubpath, extname} from '@shopify/cli-kit/node/path'
import {outputDebug} from '@shopify/cli-kit/node/output'

import type {H3Event} from 'h3'
Expand All @@ -25,8 +25,8 @@ export const noCacheMiddleware = defineEventHandler((event) => {
setResponseHeader(event, 'Cache-Control', 'no-cache')
})

export const redirectToDevConsoleMiddleware = defineEventHandler(async (event) => {
return sendRedirect(event, '/extensions/dev-console', 307)
export const redirectToExtensionsMiddleware = defineEventHandler(async (event) => {
return sendRedirect(event, '/extensions', 307)
})

export async function fileServerMiddleware(event: H3Event, options: {filePath: string}) {
Expand Down Expand Up @@ -113,44 +113,6 @@ export function getExtensionsPayloadMiddleware({payloadStore}: GetExtensionsMidd
})
}

export const devConsoleIndexMiddleware = defineEventHandler(async (event) => {
const rootDirectory = await findPathUp(joinPath('assets', 'dev-console'), {
type: 'directory',
cwd: moduleDirectory(import.meta.url),
})

if (!rootDirectory) {
return sendError(event, {
statusCode: 404,
statusMessage: `Could not find root directory for dev console`,
})
}

return fileServerMiddleware(event, {
filePath: rootDirectory,
})
})

export const devConsoleAssetsMiddleware = defineEventHandler(async (event) => {
const {assetPath = ''} = getRouterParams(event)

const rootDirectory = await findPathUp(joinPath('assets', 'dev-console', 'extensions', 'dev-console', 'assets'), {
type: 'directory',
cwd: moduleDirectory(import.meta.url),
})

if (!rootDirectory) {
return sendError(event, {
statusCode: 404,
statusMessage: `Could not find root directory for dev console asset`,
})
}

return fileServerMiddleware(event, {
filePath: joinPath(rootDirectory, assetPath),
})
})

export function getLogMiddleware({devOptions}: GetExtensionsMiddlewareOptions) {
return defineEventHandler((event) => {
outputDebug(`UI extensions server received a ${event.method} request to URL ${event.path}`, devOptions.stdout)
Expand Down
Loading
Loading