Skip to content

Commit bdd5326

Browse files
committed
Merge remote-tracking branch 'origin/master' into rchiodo/interpreter_match_2
2 parents 104cf54 + 1f29704 commit bdd5326

File tree

54 files changed

+6653
-3908
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+6653
-3908
lines changed

.vscode/launch.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,13 @@
1919
"preLaunchTask": "Compile",
2020
"skipFiles": [
2121
"<node_internals>/**"
22-
]
22+
],
23+
"env": {
24+
// Enable this to turn on redux logging during debugging
25+
"XVSC_PYTHON_FORCE_LOGGING": "1",
26+
// Enable this to try out new experiments locally
27+
"XVSC_PYTHON_LOAD_EXPERIMENTS_FROM_FILE" : "1"
28+
}
2329
},
2430
{
2531
"name": "Extension (DS UI in Browser)",

build/webpack/common.js

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,18 @@ exports.nodeModulesToExternalize = [
4141
exports.nodeModulesToReplacePaths = [...exports.nodeModulesToExternalize];
4242
function getDefaultPlugins(name) {
4343
const plugins = [];
44-
plugins.push(
45-
new webpack_bundle_analyzer.BundleAnalyzerPlugin({
46-
analyzerMode: 'static',
47-
reportFilename: `${name}.analyzer.html`,
48-
generateStatsFile: true,
49-
statsFilename: `${name}.stats.json`,
50-
openAnalyzer: false // Open file manually if you want to see it :)
51-
})
52-
);
44+
// Only run the analyzer on a local machine or if required
45+
if (!constants.isCI || process.env.VSC_PYTHON_FORCE_ANALYZER) {
46+
plugins.push(
47+
new webpack_bundle_analyzer.BundleAnalyzerPlugin({
48+
analyzerMode: 'static',
49+
reportFilename: `${name}.analyzer.html`,
50+
generateStatsFile: true,
51+
statsFilename: `${name}.stats.json`,
52+
openAnalyzer: false // Open file manually if you want to see it :)
53+
})
54+
);
55+
}
5356
return plugins;
5457
}
5558
exports.getDefaultPlugins = getDefaultPlugins;

experiments.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
"min": 0,
138138
"max": 0
139139
},
140-
{
140+
{
141141
"name": "EnableIPyWidgets - experiment",
142142
"salt": "EnableIPyWidgets",
143143
"min": 0,

0 commit comments

Comments
 (0)