@theia/application-manager 1.24.0-next.7 → 1.24.0-next.71

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 (15) hide show
  1. package/lib/expose-loader.js +1 -1
  2. package/lib/expose-loader.js.map +1 -1
  3. package/lib/generator/abstract-generator.js +1 -1
  4. package/lib/generator/abstract-generator.js.map +1 -1
  5. package/lib/generator/frontend-generator.d.ts.map +1 -1
  6. package/lib/generator/frontend-generator.js +10 -2
  7. package/lib/generator/frontend-generator.js.map +1 -1
  8. package/lib/generator/webpack-generator.d.ts.map +1 -1
  9. package/lib/generator/webpack-generator.js +11 -19
  10. package/lib/generator/webpack-generator.js.map +1 -1
  11. package/package.json +4 -4
  12. package/src/expose-loader.ts +1 -1
  13. package/src/generator/abstract-generator.ts +1 -1
  14. package/src/generator/frontend-generator.ts +10 -2
  15. package/src/generator/webpack-generator.ts +11 -19
package/lib/expose-loader.js CHANGED
@@ -36,7 +36,7 @@ function exposeModule(modulePackage, resourcePath, source) {
36
36
  if (path.sep !== '/') {
37
37
  moduleName = moduleName.split(path.sep).join('/');
38
38
  }
39
- return source + `\nif (!global) global = {};\n(global['theia'] = global['theia'] || {})['${moduleName}'] = this;\n`;
39
+ return source + `\n;(globalThis['theia'] = globalThis['theia'] || {})['${moduleName}'] = this;\n`;
40
40
  }
