Skip to content

Commit c3e6ef7

Browse files
rchiodorchiodo
authored
Move redux logging to a different file (microsoft#10605)
* Move redux logging to a different file * Put back launch.json * Delete unnecessary file * Fix it so only loads during tests * Update dependency list * Make sure to exclude log4js when not needed * Remove unneeded dependencies
1 parent e0fa883 commit c3e6ef7

8 files changed

Lines changed: 350 additions & 252 deletions

File tree

‎.vscode/launch.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@
234234
"--ui=tdd",
235235
"--recursive",
236236
"--colors",
237-
//"--grep", "<suite name>",
237+
//"--grep", "<suite>",
238238
"--timeout=300000"
239239
],
240240
"env": {
@@ -243,7 +243,7 @@
243243
// Remove 'X' to turn on all logging in the debug output
244244
"XVSC_PYTHON_FORCE_LOGGING": "1",
245245
// Remove `X` prefix and update path to test with real python interpreter (for DS functional tests).
246-
"XCI_PYTHON_PATH": "<Python Path>"
246+
"XCI_PYTHON_PATH": "<Python Path>",
247247
},
248248
"outFiles": [
249249
"${workspaceFolder}/out/**/*.js"

‎build/ci/templates/globals.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ variables:
66
MOCHA_REPORTER_JUNIT: true # Use the mocha-multi-reporters and send output to both console (spec) and JUnit (mocha-junit-reporter).
77
VSC_PYTHON_FORCE_LOGGING: true # Enable this to turn on console output for the logger
88
VSC_PYTHON_LOG_FILE: '$(Build.ArtifactStagingDirectory)/pvsc.log'
9+
VSC_PYTHON_WEBVIEW_LOG_FILE: '$(Build.ArtifactStagingDirectory)/pvsc_webview.log'
910
CI_BRANCH_NAME: ${Build.SourceBranchName}
1011
npm_config_cache: $(Pipeline.Workspace)/.npm
1112
vmImageMacOS: 'macOS-10.15'

‎build/webpack/webpack.datascience-ui.config.builder.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ function buildConfiguration(isNotebook) {
190190
}),
191191
...getPlugins(isNotebook)
192192
],
193+
externals: ['log4js'],
193194
resolve: {
194195
// Add '.ts' and '.tsx' as resolvable extensions.
195196
extensions: ['.ts', '.tsx', '.js', '.json', '.svg']

‎gulpfile.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,9 @@ function getAllowedWarningsForWebPack(buildConfig) {
274274
'WARNING in ./node_modules/ws/lib/validation.js',
275275
'WARNING in ./node_modules/@jupyterlab/services/node_modules/ws/lib/buffer-util.js',
276276
'WARNING in ./node_modules/@jupyterlab/services/node_modules/ws/lib/validation.js',
277-
'WARNING in ./node_modules/any-promise/register.js'
277+
'WARNING in ./node_modules/any-promise/register.js',
278+
'WARNING in ./node_modules/log4js/lib/appenders/index.js',
279+
'WARNING in ./node_modules/log4js/lib/clustering.js'
278280
];
279281
case 'extension':
280282
return [

‎package-lock.json‎

Lines changed: 72 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)