PullRequest: 46 feat/refactor-code-service

Author: 彦熹

jest.config.js

@@ -11,10 +11,12 @@ module.exports = {
   watchPathIgnorePatterns: ['/node_modules/', '/dist/', '/.git/'],
   moduleFileExtensions: ['ts', 'tsx', 'js', 'json'],
   moduleNameMapper: {
-    '^@alipay/alex-(.*?)$': '<rootDir>/packages/$1/src',
-    '@alipay/alex': '<rootDir>/packages/alex/src',
+    '^@alipay/alex-(?!browserfs)(.*?)$': '<rootDir>/packages/$1/src',
+    '^@alipay/alex$': '<rootDir>/packages/alex/src',
+    '\\.(css|less)$': '<rootDir>/mocks/styleMock.js',
   },
   rootDir: __dirname,
   testMatch: ['<rootDir>/packages/**/__tests__/**/*@(test|spec).[jt]s?(x)'],
   testPathIgnorePatterns: ['/node_modules/'],
+  setupFiles: ['./jest.setup.js'],
 };

jest.setup.js

@@ -0,0 +1,65 @@
+const { JSDOM } = require('jsdom');
+const { TextDecoder, TextEncoder } = require('util');
+
+const jsdom = new JSDOM(`<div id="main"></div>`, {
+  // https://github.com/jsdom/jsdom#basic-options
+  // 禁用掉 resources: usable, 采用 jsdom 默认策略不加载 subresources
+  // 避免测试用例加载 external subresource, 如 iconfont 的 css 挂掉
+  // resources: 'usable',
+  runScripts: 'dangerously',
+  url: 'http://localhost/?id=1',
+});
+global.document = jsdom.window.document;
+let text = '';
+global.navigator = Object.assign(jsdom.window.navigator, {
+  clipboard: {
+    writeText(value) {
+      text = value;
+    },
+    readText() {
+      return text;
+    },
+  },
+});
+global.Element = jsdom.window.Element;
+global.HTMLDivElement = jsdom.window.HTMLDivElement;
+global.fetch = jsdom.window.fetch;
+global.location = jsdom.window.location;
+global.getComputedStyle = jsdom.window.getComputedStyle;
+global.window = jsdom.window;
+global.DOMParser = jsdom.window.DOMParser;
+global.HTMLDivElement = jsdom.window.HTMLDivElement;
+global.MutationObserver = jsdom.window.MutationObserver;
+global.requestAnimationFrame = (fn) => setTimeout(fn, 16);
+jsdom.window.requestAnimationFrame = (fn) => setTimeout(fn, 16);
+jsdom.window.cancelAnimationFrame = () => {};
+global.document.queryCommandSupported = () => {};
+global.document.execCommand = () => {};
+global.HTMLElement = jsdom.window.HTMLElement;
+global.self = global;
+global.TextEncoder = TextEncoder;
+global.TextDecoder = TextDecoder;
+
+class MockLocalStorage {
+  constructor() {
+    this.store = {};
+  }
+
+  clear() {
+    this.store = {};
+  }
+
+  getItem(key) {
+    return this.store[key] || null;
+  }
+
+  setItem(key, value) {
+    this.store[key] = value.toString();
+  }
+
+  removeItem(key) {
+    delete this.store[key];
+  }
+}
+
+global.localStorage = new MockLocalStorage();

mocks/styleMock.js

@@ -0,0 +1 @@
+module.exports = {};

package.json

@@ -68,6 +68,7 @@
     "husky": "^4.3.0",
     "inquirer": "^7.3.3",
     "jest": "^26.6.3",
+    "jsdom": "^16.5.3",
     "json5": "^2.2.0",
     "lint-staged": "^10.5.1",
     "minimist": "^1.2.5",

packages/alex/src/api/createApp.tsx

@@ -18,6 +18,8 @@ import {
 import { BoxPanel, SplitPanel } from '@ali/ide-core-browser/lib/components';
 import '@ali/ide-core-browser/lib/style/index.less';
 import * as os from 'os';
+import { IPluginConfig } from '@alipay/alex-plugin';
+import { deletionLogPath } from '@alipay/alex-browserfs/lib/backend/OverlayFS';
 
 import '../core/extension.patch';
 import { disposeMode } from '../core/patch';
@@ -47,7 +49,7 @@ const getDefaultAppConfig = (): IAppOpts => ({
     'files.exclude': {
       ...FILES_DEFAULTS.filesExclude,
       // browserfs OverlayFS 用来记录删除的文件
-      '**/.deletedFiles.log': true,
+      [`**${deletionLogPath}`]: true,
     },
   },
   layoutConfig: getDefaultLayoutConfig(),
@@ -116,6 +118,11 @@ export function createApp({ appConfig, runtimeConfig }: IConfig): IAppInstance {
     useValue: runtimeConfig,
   });
 
+  app.injector.addProviders({
+    token: IPluginConfig,
+    useValue: customConfig.plugins,
+  });
+
   if (runtimeConfig.reporter) {
     app.injector.addProviders({
       token: IReporter,

packages/alex/src/api/createEditor.tsx

@@ -19,6 +19,7 @@ import { IThemeService } from '@ali/ide-theme/lib/common';
 import '@ali/ide-core-browser/lib/style/index.less';
 import * as os from 'os';
 import { IPluginConfig } from '@alipay/alex-plugin';
+import { deletionLogPath } from '@alipay/alex-browserfs/lib/backend/OverlayFS';
 
 import { disposeMode } from '../core/patch';
 import { getModules } from '../core/editor/modules';
@@ -44,7 +45,7 @@ const getDefaultAppConfig = (): IAppOpts => ({
     'files.exclude': {
       ...FILES_DEFAULTS.filesExclude,
       // browserfs OverlayFS 用来记录删除的文件
-      '**/.deletedFiles.log': true,
+      [`**${deletionLogPath}`]: true,
     },
   },
   layoutConfig: getEditorLayoutConfig(),

packages/alex/src/core/editor/editor.module.ts

@@ -264,15 +264,6 @@ class EditorSpecialContribution
       wrapped: memSystem,
       folder: `/${md5(this.appConfig.workspaceDir)}`,
     });
-    await new Promise<void>((resolve, reject) => {
-      (folderSystem as InstanceType<typeof FolderAdapter>).initialize((err) => {
-        if (err) {
-          reject(err);
-        } else {
-          resolve();
-        }
-      });
-    });
     const overlayFileSystem = await createFileSystem(OverlayFS, {
       readable: editorSystem,
       writable: folderSystem,

packages/alex/src/core/extensions.ts

@@ -33,7 +33,7 @@ export const IDETheme: IExtensionBasicMetadata = {
   extension: {
     publisher: 'kaitian',
     name: 'ide-dark-theme',
-    version: '2.2.0',
+    version: '2.3.2',
   },
   packageJSON: {
     name: 'ide-dark-theme',

packages/alex/src/core/modules.ts

@@ -45,6 +45,7 @@ import { WorkspaceEditModule } from '@ali/ide-workspace-edit/lib/browser';
  */
 
 import { ClientModule, ServerModuleCollection } from '@alipay/alex-core';
+import { PluginModule } from '@alipay/alex-plugin';
 
 // TODO: 部分模块需要注意顺序，否则会报错，待框架侧调整修复
 export const modules: ModuleConstructor[] = [
@@ -97,5 +98,6 @@ export const modules: ModuleConstructor[] = [
 
   // Alex
   ClientModule,
+  PluginModule,
   ...ServerModuleCollection,
 ];