diff --git a/.circleci/config.yml b/.circleci/config.yml index 81f6beaae83c..3fe00818085e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -67,7 +67,7 @@ windowsWorkflowFilters: &windows-workflow-filters or: - equal: [ develop, << pipeline.git.branch >> ] - equal: [ linux-arm64, << pipeline.git.branch >> ] - - equal: [ 'issue-23843_electron_21_upgrade', << pipeline.git.branch >> ] + - equal: [ 'ryanm/fix/windows-node-module-install', << pipeline.git.branch >> ] - matches: pattern: "-release$" value: << pipeline.git.branch >> diff --git a/npm/webpack-preprocessor/package.json b/npm/webpack-preprocessor/package.json index 1d0dd66af9b7..3f008be1ae5e 100644 --- a/npm/webpack-preprocessor/package.json +++ b/npm/webpack-preprocessor/package.json @@ -90,10 +90,5 @@ "cypress-plugin", "cypress-preprocessor", "webpack" - ], - "workspaces": { - "nohoist": [ - "merge-source-map" - ] - } + ] } diff --git a/package.json b/package.json index 33888fe147d3..f794a90c0d58 100644 --- a/package.json +++ b/package.json @@ -256,6 +256,7 @@ "nohoist": [ "**/webpack-preprocessor/babel-loader", "**/webpack-preprocessor/**/merge-source-map", + "**/webpack-preprocessor/**/patch-package", "**/webpack-batteries-included-preprocessor/ts-loader", "**/jest", "**/jest*",