Skip to content

Commit

Permalink
[chore] Fix issue with double monorepo detection/config override
Browse files Browse the repository at this point in the history
  • Loading branch information
bjoerge committed Dec 7, 2020
1 parent 6265c4d commit 46a9c17
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions packages/@sanity/server/src/configs/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,18 @@ import webpackIntegration from '@sanity/webpack-integration/v3'
import ExtractTextPlugin from 'extract-text-webpack-plugin'
import rxPaths from 'rxjs/_esm5/path-mapping'
import getStaticBasePath from '../util/getStaticBasePath'
import isSanityMonorepo from './isSanityMonorepo'

const resolve = (mod) => require.resolve(mod)

// eslint-disable-next-line complexity
export default (config = {}) => {
const staticPath = getStaticBasePath(config)
const env = config.env || 'development'
const inSanityMonorepo = isSanityMonorepo(config.basePath)
const wpIntegrationOptions = {
basePath: config.basePath,
env: config.env,
webpack,
isSanityMonorepo: inSanityMonorepo,
isSanityMonorepo: config.isSanityMonorepo,
}

const basePath = config.basePath || process.cwd()
Expand Down

1 comment on commit 46a9c17

@vercel
Copy link

@vercel vercel bot commented on 46a9c17 Dec 7, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.