Migrate workspaces/ to ESM

- Rename Workspace.js to WorkspaceImpl.js to not name clash with
workspace.js in the Grit localization generation.

Bug: 1006759
Change-Id: I56a496d866e4a453cd3ef84a24c29f8baa296876
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1847280
Commit-Queue: Tim Van der Lippe <tvanderlippe@chromium.org>
Reviewed-by: Yang Guo <yangguo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#703716}

third_party/blink/renderer/devtools/BUILD.gn

@@ -785,10 +785,7 @@ all_devtools_files = [
   "front_end/worker_main/module.json",
   "front_end/worker_service/module.json",
   "front_end/worker_service/ServiceDispatcher.js",
-  "front_end/workspace/FileManager.js",
   "front_end/workspace/module.json",
-  "front_end/workspace/UISourceCode.js",
-  "front_end/workspace/Workspace.js",
   "front_end/workspace_diff/WorkspaceDiff.js",
   "front_end/workspace_diff/module.json",
 ]
@@ -847,6 +844,10 @@ lighthouse_locale_files = [
 all_devtools_files += lighthouse_locale_files
 
 all_devtools_modules = [
+  "front_end/workspace/workspace.js",
+  "front_end/workspace/WorkspaceImpl.js",
+  "front_end/workspace/UISourceCode.js",
+  "front_end/workspace/FileManager.js",
   "front_end/services/services.js",
   "front_end/services/ServiceManager.js",
   "front_end/sdk/sdk.js",
@@ -1194,6 +1195,10 @@ application_templates = [
 ]
 
 copied_devtools_modules = [
+  "$resources_out_dir/workspace/workspace.js",
+  "$resources_out_dir/workspace/WorkspaceImpl.js",
+  "$resources_out_dir/workspace/UISourceCode.js",
+  "$resources_out_dir/workspace/FileManager.js",
   "$resources_out_dir/services/services.js",
   "$resources_out_dir/services/ServiceManager.js",
   "$resources_out_dir/sdk/sdk.js",

third_party/blink/renderer/devtools/front_end/persistence/NetworkPersistenceManager.js

@@ -324,8 +324,9 @@ Persistence.NetworkPersistenceManager = class extends Common.Object {
     const url = Common.ParsedURL.urlWithoutHash(uiSourceCode.url());
     this._networkUISourceCodeForEncodedPath.set(this._encodedPathFromUrl(url), uiSourceCode);
 
-    const fileSystemUISourceCode =
-        this._project.uiSourceCodeForURL(this._project.fileSystemPath() + '/' + this._encodedPathFromUrl(url));
+    const fileSystemUISourceCode = this._project.uiSourceCodeForURL(
+        /** @type {!Persistence.FileSystemWorkspaceBinding.FileSystem} */ (this._project).fileSystemPath() + '/' +
+        this._encodedPathFromUrl(url));
     if (!fileSystemUISourceCode) {
       return;
     }
@@ -465,7 +466,8 @@ Persistence.NetworkPersistenceManager = class extends Common.Object {
     if (!this._active || (method !== 'GET' && method !== 'POST')) {
       return;
     }
-    const path = this._project.fileSystemPath() + '/' + this._encodedPathFromUrl(interceptedRequest.request.url);
+    const path = /** @type {!Persistence.FileSystemWorkspaceBinding.FileSystem} */ (this._project).fileSystemPath() +
+        '/' + this._encodedPathFromUrl(interceptedRequest.request.url);
     const fileSystemUISourceCode = this._project.uiSourceCodeForURL(path);
     if (!fileSystemUISourceCode) {
       return;

third_party/blink/renderer/devtools/front_end/persistence/WorkspaceSettingsTab.js

@@ -88,7 +88,9 @@ Persistence.WorkspaceSettingsTab = class extends UI.VBox {
     }
     const networkPersistenceProject = Persistence.networkPersistenceManager.project();
     if (networkPersistenceProject &&
-        Persistence.isolatedFileSystemManager.fileSystem(networkPersistenceProject.fileSystemPath()) === fileSystem) {
+        Persistence.isolatedFileSystemManager.fileSystem(
+            /** @type {!Persistence.FileSystemWorkspaceBinding.FileSystem} */ (networkPersistenceProject)
+                .fileSystemPath()) === fileSystem) {
       return;
     }
     const element = this._renderFileSystem(fileSystem);

third_party/blink/renderer/devtools/front_end/root.js

@@ -12,3 +12,4 @@ import './sdk/sdk.js';
 import './ui/ui.js';
 
 import './services/services.js';
+import './workspace/workspace.js';

third_party/blink/renderer/devtools/front_end/workspace/FileManager.js

@@ -31,7 +31,7 @@
 /**
  * @unrestricted
  */
-Workspace.FileManager = class extends Common.Object {
+export default class FileManager extends Common.Object {
   constructor() {
     super();
     /** @type {!Map<string, function(?{fileSystemPath: (string|undefined)})>} */
@@ -101,16 +101,28 @@ Workspace.FileManager = class extends Common.Object {
    */
   _appendedToURL(event) {
     const url = /** @type {string} */ (event.data);
-    this.dispatchEventToListeners(Workspace.FileManager.Events.AppendedToURL, url);
+    this.dispatchEventToListeners(Events.AppendedToURL, url);
   }
-};
+}
 
 /** @enum {symbol} */
-Workspace.FileManager.Events = {
+export const Events = {
   AppendedToURL: Symbol('AppendedToURL')
 };
 
+/* Legacy exported object */
+self.Workspace = self.Workspace || {};
+
+/* Legacy exported object */
+Workspace = Workspace || {};
+
+/** @constructor */
+Workspace.FileManager = FileManager;
+
+/** @enum {symbol} */
+Workspace.FileManager.Events = Events;
+
 /**
- * @type {?Workspace.FileManager}
+ * @type {?FileManager}
  */
-Workspace.fileManager;
+Workspace.fileManager;
\ No newline at end of file

third_party/blink/renderer/devtools/front_end/workspace/UISourceCode.js

@@ -31,7 +31,7 @@
  * @implements {Common.ContentProvider}
  * @unrestricted
  */
-Workspace.UISourceCode = class extends Common.Object {
+export default class UISourceCode extends Common.Object {
   /**
    * @param {!Workspace.Project} project
    * @param {string} url
@@ -59,10 +59,10 @@ Workspace.UISourceCode = class extends Common.Object {
     this._contentType = contentType;
     /** @type {?Promise<string>} */
     this._requestContentPromise = null;
-    /** @type {?Platform.Multimap<string, !Workspace.UISourceCode.LineMarker>} */
+    /** @type {?Platform.Multimap<string, !LineMarker>} */
     this._decorations = null;
     this._hasCommits = false;
-    /** @type {?Set<!Workspace.UISourceCode.Message>} */
+    /** @type {?Set<!Message>} */
     this._messages = null;
     this._contentLoaded = false;
     /** @type {?string} */
@@ -80,7 +80,7 @@ Workspace.UISourceCode = class extends Common.Object {
   }
 
   /**
-   * @return {!Promise<?Workspace.UISourceCodeMetadata>}
+   * @return {!Promise<?UISourceCodeMetadata>}
    */
   requestMetadata() {
     return this._project.requestMetadata(this);
@@ -170,7 +170,7 @@ Workspace.UISourceCode = class extends Common.Object {
      * @param {string=} newName
      * @param {string=} newURL
      * @param {!Common.ResourceType=} newContentType
-     * @this {Workspace.UISourceCode}
+     * @this {UISourceCode}
      */
     function innerCallback(success, newName, newURL, newContentType) {
       if (success) {
@@ -201,7 +201,7 @@ Workspace.UISourceCode = class extends Common.Object {
     if (contentType) {
       this._contentType = contentType;
     }
-    this.dispatchEventToListeners(Workspace.UISourceCode.Events.TitleChanged, this);
+    this.dispatchEventToListeners(Events.TitleChanged, this);
     this.project().workspace().dispatchEventToListeners(
         Workspace.Workspace.Events.UISourceCodeRenamed, {oldURL: oldURL, uiSourceCode: this});
   }
@@ -279,7 +279,7 @@ Workspace.UISourceCode = class extends Common.Object {
     /**
      * @param {?string} updatedContent
      * @param {boolean} encoded
-     * @this {Workspace.UISourceCode}
+     * @this {UISourceCode}
      */
     async function contentLoaded(updatedContent, encoded) {
       this._checkingContent = false;
@@ -346,7 +346,7 @@ Workspace.UISourceCode = class extends Common.Object {
 
     this._innerResetWorkingCopy();
     const data = {uiSourceCode: this, content, encoded: this._contentEncoded};
-    this.dispatchEventToListeners(Workspace.UISourceCode.Events.WorkingCopyCommitted, data);
+    this.dispatchEventToListeners(Events.WorkingCopyCommitted, data);
     this._project.workspace().dispatchEventToListeners(Workspace.Workspace.Events.WorkingCopyCommitted, data);
     if (committedByUser) {
       this._project.workspace().dispatchEventToListeners(Workspace.Workspace.Events.WorkingCopyCommittedByUser, data);
@@ -422,7 +422,7 @@ Workspace.UISourceCode = class extends Common.Object {
 
   _workingCopyChanged() {
     this._removeAllMessages();
-    this.dispatchEventToListeners(Workspace.UISourceCode.Events.WorkingCopyChanged, this);
+    this.dispatchEventToListeners(Events.WorkingCopyChanged, this);
     this._project.workspace().dispatchEventToListeners(
         Workspace.Workspace.Events.WorkingCopyChanged, {uiSourceCode: this});
   }
@@ -487,28 +487,28 @@ Workspace.UISourceCode = class extends Common.Object {
   /**
    * @param {number} lineNumber
    * @param {number=} columnNumber
-   * @return {!Workspace.UILocation}
+   * @return {!UILocation}
    */
   uiLocation(lineNumber, columnNumber) {
     if (typeof columnNumber === 'undefined') {
       columnNumber = 0;
     }
-    return new Workspace.UILocation(this, lineNumber, columnNumber);
+    return new UILocation(this, lineNumber, columnNumber);
   }
 
   /**
-   * @return {!Set<!Workspace.UISourceCode.Message>}
+   * @return {!Set<!Message>}
    */
   messages() {
     return this._messages ? new Set(this._messages) : new Set();
   }
 
   /**
-   * @param {!Workspace.UISourceCode.Message.Level} level
+   * @param {!Message.Level} level
    * @param {string} text
    * @param {number} lineNumber
    * @param {number=} columnNumber
-   * @return {!Workspace.UISourceCode.Message} message
+   * @return {!Message} message
    */
   addLineMessage(level, text, lineNumber, columnNumber) {
     return this.addMessage(
@@ -516,27 +516,27 @@ Workspace.UISourceCode = class extends Common.Object {
   }
 
   /**
-   * @param {!Workspace.UISourceCode.Message.Level} level
+   * @param {!Message.Level} level
    * @param {string} text
    * @param {!TextUtils.TextRange} range
-   * @return {!Workspace.UISourceCode.Message} message
+   * @return {!Message} message
    */
   addMessage(level, text, range) {
-    const message = new Workspace.UISourceCode.Message(this, level, text, range);
+    const message = new Message(this, level, text, range);
     if (!this._messages) {
       this._messages = new Set();
     }
     this._messages.add(message);
-    this.dispatchEventToListeners(Workspace.UISourceCode.Events.MessageAdded, message);
+    this.dispatchEventToListeners(Events.MessageAdded, message);
     return message;
   }
 
   /**
-   * @param {!Workspace.UISourceCode.Message} message
+   * @param {!Message} message
    */
   removeMessage(message) {
     if (this._messages && this._messages.delete(message)) {
-      this.dispatchEventToListeners(Workspace.UISourceCode.Events.MessageRemoved, message);
+      this.dispatchEventToListeners(Events.MessageRemoved, message);
     }
   }
 
@@ -545,7 +545,7 @@ Workspace.UISourceCode = class extends Common.Object {
       return;
     }
     for (const message of this._messages) {
-      this.dispatchEventToListeners(Workspace.UISourceCode.Events.MessageRemoved, message);
+      this.dispatchEventToListeners(Events.MessageRemoved, message);
     }
     this._messages = null;
   }
@@ -565,12 +565,12 @@ Workspace.UISourceCode = class extends Common.Object {
    * @param {?} data
    */
   addDecoration(range, type, data) {
-    const marker = new Workspace.UISourceCode.LineMarker(range, type, data);
+    const marker = new LineMarker(range, type, data);
     if (!this._decorations) {
       this._decorations = new Platform.Multimap();
     }
     this._decorations.set(type, marker);
-    this.dispatchEventToListeners(Workspace.UISourceCode.Events.LineDecorationAdded, marker);
+    this.dispatchEventToListeners(Events.LineDecorationAdded, marker);
   }
 
   /**
@@ -583,12 +583,12 @@ Workspace.UISourceCode = class extends Common.Object {
     const markers = this._decorations.get(type);
     this._decorations.deleteAll(type);
     markers.forEach(marker => {
-      this.dispatchEventToListeners(Workspace.UISourceCode.Events.LineDecorationRemoved, marker);
+      this.dispatchEventToListeners(Events.LineDecorationRemoved, marker);
     });
   }
 
   /**
-   * @return {!Array<!Workspace.UISourceCode.LineMarker>}
+   * @return {!Array<!LineMarker>}
    */
   allDecorations() {
     return this._decorations ? this._decorations.valuesArray() : [];
@@ -600,21 +600,20 @@ Workspace.UISourceCode = class extends Common.Object {
     }
     const decorationList = this._decorations.valuesArray();
     this._decorations.clear();
-    decorationList.forEach(
-        marker => this.dispatchEventToListeners(Workspace.UISourceCode.Events.LineDecorationRemoved, marker));
+    decorationList.forEach(marker => this.dispatchEventToListeners(Events.LineDecorationRemoved, marker));
   }
 
   /**
    * @param {string} type
-   * @return {?Set<!Workspace.UISourceCode.LineMarker>}
+   * @return {?Set<!LineMarker>}
    */
   decorationsForType(type) {
     return this._decorations ? this._decorations.get(type) : null;
   }
-};
+}
 
 /** @enum {symbol} */
-Workspace.UISourceCode.Events = {
+export const Events = {
   WorkingCopyChanged: Symbol('WorkingCopyChanged'),
   WorkingCopyCommitted: Symbol('WorkingCopyCommitted'),
   TitleChanged: Symbol('TitleChanged'),
@@ -627,9 +626,9 @@ Workspace.UISourceCode.Events = {
 /**
  * @unrestricted
  */
-Workspace.UILocation = class {
+export class UILocation {
   /**
-   * @param {!Workspace.UISourceCode} uiSourceCode
+   * @param {!UISourceCode} uiSourceCode
    * @param {number} lineNumber
    * @param {number} columnNumber
    */
@@ -667,8 +666,8 @@ Workspace.UILocation = class {
   }
 
   /**
-   * @param {!Workspace.UILocation} location1
-   * @param {!Workspace.UILocation} location2
+   * @param {!UILocation} location1
+   * @param {!UILocation} location2
    * @return {number}
    */
   static comparator(location1, location2) {
@@ -676,7 +675,7 @@ Workspace.UILocation = class {
   }
 
   /**
-   * @param {!Workspace.UILocation} other
+   * @param {!UILocation} other
    * @return {number}
    */
   compareTo(other) {
@@ -688,15 +687,15 @@ Workspace.UILocation = class {
     }
     return this.columnNumber - other.columnNumber;
   }
-};
+}
 
 /**
  * @unrestricted
  */
-Workspace.UISourceCode.Message = class {
+export class Message {
   /**
-   * @param {!Workspace.UISourceCode} uiSourceCode
-   * @param {!Workspace.UISourceCode.Message.Level} level
+   * @param {!UISourceCode} uiSourceCode
+   * @param {!Message.Level} level
    * @param {string} text
    * @param {!TextUtils.TextRange} range
    */
@@ -708,14 +707,14 @@ Workspace.UISourceCode.Message = class {
   }
 
   /**
-   * @return {!Workspace.UISourceCode}
+   * @return {!UISourceCode}
    */
   uiSourceCode() {
     return this._uiSourceCode;
   }
 
   /**
-   * @return {!Workspace.UISourceCode.Message.Level}
+   * @return {!Message.Level}
    */
   level() {
     return this._level;
@@ -750,7 +749,7 @@ Workspace.UISourceCode.Message = class {
   }
 
   /**
-   * @param {!Workspace.UISourceCode.Message} another
+   * @param {!Message} another
    * @return {boolean}
    */
   isEqual(another) {
@@ -761,12 +760,12 @@ Workspace.UISourceCode.Message = class {
   remove() {
     this._uiSourceCode.removeMessage(this);
   }
-};
+}
 
 /**
  * @enum {string}
  */
-Workspace.UISourceCode.Message.Level = {
+Message.Level = {
   Error: 'Error',
   Warning: 'Warning'
 };
@@ -774,7 +773,7 @@ Workspace.UISourceCode.Message.Level = {
 /**
  * @unrestricted
  */
-Workspace.UISourceCode.LineMarker = class {
+export class LineMarker {
   /**
    * @param {!TextUtils.TextRange} range
    * @param {string} type
@@ -806,12 +805,12 @@ Workspace.UISourceCode.LineMarker = class {
   data() {
     return this._data;
   }
-};
+}
 
 /**
  * @unrestricted
  */
-Workspace.UISourceCodeMetadata = class {
+export class UISourceCodeMetadata {
   /**
    * @param {?Date} modificationTime
    * @param {?number} contentSize
@@ -820,4 +819,28 @@ Workspace.UISourceCodeMetadata = class {
     this.modificationTime = modificationTime;
     this.contentSize = contentSize;
   }
-};
+}
+
+/* Legacy exported object */
+self.Workspace = self.Workspace || {};
+
+/* Legacy exported object */
+Workspace = Workspace || {};
+
+/** @constructor */
+Workspace.UISourceCode = UISourceCode;
+
+/** @enum {symbol} */
+Workspace.UISourceCode.Events = Events;
+
+/** @constructor */
+Workspace.UISourceCode.Message = Message;
+
+/** @constructor */
+Workspace.UISourceCode.LineMarker = LineMarker;
+
+/** @constructor */
+Workspace.UILocation = UILocation;
+
+/** @constructor */
+Workspace.UISourceCodeMetadata = UISourceCodeMetadata;
\ No newline at end of file

third_party/blink/renderer/devtools/front_end/workspace/Workspace.js → third_party/blink/renderer/devtools/front_end/workspace/WorkspaceImpl.js

@@ -30,83 +30,92 @@
 /**
  * @interface
  */
-Workspace.ProjectSearchConfig = function() {};
-
-Workspace.ProjectSearchConfig.prototype = {
+export class ProjectSearchConfig {
   /**
    * @return {string}
    */
-  query() {},
+  query() {
+  }
 
   /**
    * @return {boolean}
    */
-  ignoreCase() {},
+  ignoreCase() {
+  }
 
   /**
    * @return {boolean}
    */
-  isRegex() {},
+  isRegex() {
+  }
 
   /**
    * @return {!Array.<string>}
    */
-  queries() {},
+  queries() {
+  }
 
   /**
    * @param {string} filePath
    * @return {boolean}
    */
-  filePathMatchesFileQuery(filePath) {}
-};
+  filePathMatchesFileQuery(filePath) {
+  }
+}
 
 /**
  * @interface
  */
-Workspace.Project = function() {};
-
-Workspace.Project.prototype = {
+export class Project {
   /**
-   * @return {!Workspace.Workspace}
+   * @return {!WorkspaceImpl}
    */
-  workspace() {},
+  workspace() {
+  }
 
   /**
    * @return {string}
    */
-  id() {},
+  id() {
+  }
 
   /**
    * @return {string}
    */
-  type() {},
+  type() {
+  }
 
   /**
    * @return {boolean}
    */
-  isServiceProject() {},
+  isServiceProject() {
+  }
 
   /**
    * @return {string}
    */
-  displayName() {},
+  displayName() {
+  }
 
   /**
    * @param {!Workspace.UISourceCode} uiSourceCode
    * @return {!Promise<?Workspace.UISourceCodeMetadata>}
    */
-  requestMetadata(uiSourceCode) {},
+  requestMetadata(uiSourceCode) {
+  }
 
   /**
    * @param {!Workspace.UISourceCode} uiSourceCode
    * @param {function(?string,boolean)} callback
    */
-  requestFileContent(uiSourceCode, callback) {},
+  requestFileContent(uiSourceCode, callback) {
+  }
 
   /**
    * @return {boolean}
    */
-  canSetFileContent() {},
+  canSetFileContent() {
+  }
 
   /**
    * @param {!Workspace.UISourceCode} uiSourceCode
@@ -114,42 +123,49 @@ Workspace.Project.prototype = {
    * @param {boolean} isBase64
    * @return {!Promise}
    */
-  setFileContent(uiSourceCode, newContent, isBase64) {},
+  setFileContent(uiSourceCode, newContent, isBase64) {
+  }
 
   /**
    * @param {!Workspace.UISourceCode} uiSourceCode
    * @return {string}
    */
-  fullDisplayName(uiSourceCode) {},
+  fullDisplayName(uiSourceCode) {
+  }
 
   /**
    * @param {!Workspace.UISourceCode} uiSourceCode
    * @return {string}
    */
-  mimeType(uiSourceCode) {},
+  mimeType(uiSourceCode) {
+  }
 
   /**
    * @return {boolean}
    */
-  canRename() {},
+  canRename() {
+  }
 
   /**
    * @param {!Workspace.UISourceCode} uiSourceCode
    * @param {string} newName
    * @param {function(boolean, string=, string=, !Common.ResourceType=)} callback
    */
-  rename(uiSourceCode, newName, callback) {},
+  rename(uiSourceCode, newName, callback) {
+  }
 
   /**
    * @param {string} path
    */
-  excludeFolder(path) {},
+  excludeFolder(path) {
+  }
 
   /**
    * @param {string} path
    * @return {boolean}
    */
-  canExcludeFolder(path) {},
+  canExcludeFolder(path) {
+  }
 
   /**
    * @param {string} path
@@ -158,19 +174,23 @@ Workspace.Project.prototype = {
    * @param {boolean=} isBase64
    * @return {!Promise<?Workspace.UISourceCode>}
    */
-  createFile(path, name, content, isBase64) {},
+  createFile(path, name, content, isBase64) {
+  }
 
   /**
    * @return {boolean}
    */
-  canCreateFile() {},
+  canCreateFile() {
+  }
 
   /**
    * @param {!Workspace.UISourceCode} uiSourceCode
    */
-  deleteFile(uiSourceCode) {},
+  deleteFile(uiSourceCode) {
+  }
 
-  remove() {},
+  remove() {
+  }
 
   /**
    * @param {!Workspace.UISourceCode} uiSourceCode
@@ -179,37 +199,42 @@ Workspace.Project.prototype = {
    * @param {boolean} isRegex
    * @return {!Promise<!Array<!Common.ContentProvider.SearchMatch>>}
    */
-  searchInFileContent(uiSourceCode, query, caseSensitive, isRegex) {},
+  searchInFileContent(uiSourceCode, query, caseSensitive, isRegex) {
+  }
 
   /**
-   * @param {!Workspace.ProjectSearchConfig} searchConfig
+   * @param {!ProjectSearchConfig} searchConfig
    * @param {!Array.<string>} filesMathingFileQuery
    * @param {!Common.Progress} progress
    * @return {!Promise<!Array<string>>}
    */
-  findFilesMatchingSearchRequest(searchConfig, filesMathingFileQuery, progress) {},
+  findFilesMatchingSearchRequest(searchConfig, filesMathingFileQuery, progress) {
+  }
 
   /**
    * @param {!Common.Progress} progress
    */
-  indexContent(progress) {},
+  indexContent(progress) {
+  }
 
   /**
    * @param {string} url
    * @return {?Workspace.UISourceCode}
    */
-  uiSourceCodeForURL(url) {},
+  uiSourceCodeForURL(url) {
+  }
 
   /**
    * @return {!Array.<!Workspace.UISourceCode>}
    */
-  uiSourceCodes() {}
-};
+  uiSourceCodes() {
+  }
+}
 
 /**
  * @enum {string}
  */
-Workspace.projectTypes = {
+export const projectTypes = {
   Debugger: 'debugger',
   Formatter: 'formatter',
   Network: 'network',
@@ -221,9 +246,9 @@ Workspace.projectTypes = {
 /**
  * @unrestricted
  */
-Workspace.ProjectStore = class {
+export class ProjectStore {
   /**
-   * @param {!Workspace.Workspace} workspace
+   * @param {!WorkspaceImpl} workspace
    * @param {string} id
    * @param {!Workspace.projectTypes} type
    * @param {string} displayName
@@ -239,7 +264,7 @@ Workspace.ProjectStore = class {
     /** @type {!Array.<!Workspace.UISourceCode>} */
     this._uiSourceCodesList = [];
 
-    this._project = /** @type {!Workspace.Project} */ (this);
+    this._project = /** @type {!Project} */ (this);
   }
 
   /**
@@ -264,7 +289,7 @@ Workspace.ProjectStore = class {
   }
 
   /**
-   * @return {!Workspace.Workspace}
+   * @return {!WorkspaceImpl}
    */
   workspace() {
     return this._workspace;
@@ -290,7 +315,7 @@ Workspace.ProjectStore = class {
     }
     this._uiSourceCodesMap.set(url, {uiSourceCode: uiSourceCode, index: this._uiSourceCodesList.length});
     this._uiSourceCodesList.push(uiSourceCode);
-    this._workspace.dispatchEventToListeners(Workspace.Workspace.Events.UISourceCodeAdded, uiSourceCode);
+    this._workspace.dispatchEventToListeners(Events.UISourceCodeAdded, uiSourceCode);
     return true;
   }
 
@@ -310,7 +335,7 @@ Workspace.ProjectStore = class {
     movedEntry.index = entry.index;
     this._uiSourceCodesList.splice(this._uiSourceCodesList.length - 1, 1);
     this._uiSourceCodesMap.delete(url);
-    this._workspace.dispatchEventToListeners(Workspace.Workspace.Events.UISourceCodeRemoved, entry.uiSourceCode);
+    this._workspace.dispatchEventToListeners(Events.UISourceCodeRemoved, entry.uiSourceCode);
   }
 
   removeProject() {
@@ -347,15 +372,15 @@ Workspace.ProjectStore = class {
     this._uiSourceCodesMap.set(newPath, value);
     this._uiSourceCodesMap.delete(oldPath);
   }
-};
+}
 
 /**
  * @unrestricted
  */
-Workspace.Workspace = class extends Common.Object {
+export default class WorkspaceImpl extends Common.Object {
   constructor() {
     super();
-    /** @type {!Map<string, !Workspace.Project>} */
+    /** @type {!Map<string, !Project>} */
     this._projects = new Map();
     this._hasResourceContentTrackingExtensions = false;
   }
@@ -399,32 +424,32 @@ Workspace.Workspace = class extends Common.Object {
   }
 
   /**
-   * @param {!Workspace.Project} project
+   * @param {!Project} project
    */
   addProject(project) {
     console.assert(!this._projects.has(project.id()), `A project with id ${project.id()} already exists!`);
     this._projects.set(project.id(), project);
-    this.dispatchEventToListeners(Workspace.Workspace.Events.ProjectAdded, project);
+    this.dispatchEventToListeners(Events.ProjectAdded, project);
   }
 
   /**
-   * @param {!Workspace.Project} project
+   * @param {!Project} project
    */
   _removeProject(project) {
     this._projects.delete(project.id());
-    this.dispatchEventToListeners(Workspace.Workspace.Events.ProjectRemoved, project);
+    this.dispatchEventToListeners(Events.ProjectRemoved, project);
   }
 
   /**
    * @param {string} projectId
-   * @return {?Workspace.Project}
+   * @return {?Project}
    */
   project(projectId) {
     return this._projects.get(projectId) || null;
   }
 
   /**
-   * @return {!Array.<!Workspace.Project>}
+   * @return {!Array.<!Project>}
    */
   projects() {
     return this._projects.valuesArray();
@@ -432,7 +457,7 @@ Workspace.Workspace = class extends Common.Object {
 
   /**
    * @param {string} type
-   * @return {!Array.<!Workspace.Project>}
+   * @return {!Array.<!Project>}
    */
   projectsForType(type) {
     function filterByType(project) {
@@ -465,10 +490,10 @@ Workspace.Workspace = class extends Common.Object {
   hasResourceContentTrackingExtensions() {
     return this._hasResourceContentTrackingExtensions;
   }
-};
+}
 
 /** @enum {symbol} */
-Workspace.Workspace.Events = {
+export const Events = {
   UISourceCodeAdded: Symbol('UISourceCodeAdded'),
   UISourceCodeRemoved: Symbol('UISourceCodeRemoved'),
   UISourceCodeRenamed: Symbol('UISourceCodeRenamed'),
@@ -479,7 +504,31 @@ Workspace.Workspace.Events = {
   ProjectRemoved: Symbol('ProjectRemoved')
 };
 
+/* Legacy exported object */
+self.Workspace = self.Workspace || {};
+
+/* Legacy exported object */
+Workspace = Workspace || {};
+
+/** @constructor */
+Workspace.Workspace = WorkspaceImpl;
+
+/** @enum {symbol} */
+Workspace.Workspace.Events = Events;
+
+/** @interface */
+Workspace.ProjectSearchConfig = ProjectSearchConfig;
+
+/** @interface */
+Workspace.Project = Project;
+
+/** @enum {string} */
+Workspace.projectTypes = projectTypes;
+
+/** @constructor */
+Workspace.ProjectStore = ProjectStore;
+
 /**
- * @type {!Workspace.Workspace}
+ * @type {!WorkspaceImpl}
  */
 Workspace.workspace;

third_party/blink/renderer/devtools/front_end/workspace/module.json

@@ -4,9 +4,11 @@
         "host",
         "platform"
     ],
-    "scripts": [
+    "scripts": [],
+    "modules": [
+        "workspace.js",
         "FileManager.js",
         "UISourceCode.js",
-        "Workspace.js"
+        "WorkspaceImpl.js"
     ]
 }

third_party/blink/renderer/devtools/front_end/workspace/workspace.js

+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import * as FileManager from './FileManager.js';
+import * as UISourceCode from './UISourceCode.js';
+import * as Workspace from './WorkspaceImpl.js';
+
+export {
+  FileManager,
+  UISourceCode,
+  Workspace,
+};