@theia/application-manager 1.70.0-next.6 → 1.70.0-next.61

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. package/lib/expose-loader.d.ts.map +1 -1
  2. package/lib/expose-loader.js +4 -1
  3. package/lib/expose-loader.js.map +1 -1
  4. package/lib/generator/webpack-generator.d.ts.map +1 -1
  5. package/lib/generator/webpack-generator.js +45 -2
  6. package/lib/generator/webpack-generator.js.map +1 -1
  7. package/package.json +6 -6
  8. package/src/expose-loader.ts +4 -1
  9. package/src/generator/webpack-generator.ts +45 -2
package/lib/expose-loader.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"expose-loader.d.ts","sourceRoot":"","sources":["../src/expose-loader.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AA0B/C;;;;GAIG;yBAGgB,MAAM,GAAG,EAAE,QAAQ,MAAM,EAAE,YAAY,YAAY,KAAG,MAAM,GAAG,SAAS;AAA3F,kBA2BE"}
1
+ {"version":3,"file":"expose-loader.d.ts","sourceRoot":"","sources":["../src/expose-loader.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AA6B/C;;;;GAIG;yBAGgB,MAAM,GAAG,EAAE,QAAQ,MAAM,EAAE,YAAY,YAAY,KAAG,MAAM,GAAG,SAAS;AAA3F,kBA2BE"}
package/lib/expose-loader.js CHANGED
@@ -36,7 +36,10 @@ function exposeModule(modulePackage, resourcePath, source) {
36
36
  if (path.sep !== '/') {
37
37
  moduleName = moduleName.split(path.sep).join('/');
38
38
  }
39
- return source + `\n;(globalThis['theia'] = globalThis['theia'] || {})['${moduleName}'] = this;\n`;
39
+ // Use `module.exports` with a fallback to `this` for compatibility with ESM modules.
40
+ // Webpack wraps ESM modules in arrow functions where `this` is `undefined`,
41
+ // but `module.exports` is available and points to the webpack exports object.
42
+ return source + `\n;(globalThis['theia'] = globalThis['theia'] || {})['${moduleName}'] = (typeof module === 'object' && module.exports) || this;\n`;
40
43
  }
41
44
  module.exports = function (source, sourceMap) {
42
45
  if (this.cacheable) {
package/lib/expose-loader.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"expose-loader.js","sourceRoot":"","sources":["../src/expose-loader.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"expose-loader.js","sourceRoot":"","sources":["../src/expose-loader.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;AAEhF,+BAA+B;AAC/B,6BAA6B;AAG7B,4FAAwF;AAExF,MAAM,cAAc,GAAqC,EAAE,CAAC;AAC5D,KAAK,MAAM,gBAAgB,IAAI,IAAI,wCAAkB,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,iBAAiB,EAAE,CAAC;IACtG,cAAc,CAAC,IAAI,CAAC;QAChB,IAAI,EAAE,gBAAgB,CAAC,IAAI;QAC3B,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,GAAG,CAAC,SAAU,CAAC,WAAW,CAAC;KACjE,CAAC,CAAC;AACP,CAAC;AAED,SAAS,YAAY,CAAC,aAA6C,EAAE,YAAoB,EAAE,MAAc;IACrG,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;QACtB,OAAO,MAAM,CAAC;IAClB,CAAC;IACD,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IAC/C,IAAI,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,GAAG,CAAC,SAAS,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IACxF,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;QACnB,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAC7C,CAAC;IACD,IAAI,IAAI,CAAC,GAAG,KAAK,GAAG,EAAE,CAAC;QACnB,UAAU,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACtD,CAAC;IACD,qFAAqF;IACrF,4EAA4E;IAC5E,8EAA8E;IAC9E,OAAO,MAAM,GAAG,yDAAyD,UAAU,gEAAgE,CAAC;AACxJ,CAAC;AASD,iBAAS,UAAqB,MAAc,EAAE,SAAwB;IAClE,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;QACjB,IAAI,CAAC,SAAS,EAAE,CAAC;IACrB,CAAC;IACD,IAAI,aAAa,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IACnG,IAAI,aAAa,EAAE,CAAC;QAChB,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,YAAY,CAAC,aAAa,EAAE,IAAI,CAAC,YAAY,EAAE,MAAM,CAAC,EAAE,SAAS,CAAC,CAAC;QAC5F,OAAO;IACX,CAAC;IACD,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,GAAG,cAAc,CAAC;IAC/C,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;IAC1D,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;QACf,MAAM,eAAe,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;QACpF,IAAI,GAAG,GAAG,IAAI,CAAC,YAAY,CAAC;QAC5B,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,eAAe,EAAE,CAAC;YACnD,IAAI,CAAC;gBACD,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC,CAAC;gBACjE,aAAa,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;gBAC9B,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;gBACnC,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,YAAY,CAAC,aAAa,EAAE,IAAI,CAAC,YAAY,EAAE,MAAM,CAAC,EAAE,SAAS,CAAC,CAAC;gBAC5F,OAAO;YACX,CAAC;YAAC,MAAM,CAAC;gBACL,YAAY;YAChB,CAAC;QACL,CAAC;IACL,CAAC;IACD,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;AAChD,CAAC,CAAC"}
package/lib/generator/webpack-generator.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"webpack-generator.d.ts","sourceRoot":"","sources":["../../src/generator/webpack-generator.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD,qBAAa,gBAAiB,SAAQ,iBAAiB;IAE7C,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;cAUf,+BAA+B,IAAI,OAAO,CAAC,OAAO,CAAC;IAQnE,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED,IAAI,aAAa,IAAI,MAAM,CAE1B;IAED,IAAI,iBAAiB,IAAI,MAAM,CAE9B;IAED,SAAS,CAAC,oBAAoB,IAAI,MAAM;IA0QxC,SAAS,CAAC,wBAAwB,IAAI,MAAM;IAyB5C,SAAS,CAAC,wBAAwB,IAAI,MAAM;CAyL/C"}
1
+ {"version":3,"file":"webpack-generator.d.ts","sourceRoot":"","sources":["../../src/generator/webpack-generator.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD,qBAAa,gBAAiB,SAAQ,iBAAiB;IAE7C,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;cAUf,+BAA+B,IAAI,OAAO,CAAC,OAAO,CAAC;IAQnE,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED,IAAI,aAAa,IAAI,MAAM,CAE1B;IAED,IAAI,iBAAiB,IAAI,MAAM,CAE9B;IAED,SAAS,CAAC,oBAAoB,IAAI,MAAM;IAsTxC,SAAS,CAAC,wBAAwB,IAAI,MAAM;IAyB5C,SAAS,CAAC,wBAAwB,IAAI,MAAM;CAwL/C"}
package/lib/generator/webpack-generator.js CHANGED
@@ -109,7 +109,6 @@ module.exports = [{
109
109
  devtool: 'source-map',
110
110
  entry: {
111
111
  bundle: path.resolve(__dirname, 'src-gen/frontend/index.js'),
112
- ${this.ifMonaco(() => "'editor.worker': '@theia/monaco-editor-core/esm/vs/editor/editor.worker.js'")}
113
112
  },
114
113
  output: {
115
114
  filename: '[name].js',
@@ -216,6 +215,15 @@ module.exports = [{
216
215
  'os': false,
217
216
  'timers': false
218
217
  },
218
+ ${this.ifMonaco(() => `alias: {
219
+ // Replace Monaco's nls module with Theia's localization-aware version.
220
+ // ESM exports are immutable so we cannot override localize/localize2 at runtime.
221
+ // Using the resolved absolute path ensures that both external imports
222
+ // (e.g. '@theia/monaco-editor-core/esm/vs/nls') and internal relative
223
+ // imports within Monaco (e.g. '../nls.js') are redirected.
224
+ [path.join(resolvePackagePath('@theia/monaco-editor-core', __dirname), '..', 'esm', 'vs', 'nls.js')]:
225
+ path.join(resolvePackagePath('@theia/monaco', __dirname), '..', 'lib', 'browser', 'monaco-nls.js')
226
+ },`)}
219
227
  extensions: ['.js']
220
228
  },
221
229
  stats: {
@@ -232,6 +240,33 @@ module.exports = [{
232
240
  }
233
241
  ]
234
242
  },
243
+ ${this.ifMonaco(() => `{
244
+ // The Monaco editor worker must be built separately without the NLS alias.
245
+ // The NLS alias redirects to monaco-nls.ts which imports from @theia/core,
246
+ // and those modules are not available in the web worker context.
247
+ mode,
248
+ devtool: 'source-map',
249
+ entry: {
250
+ 'editor.worker': '@theia/monaco-editor-core/esm/vs/editor/common/services/editorWebWorkerMain.js'
251
+ },
252
+ output: {
253
+ filename: '[name].js',
254
+ path: outputPath,
255
+ devtoolModuleFilenameTemplate: 'webpack:///[resource-path]?[loaders]',
256
+ globalObject: 'self'
257
+ },
258
+ target: 'webworker',
259
+ cache: staticCompression,
260
+ resolve: {
261
+ extensions: ['.js']
262
+ },
263
+ ignoreWarnings: [
264
+ {
265
+ module: /@theia\\/monaco-editor-core/,
266
+ message: /require function is used in a way in which dependencies cannot be statically extracted/
267
+ }
268
+ ]
269
+ },`)}
235
270
  {
236
271
  mode,
237
272
  plugins: [
@@ -277,6 +312,15 @@ module.exports = [{
277
312
  'os': false,
278
313
  'timers': false
279
314
  },
315
+ ${this.ifMonaco(() => `alias: {
316
+ // Replace Monaco's nls module with Theia's localization-aware version.
317
+ // ESM exports are immutable so we cannot override localize/localize2 at runtime.
318
+ // Using the resolved absolute path ensures that both external imports
319
+ // (e.g. '@theia/monaco-editor-core/esm/vs/nls') and internal relative
320
+ // imports within Monaco (e.g. '../nls.js') are redirected.
321
+ [path.join(resolvePackagePath('@theia/monaco-editor-core', __dirname), '..', 'esm', 'vs', 'nls.js')]:
322
+ path.join(resolvePackagePath('@theia/monaco', __dirname), '..', 'lib', 'browser', 'monaco-nls.js')
323
+ },`)}
280
324
  extensions: ['.js']
281
325
  },
282
326
  stats: {
@@ -362,7 +406,6 @@ for (const [entryPointName, entryPointPath] of Object.entries({
362
406
  ${this.ifPackage('@theia/filesystem', "'parcel-watcher': '@theia/filesystem/lib/node/parcel-watcher',")}
363
407
  ${this.ifPackage('@theia/plugin-ext-vscode', "'plugin-vscode-init': '@theia/plugin-ext-vscode/lib/node/plugin-vscode-init',")}
364
408
  ${this.ifPackage('@theia/api-provider-sample', "'gotd-api-init': '@theia/api-provider-sample/lib/plugin/gotd-api-init',")}
365
- ${this.ifPackage('@theia/git', "'git-locator-host': '@theia/git/lib/node/git-locator/git-locator-host',")}
366
409
  })) {
367
410
  commonJsLibraries[entryPointName] = {
368
411
  import: require.resolve(entryPointPath),
package/lib/generator/webpack-generator.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"webpack-generator.js","sourceRoot":"","sources":["../../src/generator/webpack-generator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"webpack-generator.js","sourceRoot":"","sources":["../../src/generator/webpack-generator.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@theia/application-manager",
3
- "version": "1.70.0-next.6+89cff0d43",
3
+ "version": "1.70.0-next.61+d13baea89",
4
4
  "description": "Theia application manager API.",
5
5
  "publishConfig": {
6
6
  "access": "public"
@@ -33,10 +33,10 @@
33
33
  "@babel/plugin-transform-classes": "^7.10.0",
34
34
  "@babel/plugin-transform-runtime": "^7.10.0",
35
35
  "@babel/preset-env": "^7.10.0",
36
- "@electron/rebuild": "^3.7.2",
37
- "@theia/application-package": "1.70.0-next.6+89cff0d43",
38
- "@theia/ffmpeg": "1.70.0-next.6+89cff0d43",
39
- "@theia/native-webpack-plugin": "1.70.0-next.6+89cff0d43",
36
+ "@electron/rebuild": "^4.0.0",
37
+ "@theia/application-package": "1.70.0-next.61+d13baea89",
38
+ "@theia/ffmpeg": "1.70.0-next.61+d13baea89",
39
+ "@theia/native-webpack-plugin": "1.70.0-next.61+d13baea89",
40
40
  "@types/fs-extra": "^4.0.2",
41
41
  "@types/semver": "^7.5.0",
42
42
  "babel-loader": "^8.2.2",
@@ -77,5 +77,5 @@
77
77
  "nyc": {
78
78
  "extends": "../../configs/nyc.json"
79
79
  },
80
- "gitHead": "89cff0d4360dbbdd37ee1245391a8f954df728e7"
80
+ "gitHead": "d13baea893dbdfe4c1df677a9b00b11289e71fa7"
81
81
  }
package/src/expose-loader.ts CHANGED
@@ -40,7 +40,10 @@ function exposeModule(modulePackage: { dir: string, name?: string }, resourcePat
40
40
  if (path.sep !== '/') {
41
41
  moduleName = moduleName.split(path.sep).join('/');
42
42
  }
43
- return source + `\n;(globalThis['theia'] = globalThis['theia'] || {})['${moduleName}'] = this;\n`;
43
+ // Use `module.exports` with a fallback to `this` for compatibility with ESM modules.
44
+ // Webpack wraps ESM modules in arrow functions where `this` is `undefined`,
45
+ // but `module.exports` is available and points to the webpack exports object.
46
+ return source + `\n;(globalThis['theia'] = globalThis['theia'] || {})['${moduleName}'] = (typeof module === 'object' && module.exports) || this;\n`;
44
47
  }
45
48
 
46
49
  /**
package/src/generator/webpack-generator.ts CHANGED
@@ -114,7 +114,6 @@ module.exports = [{
114
114
  devtool: 'source-map',
115
115
  entry: {
116
116
  bundle: path.resolve(__dirname, 'src-gen/frontend/index.js'),
117
- ${this.ifMonaco(() => "'editor.worker': '@theia/monaco-editor-core/esm/vs/editor/editor.worker.js'")}
118
117
  },
119
118
  output: {
120
119
  filename: '[name].js',
@@ -221,6 +220,15 @@ module.exports = [{
221
220
  'os': false,
222
221
  'timers': false
223
222
  },
223
+ ${this.ifMonaco(() => `alias: {
224
+ // Replace Monaco's nls module with Theia's localization-aware version.
225
+ // ESM exports are immutable so we cannot override localize/localize2 at runtime.
226
+ // Using the resolved absolute path ensures that both external imports
227
+ // (e.g. '@theia/monaco-editor-core/esm/vs/nls') and internal relative
228
+ // imports within Monaco (e.g. '../nls.js') are redirected.
229
+ [path.join(resolvePackagePath('@theia/monaco-editor-core', __dirname), '..', 'esm', 'vs', 'nls.js')]:
230
+ path.join(resolvePackagePath('@theia/monaco', __dirname), '..', 'lib', 'browser', 'monaco-nls.js')
231
+ },`)}
224
232
  extensions: ['.js']
225
233
  },
226
234
  stats: {
@@ -237,6 +245,33 @@ module.exports = [{
237
245
  }
238
246
  ]
239
247
  },
248
+ ${this.ifMonaco(() => `{
249
+ // The Monaco editor worker must be built separately without the NLS alias.
250
+ // The NLS alias redirects to monaco-nls.ts which imports from @theia/core,
251
+ // and those modules are not available in the web worker context.
252
+ mode,
253
+ devtool: 'source-map',
254
+ entry: {
255
+ 'editor.worker': '@theia/monaco-editor-core/esm/vs/editor/common/services/editorWebWorkerMain.js'
256
+ },
257
+ output: {
258
+ filename: '[name].js',
259
+ path: outputPath,
260
+ devtoolModuleFilenameTemplate: 'webpack:///[resource-path]?[loaders]',
261
+ globalObject: 'self'
262
+ },
263
+ target: 'webworker',
264
+ cache: staticCompression,
265
+ resolve: {
266
+ extensions: ['.js']
267
+ },
268
+ ignoreWarnings: [
269
+ {
270
+ module: /@theia\\/monaco-editor-core/,
271
+ message: /require function is used in a way in which dependencies cannot be statically extracted/
272
+ }
273
+ ]
274
+ },`)}
240
275
  {
241
276
  mode,
242
277
  plugins: [
@@ -282,6 +317,15 @@ module.exports = [{
282
317
  'os': false,
283
318
  'timers': false
284
319
  },
320
+ ${this.ifMonaco(() => `alias: {
321
+ // Replace Monaco's nls module with Theia's localization-aware version.
322
+ // ESM exports are immutable so we cannot override localize/localize2 at runtime.
323
+ // Using the resolved absolute path ensures that both external imports
324
+ // (e.g. '@theia/monaco-editor-core/esm/vs/nls') and internal relative
325
+ // imports within Monaco (e.g. '../nls.js') are redirected.
326
+ [path.join(resolvePackagePath('@theia/monaco-editor-core', __dirname), '..', 'esm', 'vs', 'nls.js')]:
327
+ path.join(resolvePackagePath('@theia/monaco', __dirname), '..', 'lib', 'browser', 'monaco-nls.js')
328
+ },`)}
285
329
  extensions: ['.js']
286
330
  },
287
331
  stats: {
@@ -369,7 +413,6 @@ for (const [entryPointName, entryPointPath] of Object.entries({
369
413
  ${this.ifPackage('@theia/filesystem', "'parcel-watcher': '@theia/filesystem/lib/node/parcel-watcher',")}
370
414
  ${this.ifPackage('@theia/plugin-ext-vscode', "'plugin-vscode-init': '@theia/plugin-ext-vscode/lib/node/plugin-vscode-init',")}
371
415
  ${this.ifPackage('@theia/api-provider-sample', "'gotd-api-init': '@theia/api-provider-sample/lib/plugin/gotd-api-init',")}
372
- ${this.ifPackage('@theia/git', "'git-locator-host': '@theia/git/lib/node/git-locator/git-locator-host',")}
373
416
  })) {
374
417
  commonJsLibraries[entryPointName] = {
375
418
  import: require.resolve(entryPointPath),