Transpile theia to es6

Transpiles theia to es6. To keep support of es5 based vscode extensions, the @es5ClassCompat tag was used. The tag was also applied to be used with theia es5 plugins. Contributed on behalf of STMicroelectronics Signed-off-by: Simon Graband <[email protected]> Co-authored-by: Paul Maréchal <[email protected]>
eclipse-theia · Jun 22, 2021 · 286ee01 · 286ee01
1 parent 4c9b8b8
commit 286ee01
Show file tree

Hide file tree

Showing 13 changed files with 91 additions and 45 deletions.
diff --git a/configs/base.tsconfig.json b/configs/base.tsconfig.json
@@ -14,7 +14,7 @@
         "resolveJsonModule": true,
         "module": "commonjs",
         "moduleResolution": "node",
-        "target": "es5",
+        "target": "es6",
         "jsx": "react",
         "lib": [
             "es6",

diff --git a/dev-packages/application-manager/src/generator/webpack-generator.ts b/dev-packages/application-manager/src/generator/webpack-generator.ts
@@ -195,26 +195,6 @@ module.exports = {
             {
                 test: /\\.plist$/,
                 type: 'asset/resource'
-            },
-            {
-                test: /\\.js$/,
-                // include only es6 dependencies to transpile them to es5 classes
-                include: /vscode-ws-jsonrpc|vscode-jsonrpc|vscode-languageserver-protocol|vscode-languageserver-types/,
-                use: {
-                    loader: 'babel-loader',
-                    options: {
-                        presets: ['@babel/preset-env'],
-                        plugins: [
-                            // reuse runtime babel lib instead of generating it in each js file
-                            '@babel/plugin-transform-runtime',
-                            // ensure that classes are transpiled
-                            '@babel/plugin-transform-classes'
-                        ],
-                        // see https://github.com/babel/babel/issues/8900#issuecomment-431240426
-                        sourceType: 'unambiguous',
-                        cacheDirectory: true
-                    }
-                }
             }
         ]
     },

diff --git a/packages/core/src/browser/navigatable.ts b/packages/core/src/browser/navigatable.ts
@@ -45,14 +45,14 @@ export namespace NavigatableWidget {
         return arg instanceof BaseWidget && Navigatable.is(arg);
     }
     export function* getAffected<T extends Widget>(
-        widgets: IterableIterator<T> | ArrayLike<T>,
+        widgets: Iterable<T>,
         context: MaybeArray<URI>
     ): IterableIterator<[URI, T & NavigatableWidget]> {
         const uris = Array.isArray(context) ? context : [context];
         return get(widgets, resourceUri => uris.some(uri => uri.isEqualOrParent(resourceUri)));
     }
     export function* get<T extends Widget>(
-        widgets: IterableIterator<T> | ArrayLike<T>,
+        widgets: Iterable<T>,
         filter: (resourceUri: URI) => boolean = () => true
     ): IterableIterator<[URI, T & NavigatableWidget]> {
         for (const widget of widgets) {

diff --git a/packages/core/src/browser/saveable.ts b/packages/core/src/browser/saveable.ts
@@ -161,11 +161,11 @@ export namespace SaveableWidget {
     export function is(widget: Widget | undefined): widget is SaveableWidget {
         return !!widget && 'closeWithoutSaving' in widget;
     }
-    export function getDirty<T extends Widget>(widgets: IterableIterator<T> | ArrayLike<T>): IterableIterator<SaveableWidget & T> {
+    export function getDirty<T extends Widget>(widgets: Iterable<T>): IterableIterator<SaveableWidget & T> {
         return get(widgets, Saveable.isDirty);
     }
     export function* get<T extends Widget>(
-        widgets: IterableIterator<T> | ArrayLike<T>,
+        widgets: Iterable<T>,
         filter: (widget: T) => boolean = () => true
     ): IterableIterator<SaveableWidget & T> {
         for (const widget of widgets) {

diff --git a/packages/core/src/browser/tree/tree-widget.tsx b/packages/core/src/browser/tree/tree-widget.tsx
@@ -976,7 +976,7 @@ export class TreeWidget extends ReactWidget implements StatefulWidget {
             decorations.push(node.decorationData);
         }
         if (this.decorations.has(node.id)) {
-            decorations.push(...this.decorations.get(node.id));
+            decorations.push(...this.decorations.get(node.id) || []);
         }
         return decorations.sort(TreeDecoration.Data.comparePriority);
     }

diff --git a/packages/monaco/src/typings/monaco/index.d.ts b/packages/monaco/src/typings/monaco/index.d.ts
@@ -525,7 +525,7 @@ declare module monaco.actions {
          * Retrieves all the registered menu items for the given menu.
          * @param menuId - see https://github.com/theia-ide/vscode/blob/standalone/0.20.x/src/vs/platform/actions/common/actions.ts#L67
          */
-        getMenuItems(menuId: 7 /* EditorContext */ | 8 /* EditorContextPeek */ | 25 /* MenubarSelectionMenu */): IMenuItem | ISubmenuItem[];
+        getMenuItems(menuId: 7 /* EditorContext */ | 8 /* EditorContextPeek */ | 25 /* MenubarSelectionMenu */): Iterable<IMenuItem> | Iterable<ISubmenuItem>;
     }
 
     // https://github.com/theia-ide/vscode/blob/standalone/0.20.x/src/vs/platform/actions/common/actions.ts#L51

diff --git a/packages/plugin-ext/src/main/browser/plugin-contribution-handler.ts b/packages/plugin-ext/src/main/browser/plugin-contribution-handler.ts
@@ -299,8 +299,9 @@ export class PluginContributionHandler {
             }
         }
 
-        if (contributions.colors) {
-            pushContribution('colors', () => this.colors.register(...contributions.colors));
+        const colors = contributions.colors;
+        if (colors) {
+            pushContribution('colors', () => this.colors.register(...colors));
         }
 
         if (contributions.taskDefinitions) {

diff --git a/packages/plugin-ext/src/main/browser/view/tree-view-widget.tsx b/packages/plugin-ext/src/main/browser/view/tree-view-widget.tsx
@@ -281,7 +281,7 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {
         });
 
         const children = this.getCaption(node);
-        return React.createElement('div', attrs, ...children);
+        return React.createElement('div', attrs, children);
     }
 
     protected getCaption(node: TreeNode): React.ReactNode {

diff --git a/packages/plugin-ext/src/plugin/command-registry.ts b/packages/plugin-ext/src/plugin/command-registry.ts
@@ -102,7 +102,7 @@ export class CommandRegistryImpl implements CommandRegistryExt {
             // Using the KnownCommand exclusions, convert the commands manually
             return KnownCommands.map(id, args, (mappedId: string, mappedArgs: any[] | undefined, mappedResult: KnownCommands.ConversionFunction) => {
                 const mr: KnownCommands.ConversionFunction = mappedResult;
-                return this.proxy.$executeCommand(mappedId, ...mappedArgs).then((result: any) => {
+                return this.proxy.$executeCommand(mappedId, ...mappedArgs || []).then((result: any) => {
                     if (!result) {
                         return undefined;
                     }