build: 构建 global 包用于 script 引入

Author: winjo

packages/alex/package.json

@@ -4,6 +4,7 @@
   "description": "@alipay/alex",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
+  "unpkg": "bundle/alex.global.js",
   "files": [
     "lib",
     "bin",

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

@@ -1,9 +1,34 @@
-import { Injectable, Provider } from '@ali/common-di';
-import { BrowserModule } from '@ali/ide-core-browser';
+import { Injectable, Provider, Autowired } from '@ali/common-di';
+import {
+  BrowserModule,
+  KeybindingContribution,
+  Domain,
+  KeybindingRegistry,
+} from '@ali/ide-core-browser';
+import { RuntimeConfig } from '@alipay/alex-core';
 import { ExtensionActivateContribution } from './extension/extension.contribution';
 import { AlexCommandContribution } from './commands';
 
+@Domain(KeybindingContribution)
+class AlexContribution implements KeybindingContribution {
+  @Autowired(RuntimeConfig)
+  private readonly runtimeConfig: RuntimeConfig;
+
+  registerKeybindings(keybindings: KeybindingRegistry) {
+    // 自定义注销的快捷键
+    if (this.runtimeConfig.unregisterKeybindings) {
+      this.runtimeConfig.unregisterKeybindings.forEach((binding) => {
+        keybindings.unregisterKeybinding(binding);
+      });
+    }
+  }
+}
+
 @Injectable()
 export class AlexModule extends BrowserModule {
-  providers: Provider[] = [ExtensionActivateContribution, AlexCommandContribution];
+  providers: Provider[] = [
+    ExtensionActivateContribution,
+    AlexCommandContribution,
+    AlexContribution,
+  ];
 }

packages/alex/src/core/extension/metadata.ts

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

packages/cli/src/util/serve-file.ts

@@ -29,7 +29,7 @@ export const createServer = async (dirs: string[], uri: Uri) => {
     }
     const filepath = pathname.slice(`${uri.path}${targetDir}`.length);
     send(req, filepath, {
-      cacheControl: false,
+      maxAge: 0,
       root: targetDir,
     })
       .on('headers', (res: http.ServerResponse) => {

packages/integrations/src/startup/index.tsx

@@ -12,7 +12,7 @@ import css from '@alipay/alex/extensions/alex.css-language-features-worker';
 import html from '@alipay/alex/extensions/alex.html-language-features-worker';
 import json from '@alipay/alex/extensions/alex.json-language-features-worker';
 import markdown from '@alipay/alex/extensions/alex.markdown-language-features-worker';
-import typescript from '@alipay/alex/extensions/alitcode.typescript-language-features-worker';
+import typescript from '@alipay/alex/extensions/alex.typescript-language-features-worker';
 import lsif from '@alipay/alex/extensions/cloud-ide.vscode-lsif';
 
 import { LocalExtensionModule } from '../common/local-extension.module';

packages/toolkit/webpack/config.build.js

@@ -59,7 +59,7 @@ const libBundle = createWebpackConfig({
   },
 });
 
-const umdBundle = createWebpackConfig({
+const globalBundle = createWebpackConfig({
   mode: 'production',
   tsconfigPath: path.join(__dirname, '../../../tsconfig.json'),
   outputPath: path.join(__dirname, '../../alex/bundle'),
@@ -70,34 +70,19 @@ const umdBundle = createWebpackConfig({
   webpackConfig: {
     context: path.join(__dirname, '../../..'),
     entry: {
-      [config.appUmdEntry]: './packages/alex/src',
-      [config.appUmdMinEntry]: './packages/alex/src',
+      [config.appGlobalEntry]: './packages/alex/src',
+      [config.appGlobalMinEntry]: './packages/alex/src',
     },
     // 此处 bundle 的包仅作为 commonjs 使用，但因为 external 原因会导致 webpack4 加载 bundle 出错，因此还是使用 umd
     output: {
       library: 'Alex',
-      libraryTarget: 'umd',
+      libraryTarget: 'global',
     },
     externals: [
       {
-        react: {
-          root: 'React',
-          commonjs2: 'react',
-          commonjs: 'react',
-          amd: 'react',
-        },
-        'react-dom': {
-          root: 'ReactDOM',
-          commonjs2: 'react-dom',
-          commonjs: 'react-dom',
-          amd: 'react-dom',
-        },
-        moment: {
-          root: 'moment',
-          commonjs2: 'moment',
-          commonjs: 'moment',
-          amd: 'moment',
-        },
+        react: 'react',
+        'react-dom': 'ReactDOM',
+        moment: 'moment',
       },
     ],
     optimization: {
@@ -116,4 +101,4 @@ const umdBundle = createWebpackConfig({
   },
 });
 
-module.exports = libBundle;
+module.exports = [libBundle, globalBundle];

packages/toolkit/webpack/config.languages.js

@@ -6,26 +6,21 @@ module.exports = () => {
   return {
     context: path.join(__dirname, '../../..'),
     entry: {
-      [config.languageUmdEntry]: './packages/alex/languages/index.js',
-      [config.languageUmdMinEntry]: './packages/alex/languages/index.js',
+      [config.languageGlobalEntry]: './packages/alex/languages/index.js',
+      [config.languageGlobalMinEntry]: './packages/alex/languages/index.js',
     },
     output: {
       path: path.resolve(__dirname, '../../alex/languages'),
       library: 'AlexLanguages',
-      libraryTarget: 'umd',
+      libraryTarget: 'global',
     },
     devtool: false,
     mode: 'production',
     resolve: {
       extensions: ['.js', '.json'],
     },
     externals: {
-      '@alipay/alex-registry': {
-        root: ['Alex', 'Registry'],
-        commonjs2: ['@alipay/alex/bundle/alex.umd', 'Registry'],
-        commonjs: ['@alipay/alex/bundle/alex.umd', 'Registry'],
-        amd: ['@alipay/alex/bundle/alex.umd', 'Registry'],
-      },
+      '@alipay/alex-registry': ['Alex', 'Registry'],
     },
     optimization: {
       minimize: true,

packages/toolkit/webpack/util/index.js

@@ -33,14 +33,14 @@ exports.nodePolyfill = {
 
 exports.config = {
   appEntry: 'alex',
-  appUmdEntry: 'alex.umd',
-  appUmdMinEntry: 'alex.umd.min',
+  appGlobalEntry: 'alex.global',
+  appGlobalMinEntry: 'alex.global.min',
   editorEntry: 'alex.editor',
   editorAllEntry: 'alex.editor.all',
   workerEntry: 'worker-host',
   webviewEntry: 'webview',
-  languageUmdEntry: 'languages.umd',
-  languageUmdMinEntry: 'languages.umd.min',
+  languageGlobalEntry: 'languages.global',
+  languageGlobalMinEntry: 'languages.global.min',
 };
 
 // just for shared

scripts/generate.js

@@ -5,10 +5,10 @@ const { generateLanguages, generateModules, generateShims } = require('./utils/g
 invoke(async () => {
   await Promise.all([generateLanguages(), generateModules(), generateShims()]);
 
-  // try {
-  //   await exec('yarn workspace @alipay/alex-toolkit build:languages');
-  // } catch (err) {
-  //   signale.error('build languages 失败')
-  //   throw err
-  // }
+  try {
+    await exec('yarn workspace @alipay/alex-toolkit build:languages');
+  } catch (err) {
+    signale.error('build languages 失败');
+    throw err;
+  }
 });