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

build: still need BAZEL_BINDIR for webpack_bundle custom rule (#48796)

Browse Source 
Actually, webpack_bundle doesn't have JS_BINARY__TARGET set since it is
a custom build rule.... To handle all the cases I think we have to check
for both. 😞
This commit is contained in:
Greg Magolan 2023-03-07 20:02:11 -08:00 committed by GitHub
parent 47218d030c
commit 7f4e6da8cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.mocharc.js
View File

@ -1,4 +1,4 @@
const IS_BAZEL = !!(process.env.JS_BINARY__TARGET || process.env.BAZEL_TEST)
const IS_BAZEL = !!(process.env.JS_BINARY__TARGET || process.env.BAZEL_BINDIR || process.env.BAZEL_TEST)
const rootDir = IS_BAZEL ? process.cwd() : __dirname
module.exports = {

2
babel.config.jest.js
View File

@ -8,7 +8,7 @@ const path = require('path')
const logger = require('signale')
// TODO(bazel): drop when non-bazel removed.
if (!(process.env.JS_BINARY__TARGET || process.env.BAZEL_TEST)) {
if (!(process.env.JS_BINARY__TARGET || process.env.BAZEL_BINDIR || process.env.BAZEL_TEST)) {
throw new Error(__filename + ' is only for use with Bazel')
}

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

@ -3,7 +3,7 @@ import fs from 'fs'
import path from 'path'
// TODO(bazel): drop when non-bazel removed.
const IS_BAZEL = !!(process.env.JS_BINARY__TARGET || process.env.BAZEL_TEST)
const IS_BAZEL = !!(process.env.JS_BINARY__TARGET || process.env.BAZEL_BINDIR || process.env.BAZEL_TEST)
// NOTE: use fs.realpathSync() in addition to path.resolve() to resolve
// symlinks to the real path. This is required for webpack plugins using

2
client/build-config/src/webpack/getCacheConfig.ts
View File

@ -5,7 +5,7 @@ import webpack from 'webpack'
import { ROOT_PATH } from '../paths'
// TODO(bazel): drop when non-bazel removed.
const IS_BAZEL = !!process.env.JS_BINARY__TARGET
const IS_BAZEL = !!(process.env.JS_BINARY__TARGET || process.env.BAZEL_BINDIR)
interface CacheConfigOptions {
invalidateCacheFiles?: string[]

2
jest.config.base.js
View File

@ -3,7 +3,7 @@
const path = require('path')
// TODO(bazel): drop when non-bazel removed.
const IS_BAZEL = !!(process.env.JS_BINARY__TARGET || process.env.BAZEL_TEST)
const IS_BAZEL = !!(process.env.JS_BINARY__TARGET || process.env.BAZEL_BINDIR || process.env.BAZEL_TEST)
const SRC_EXT = IS_BAZEL ? 'js' : 'ts'
const rootDir = IS_BAZEL ? process.cwd() : __dirname