artin/sourcegraph
1
0
Fork 0
mirror of https://github.com/sourcegraph/sourcegraph.git synced 2026-02-06 18:11:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

web: make esbuild work with pnpm (#46452)

Browse Source
This commit is contained in:
Valery Bugakov 2023-01-15 10:46:03 +08:00 committed by GitHub
parent 018d45e4a9
commit 8ffcb9be58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/build-config/src/esbuild/stylePlugin.ts
View File

@ -10,7 +10,7 @@ import sass from 'sass'
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
import postcssConfig from '../../../../postcss.config'
import { NODE_MODULES_PATH, ROOT_PATH } from '../paths'
import { NODE_MODULES_PATH, ROOT_PATH, WORKSPACE_NODE_MODULES_PATHS } from '../paths'
/**
* An esbuild plugin that builds .css and .scss stylesheets (including support for CSS modules).
@ -101,7 +101,7 @@ export const stylePlugin: esbuild.Plugin = {
const resolver = ResolverFactory.createResolver({
fileSystem: new CachedInputFileSystem(fs, 4000),
extensions: ['.css', '.scss'],
modules: [NODE_MODULES_PATH],
modules: [NODE_MODULES_PATH, ...WORKSPACE_NODE_MODULES_PATHS],
unsafeCache: true,
})

13
client/build-config/src/paths.ts
View File

@ -1,4 +1,5 @@
import { realpathSync } from 'fs'
/* eslint-disable no-sync */
import fs from 'fs'
import path from 'path'
// NOTE: use fs.realpathSync() in addition to path.resolve() to resolve
@ -9,7 +10,7 @@ export function resolveWithSymlink(...args: string[]): string {
const resolvedPath = path.resolve(...args)
try {
return realpathSync(resolvedPath)
return fs.realpathSync(resolvedPath)
} catch {
return resolvedPath
}
@ -21,3 +22,11 @@ export const NODE_MODULES_PATH = resolveWithSymlink(ROOT_PATH, 'node_modules')
export const MONACO_EDITOR_PATH = resolveWithSymlink(NODE_MODULES_PATH, 'monaco-editor')
export const STATIC_ASSETS_PATH = resolveWithSymlink(ROOT_PATH, 'ui/assets')
export const STATIC_INDEX_PATH = resolveWithSymlink(STATIC_ASSETS_PATH, 'index.html')
function getWorkspaceNodeModulesPaths(): string[] {
const workspaces = fs.readdirSync(WORKSPACES_PATH)
const nodeModulesPaths = workspaces.map(workspace => resolveWithSymlink(WORKSPACES_PATH, workspace, 'node_modules'))
return nodeModulesPaths
}
export const WORKSPACE_NODE_MODULES_PATHS = getWorkspaceNodeModulesPaths()