41
41
  module.exports = function (source, sourceMap) {
42
42
  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":"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"}
package/lib/generator/abstract-generator.js CHANGED
@@ -58,7 +58,7 @@ class AbstractGenerator {
58
58
  await fs.writeFile(path, content);
59
59
  }
60
60
  ifMonaco(value, defaultValue = () => '') {
61
- return (this.pck.extensionPackages.some(e => e.name === '@theia/monaco') ? value : defaultValue)();
61
+ return (this.pck.extensionPackages.some(e => e.name === '@theia/monaco' || e.name === '@theia/monaco-editor-core') ? value : defaultValue)();
62
62
  }
63
63
  prettyStringify(object) {
64
64
  // eslint-disable-next-line no-null/no-null
package/lib/generator/abstract-generator.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"abstract-generator.js","sourceRoot":"","sources":["../../src/generator/abstract-generator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"abstract-generator.js","sourceRoot":"","sources":["../../src/generator/abstract-generator.ts"],"names":[],"mappings":"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"}
package/lib/generator/frontend-generator.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"frontend-generator.d.ts","sourceRoot":"","sources":["../../src/generator/frontend-generator.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAG3E,qBAAa,iBAAkB,SAAQ,iBAAiB;IAE9C,QAAQ,CAAC,OAAO,GAAE,gBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAU7D,SAAS,CAAC,mBAAmB,CAAC,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM;IAc3E,SAAS,CAAC,gBAAgB,CAAC,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM;IAexE,SAAS,CAAC,gBAAgB,CAAC,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM;IAOxE,SAAS,CAAC,cAAc,CAAC,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM;IAsDtE,SAAS,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM;CAoEnF"}
1
+ {"version":3,"file":"frontend-generator.d.ts","sourceRoot":"","sources":["../../src/generator/frontend-generator.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAG3E,qBAAa,iBAAkB,SAAQ,iBAAiB;IAE9C,QAAQ,CAAC,OAAO,GAAE,gBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAU7D,SAAS,CAAC,mBAAmB,CAAC,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM;IAc3E,SAAS,CAAC,gBAAgB,CAAC,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM;IAexE,SAAS,CAAC,gBAAgB,CAAC,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM;IAOxE,SAAS,CAAC,cAAc,CAAC,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM;IA8DtE,SAAS,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM;CAoEnF"}
package/lib/generator/frontend-generator.js CHANGED
@@ -45,11 +45,11 @@ class FrontendGenerator extends abstract_generator_1.AbstractGenerator {
45
45
  <html lang="en">
46
46
 
47
47
  <head>${this.compileIndexHead(frontendModules)}
48
- <script type="text/javascript" src="./bundle.js" charset="utf-8"></script>
49
48
  </head>
50
49
 
51
50
  <body>
52
- <div class="theia-preload">${this.compileIndexPreload(frontendModules)}</div>
51
+ <div class="theia-preload">${this.compileIndexPreload(frontendModules)}</div>
52
+ <script type="text/javascript" src="./bundle.js" charset="utf-8"></script>
53
53
  </body>
54
54
 
55
55
  </html>`;
@@ -74,6 +74,14 @@ const { FrontendApplicationConfigProvider } = require('@theia/core/lib/browser/f
74
74
 
75
75
  FrontendApplicationConfigProvider.set(${this.prettyStringify(this.pck.props.frontend.config)});
76
76
 
77
+ ${this.ifMonaco(() => `
78
+ self.MonacoEnvironment = {
79
+ getWorkerUrl: function (moduleId, label) {
80
+ return './editor.worker.js';
81
+ }
82
+ }
83
+ `)}
84
+
77
85
  const { ThemeService } = require('@theia/core/lib/browser/theming');
78
86
  ThemeService.get().loadUserTheme();
79
87
 
package/lib/generator/frontend-generator.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"frontend-generator.js","sourceRoot":"","sources":["../../src/generator/frontend-generator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"frontend-generator.js","sourceRoot":"","sources":["../../src/generator/frontend-generator.ts"],"names":[],"mappings":"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"}
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;cAOf,+BAA+B,IAAI,OAAO,CAAC,OAAO,CAAC;IAQnE,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED,IAAI,aAAa,IAAI,MAAM,CAE1B;IAED,SAAS,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM;IAI3D,SAAS,CAAC,oBAAoB,IAAI,MAAM;IAqKxC,SAAS,CAAC,wBAAwB,IAAI,MAAM;CAoB/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;cAOf,+BAA+B,IAAI,OAAO,CAAC,OAAO,CAAC;IAQnE,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED,IAAI,aAAa,IAAI,MAAM,CAE1B;IAED,SAAS,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM;IAI3D,SAAS,CAAC,oBAAoB,IAAI,MAAM;IA6JxC,SAAS,CAAC,wBAAwB,IAAI,MAAM;CAoB/C"}
package/lib/generator/webpack-generator.js CHANGED
@@ -51,8 +51,7 @@ class WebpackGenerator extends abstract_generator_1.AbstractGenerator {
51
51
  const path = require('path');
52
52
  const webpack = require('webpack');
53
53
  const yargs = require('yargs');
54
- ${this.ifMonaco(() => `const CopyWebpackPlugin = require('copy-webpack-plugin');
55
- `)}const CircularDependencyPlugin = require('circular-dependency-plugin');
54
+ const CircularDependencyPlugin = require('circular-dependency-plugin');
56
55
  const CompressionPlugin = require('compression-webpack-plugin')
57
56
 
58
57
  const outputPath = path.resolve(__dirname, 'lib');
@@ -65,18 +64,10 @@ const { mode, staticCompression } = yargs.option('mode', {
65
64
  type: 'boolean',
66
65
  default: true
67
66
  }).argv;
68
- const development = mode === 'development';${this.ifMonaco(() => `
69
-
70
- const monacoEditorCorePath = development ? '${this.resolve('@theia/monaco-editor-core', 'dev/vs')}' : '${this.resolve('@theia/monaco-editor-core', 'min/vs')}';`)}
67
+ const development = mode === 'development';
71
68
 
72
69
  const plugins = [
73
- ${this.ifMonaco(() => `new CopyWebpackPlugin({
74
- patterns: [{
75
- from: monacoEditorCorePath,
76
- to: 'vs'
77
- }]
78
- }),
79
- `)}new webpack.ProvidePlugin({
70
+ new webpack.ProvidePlugin({
80
71
  // the Buffer class doesn't exist in the browser but some dependencies rely on it
81
72
  Buffer: ['buffer', 'Buffer']
82
73
  })
@@ -94,11 +85,15 @@ module.exports = {
94
85
  mode,
95
86
  plugins,
96
87
  devtool: 'source-map',
97
- entry: path.resolve(__dirname, 'src-gen/frontend/index.js'),
88
+ entry: {
89
+ bundle: path.resolve(__dirname, 'src-gen/frontend/index.js'),
90
+ ${this.ifMonaco(() => "'editor.worker': '@theia/monaco-editor-core/esm/vs/editor/editor.worker.js'")}
91
+ },
98
92
  output: {
99
- filename: 'bundle.js',
93
+ filename: '[name].js',
100
94
  path: outputPath,
101
- devtoolModuleFilenameTemplate: 'webpack:///[resource-path]?[loaders]'
95
+ devtoolModuleFilenameTemplate: 'webpack:///[resource-path]?[loaders]',
96
+ globalObject: 'self'
102
97
  },
103
98
  target: '${this.ifBrowser('web', 'electron-renderer')}',
104
99
  cache: staticCompression,
@@ -195,10 +190,7 @@ module.exports = {
195
190
  'os': false,
196
191
  'timers': false
197
192
  },
198
- extensions: ['.js']${this.ifMonaco(() => `,
199
- alias: {
200
- 'vs': path.resolve(outputPath, monacoEditorCorePath)
201
- }`)}
193
+ extensions: ['.js']
202
194
  },
203
195
  stats: {
204
196
  warnings: true,
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":";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,2EAA2E;AAC3E,gFAAgF;;;AAEhF,8BAA8B;AAC9B,+BAA+B;AAC/B,6DAAyD;AAEzD,MAAa,gBAAiB,SAAQ,sCAAiB;IAEnD,KAAK,CAAC,QAAQ;QACV,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,oBAAoB,EAAE,CAAC,CAAC;QAClE,IAAI,MAAM,IAAI,CAAC,+BAA+B,EAAE,EAAE;YAC9C,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,wBAAwB,EAAE,CAAC,CAAC;SACtE;IACL,CAAC;IAES,KAAK,CAAC,+BAA+B;QAC3C,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,EAAE;YACzC,OAAO,IAAI,CAAC;SACf;QACD,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QAC3D,OAAO,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;IACjD,CAAC;IAED,IAAI,UAAU;QACV,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IAC9C,CAAC;IAED,IAAI,aAAa;QACb,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;IAClD,CAAC;IAES,OAAO,CAAC,UAAkB,EAAE,IAAY;QAC9C,OAAO,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACnF,CAAC;IAES,oBAAoB;QAC1B,OAAO;;+CAEgC,IAAI,CAAC,UAAU;;;;;;EAM5D,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;CACrB,CAAC;;;;;;;;;;;;;6CAa2C,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;;8CAEnB,IAAI,CAAC,OAAO,CAAC,2BAA2B,EAAE,QAAQ,CAAC,QAAQ,IAAI,CAAC,OAAO,CAAC,2BAA2B,EAAE,QAAQ,CAAC,IAAI,CAAC;;;MAG3J,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;;;;;;KAMrB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;eAwBS,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,mBAAmB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6BA+F5B,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;;;UAGvC,CAAC;;;;;;GAMR,CAAC;IACA,CAAC;IAES,wBAAwB;QAC9B,OAAO;;;;;4BAKa,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC;;;;;;;;;;;yBAWrC,CAAC;IACtB,CAAC;CAEJ;AAtND,4CAsNC"}
1
+ {"version":3,"file":"webpack-generator.js","sourceRoot":"","sources":["../../src/generator/webpack-generator.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,2EAA2E;AAC3E,gFAAgF;;;AAEhF,8BAA8B;AAC9B,+BAA+B;AAC/B,6DAAyD;AAEzD,MAAa,gBAAiB,SAAQ,sCAAiB;IAEnD,KAAK,CAAC,QAAQ;QACV,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,oBAAoB,EAAE,CAAC,CAAC;QAClE,IAAI,MAAM,IAAI,CAAC,+BAA+B,EAAE,EAAE;YAC9C,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,wBAAwB,EAAE,CAAC,CAAC;SACtE;IACL,CAAC;IAES,KAAK,CAAC,+BAA+B;QAC3C,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,EAAE;YACzC,OAAO,IAAI,CAAC;SACf;QACD,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QAC3D,OAAO,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;IACjD,CAAC;IAED,IAAI,UAAU;QACV,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IAC9C,CAAC;IAED,IAAI,aAAa;QACb,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;IAClD,CAAC;IAES,OAAO,CAAC,UAAkB,EAAE,IAAY;QAC9C,OAAO,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACnF,CAAC;IAES,oBAAoB;QAC1B,OAAO;;+CAEgC,IAAI,CAAC,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UA0CpD,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,6EAA6E,CAAC;;;;;;;;eAQ7F,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,mBAAmB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqGtD,CAAC;IACA,CAAC;IAES,wBAAwB;QAC9B,OAAO;;;;;4BAKa,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC;;;;;;;;;;;yBAWrC,CAAC;IACtB,CAAC;CAEJ;AA9MD,4CA8MC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@theia/application-manager",
3
- "version": "1.24.0-next.7+481d2cf0edd",
3
+ "version": "1.24.0-next.71+b3d41033c29",
4
4
  "description": "Theia application manager API.",
5
5
  "publishConfig": {
6
6
  "access": "public"
@@ -33,8 +33,8 @@
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
- "@theia/application-package": "1.24.0-next.7+481d2cf0edd",
37
- "@theia/ffmpeg": "1.24.0-next.7+481d2cf0edd",
36
+ "@theia/application-package": "1.24.0-next.71+b3d41033c29",
37
+ "@theia/ffmpeg": "1.24.0-next.71+b3d41033c29",
38
38
  "@types/fs-extra": "^4.0.2",
39
39
  "@types/semver": "^7.3.8",
40
40
  "babel-loader": "^8.2.2",
@@ -76,5 +76,5 @@
76
76
  "nyc": {
77
77
  "extends": "../../configs/nyc.json"
78
78
  },
79
- "gitHead": "481d2cf0edd33d8495662b9589b9232dcd6c8b34"
79
+ "gitHead": "b3d41033c29cb4f0ed8efbe969cfce41986c48e0"
80
80
  }
package/src/expose-loader.ts CHANGED
@@ -40,7 +40,7 @@ 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 + `\nif (!global) global = {};\n(global['theia'] = global['theia'] || {})['${moduleName}'] = this;\n`;
43
+ return source + `\n;(globalThis['theia'] = globalThis['theia'] || {})['${moduleName}'] = this;\n`;
44
44
  }
45
45
 
46
46
  /**
package/src/generator/abstract-generator.ts CHANGED
@@ -71,7 +71,7 @@ export abstract class AbstractGenerator {
71
71
  }
72
72
 
73
73
  protected ifMonaco(value: () => string, defaultValue: () => string = () => ''): string {
74
- return (this.pck.extensionPackages.some(e => e.name === '@theia/monaco') ? value : defaultValue)();
74
+ return (this.pck.extensionPackages.some(e => e.name === '@theia/monaco' || e.name === '@theia/monaco-editor-core') ? value : defaultValue)();
75
75
  }
76
76
 
77
77
  protected prettyStringify(object: object): string {
package/src/generator/frontend-generator.ts CHANGED
@@ -50,11 +50,11 @@ export class FrontendGenerator extends AbstractGenerator {
50
50
  <html lang="en">
51
51
 
52
52
  <head>${this.compileIndexHead(frontendModules)}
53
- <script type="text/javascript" src="./bundle.js" charset="utf-8"></script>
54
53
  </head>
55
54
 
56
55
  <body>
57
- <div class="theia-preload">${this.compileIndexPreload(frontendModules)}</div>
56
+ <div class="theia-preload">${this.compileIndexPreload(frontendModules)}</div>
57
+ <script type="text/javascript" src="./bundle.js" charset="utf-8"></script>
58
58
  </body>
59
59
 
60
60
  </html>`;
@@ -81,6 +81,14 @@ const { FrontendApplicationConfigProvider } = require('@theia/core/lib/browser/f
81
81
 
82
82
  FrontendApplicationConfigProvider.set(${this.prettyStringify(this.pck.props.frontend.config)});
83
83
 
84
+ ${this.ifMonaco(() => `
85
+ self.MonacoEnvironment = {
86
+ getWorkerUrl: function (moduleId, label) {
87
+ return './editor.worker.js';
88
+ }
89
+ }
90
+ `)}
91
+
84
92
  const { ThemeService } = require('@theia/core/lib/browser/theming');
85
93
  ThemeService.get().loadUserTheme();
86
94
 
package/src/generator/webpack-generator.ts CHANGED
@@ -56,8 +56,7 @@ export class WebpackGenerator extends AbstractGenerator {
56
56
  const path = require('path');
57
57
  const webpack = require('webpack');
58
58
  const yargs = require('yargs');
59
- ${this.ifMonaco(() => `const CopyWebpackPlugin = require('copy-webpack-plugin');
60
- `)}const CircularDependencyPlugin = require('circular-dependency-plugin');
59
+ const CircularDependencyPlugin = require('circular-dependency-plugin');
61
60
  const CompressionPlugin = require('compression-webpack-plugin')
62
61
 
63
62
  const outputPath = path.resolve(__dirname, 'lib');
@@ -70,18 +69,10 @@ const { mode, staticCompression } = yargs.option('mode', {
70
69
  type: 'boolean',
71
70
  default: true
72
71
  }).argv;
73
- const development = mode === 'development';${this.ifMonaco(() => `
74
-
75
- const monacoEditorCorePath = development ? '${this.resolve('@theia/monaco-editor-core', 'dev/vs')}' : '${this.resolve('@theia/monaco-editor-core', 'min/vs')}';`)}
72
+ const development = mode === 'development';
76
73
 
77
74
  const plugins = [
78
- ${this.ifMonaco(() => `new CopyWebpackPlugin({
79
- patterns: [{
80
- from: monacoEditorCorePath,
81
- to: 'vs'
82
- }]
83
- }),
84
- `)}new webpack.ProvidePlugin({
75
+ new webpack.ProvidePlugin({
85
76
  // the Buffer class doesn't exist in the browser but some dependencies rely on it
86
77
  Buffer: ['buffer', 'Buffer']
87
78
  })
@@ -99,11 +90,15 @@ module.exports = {
99
90
  mode,
100
91
  plugins,
101
92
  devtool: 'source-map',
102
- entry: path.resolve(__dirname, 'src-gen/frontend/index.js'),
93
+ entry: {
94
+ bundle: path.resolve(__dirname, 'src-gen/frontend/index.js'),
95
+ ${this.ifMonaco(() => "'editor.worker': '@theia/monaco-editor-core/esm/vs/editor/editor.worker.js'")}
96
+ },
103
97
  output: {
104
- filename: 'bundle.js',
98
+ filename: '[name].js',
105
99
  path: outputPath,
106
- devtoolModuleFilenameTemplate: 'webpack:///[resource-path]?[loaders]'
100
+ devtoolModuleFilenameTemplate: 'webpack:///[resource-path]?[loaders]',
101
+ globalObject: 'self'
107
102
  },
108
103
  target: '${this.ifBrowser('web', 'electron-renderer')}',
109
104
  cache: staticCompression,
@@ -200,10 +195,7 @@ module.exports = {
200
195
  'os': false,
201
196
  'timers': false
202
197
  },
203
- extensions: ['.js']${this.ifMonaco(() => `,
204
- alias: {
205
- 'vs': path.resolve(outputPath, monacoEditorCorePath)
206
- }`)}
198
+ extensions: ['.js']
207
199
  },
208
200
  stats: {
209
201
  warnings: true,