refactor: optimize release workflow

.gitignore

@@ -114,5 +114,3 @@ generated-parser
 
 #husky
 .husky
-
-scripts/utils/_upload.js

packages/common/src/cdn.ts

@@ -0,0 +1,25 @@
+export type TComponentCDNType = 'unpkg' | 'jsdelivr' | 'alipay' | 'npmmirror';
+
+type IComponentCDNTypeMap = Record<TComponentCDNType, string>;
+
+const CDN_TYPE_MAP: IComponentCDNTypeMap = {
+  alipay: 'https://gw.alipayobjects.com/os/lib',
+  npmmirror: 'https://registry.npmmirror.com',
+  unpkg: 'https://unpkg.com/browse',
+  jsdelivr: 'https://cdn.jsdelivr.net/npm',
+};
+
+export function getResource(
+  packageName: string,
+  filePath: string,
+  version: string,
+  cdnType: TComponentCDNType = 'alipay',
+) {
+  if (cdnType === 'alipay') {
+    return `${CDN_TYPE_MAP['alipay']}/${packageName.slice(1)}/${version}/${filePath}`;
+  } else if (cdnType === 'npmmirror') {
+    return `${CDN_TYPE_MAP['npmmirror']}/${packageName}/${version}/files/${filePath}`;
+  } else {
+    return `${CDN_TYPE_MAP[cdnType]}/${packageName}@${version}/${filePath}`;
+  }
+}

packages/common/src/index.ts

@@ -1,3 +1,4 @@
 export * from './mutex';
 export * from './request';
 export * from './types';
+export * from './cdn';

packages/core/src/api/createApp.tsx

@@ -30,7 +30,7 @@ import '../core/extension/extension.patch';
 import { disposableCollection, disposeMode } from '../core/patch';
 
 import { Injector } from '@opensumi/di';
-import { EXT_WORKER_HOST, WEBVIEW_ENDPOINT } from '../core/env';
+import { EXT_WORKER_HOST } from '../core/env';
 import { IconSlim, IDETheme } from '../core/extension/metadata';
 import { getDefaultLayoutConfig, LayoutComponent } from '../core/layout';
 import { modules } from '../core/modules';
@@ -46,7 +46,6 @@ export const getDefaultAppConfig = (): IAppOpts => ({
   useCdnIcon: true,
   noExtHost: true,
   extWorkerHost: EXT_WORKER_HOST,
-  webviewEndpoint: WEBVIEW_ENDPOINT,
   defaultPreferences: {
     'general.theme': 'opensumi-design-dark-theme',
     'general.icon': 'vsicons-slim',
@@ -75,6 +74,7 @@ export const getDefaultAppConfig = (): IAppOpts => ({
   extensionStorageDirName: STORAGE_DIR,
   appName,
   allowSetDocumentTitleFollowWorkspaceDir: false,
+  useBuiltinWebview: true,
   app: {
     logo: 'https://mdn.alipayobjects.com/huamei_hwfivk/afts/img/A*byvFQJURn0kAAAAAAAAAAAAADlyoAQ/original',
     brandName: 'Codeblitz',

packages/core/src/api/createEditor.tsx

@@ -20,7 +20,7 @@ import { deletionLogPath } from '@codeblitzjs/ide-browserfs/lib/backend/OverlayF
 import { IPluginConfig } from '@codeblitzjs/ide-plugin';
 
 import { getModules } from '../core/editor/modules';
-import { EXT_WORKER_HOST, WEBVIEW_ENDPOINT } from '../core/env';
+import { EXT_WORKER_HOST } from '../core/env';
 import { EditorLayoutComponent, getEditorLayoutConfig } from '../core/layout';
 import { disposableCollection, disposeMode } from '../core/patch';
 import { mergeConfig } from '../core/utils';
@@ -35,7 +35,6 @@ const getDefaultEditorAppConfig = (): IAppOpts => ({
   useCdnIcon: true,
   noExtHost: true,
   extWorkerHost: EXT_WORKER_HOST,
-  webviewEndpoint: WEBVIEW_ENDPOINT,
   defaultPreferences: {
     'general.theme': 'opensumi-design-light-theme',
     'application.confirmExit': 'never',
@@ -59,6 +58,7 @@ const getDefaultEditorAppConfig = (): IAppOpts => ({
   extensionStorageDirName: STORAGE_DIR,
   appName,
   allowSetDocumentTitleFollowWorkspaceDir: false,
+  useBuiltinWebview: true,
 });
 
 export function createEditor({ appConfig, runtimeConfig }: IConfig): IAppInstance {

packages/core/src/core/env.ts

@@ -1,19 +1,10 @@
-/**
- * worker url
- */
-export const EXT_WORKER_HOST = __WORKER_HOST__;
-
-/**
- * webview endpoint
- */
-export const WEBVIEW_ENDPOINT = __WEBVIEW_ENDPOINT__;
-
-/**
- * webview 脚本 url
- */
-export const WEBVIEW_SCRIPT = __WEBVIEW_SCRIPT__;
+import { getResource } from "@codeblitzjs/ide-common";
 
 /**
  * codeblitz version
  */
 export const VERSION = __VERSION__;
+/**
+ * worker url
+ */
+export const EXT_WORKER_HOST = getResource("@codeblitzjs/ide-sumi-core", "resources/worker-host.js", VERSION);

packages/sumi-core/package.json

@@ -5,7 +5,8 @@
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
-    "lib"
+    "lib",
+    "resources"
   ],
   "keywords": [
     "opensumi codeblitzjs"

packages/sumi-core/resources/manifest.json

@@ -1,5 +1,3 @@
 {
-  "webview": "webview.9ae5c833.js",
-  "webview/index.html": "webview.25aac54e/index.html",
-  "worker-host": "worker-host.d80be369.js"
+  "worker-host": "worker-host.js"
 }

packages/toolkit/package.json

@@ -15,7 +15,7 @@
     "dev": "webpack serve --config webpack/config.dev.js",
     "build": "webpack --config webpack/config.build.js",
     "analyze": "ANALYZE=1 npm run build",
-    "build:host": "webpack --config webpack/config.worker.js --config webpack/config.webview.js",
+    "build:host": "webpack --config webpack/config.worker.js",
     "build:languages": "webpack --config webpack/config.languages.js",
     "playground": "webpack serve --config playground/webpack.config.js"
   },

packages/toolkit/webpack/config.build.js

@@ -1,5 +1,4 @@
 const path = require('path');
-const fs = require('fs');
 const TerserPlugin = require('terser-webpack-plugin');
 const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
 const createWebpackConfig = require('./config.integration');

packages/toolkit/webpack/config.integration.js

@@ -209,10 +209,6 @@ module.exports = (option) => {
         __WORKER_HOST__: process.env.WORKER_PATH
           ? JSON.stringify(`/assets/~${process.env.WORKER_PATH}`)
           : JSON.stringify(`${baseURL}/${config.workerEntry}.js`),
-        __WEBVIEW_ENDPOINT__: process.env.WEBVIEW_ENDPOINT
-          ? JSON.stringify(`/assets/~${process.env.WEBVIEW_ENDPOINT}`)
-          : JSON.stringify(`${baseURL}/${config.webviewEntry}`),
-        __WEBVIEW_SCRIPT__: JSON.stringify(''),
         __VERSION__: JSON.stringify(pkg.version),
         ...option.define,
       }),

packages/toolkit/webpack/config.worker.js

@@ -3,6 +3,9 @@ const webpack = require('webpack');
 const { WebpackManifestPlugin } = require('webpack-manifest-plugin');
 const { nodePolyfill, config, manifestSeed } = require('./util');
 
+/**
+ * @returns {import('webpack').Configuration}
+ */
 module.exports = () => {
   const isDev = process.env.NODE_ENV === 'development';
 
@@ -13,8 +16,9 @@ module.exports = () => {
       ),
     },
     output: {
-      filename: `[name].${isDev ? 'js' : '[contenthash:8].js'}`,
+      filename: `[name].js`,
       path: path.resolve(__dirname, '../../sumi-core/resources'),
+      clean: true,
     },
     target: 'webworker',
     devtool: isDev ? 'inline-source-map' : false,

scripts/build-assets.js

@@ -1,20 +1,6 @@
-/**
- * 构建 worker-host 和 webview 并发布到内网 cdn 上
- */
-
 const path = require('path');
-const fs = require('fs');
 const signale = require('signale');
 const { invoke, exec } = require('./utils/utils');
-const pkg = require('../package.json');
-const { upload } = require('./utils/upload');
-const args = require('minimist')(process.argv.slice(2));
-
-const assetsKeyMap = {
-  __WORKER_HOST__: 'worker-host',
-  __WEBVIEW_ENDPOINT__: 'webview/index.html',
-  __WEBVIEW_SCRIPT__: 'webview',
-};
 
 invoke(async () => {
   signale.pending(`开始编译 worker-host 和 webview`);
@@ -25,51 +11,7 @@ invoke(async () => {
 
   const distDir = path.resolve(__dirname, '../packages/sumi-core/resources');
   const manifest = require(path.join(distDir, 'manifest.json'));
-  const fileJSON = Object.keys(manifest).reduce((obj, key) => {
-    obj[key] = {
-      filename: manifest[key],
-      filepath: path.join(distDir, manifest[key]),
-    };
-    return obj;
-  }, {});
-  if (args['disable-upload']) {
-    return;
-  }
-
-  signale.info('构建成功，开始上传 cdn');
-  const cdnResult = await upload(fileJSON);
-  signale.info('上传成功，生成 define.json');
-
-  const transformHttps = (str) => str.replace(/^http:/, 'https:');
-  const env = {
-    __WORKER_HOST__: {
-      key: assetsKeyMap.__WORKER_HOST__,
-      transform: transformHttps,
-    },
-    __WEBVIEW_ENDPOINT__: {
-      key: assetsKeyMap.__WEBVIEW_ENDPOINT__,
-      transform: (v) => transformHttps(v.slice(0, v.lastIndexOf('/'))),
-    },
-    __WEBVIEW_SCRIPT__: {
-      key: assetsKeyMap.__WEBVIEW_SCRIPT__,
-      transform: transformHttps,
-    }
-  };
-  const config = Object.keys(env).reduce(
-    (obj, name) => {
-      const { key, transform } = env[name];
-      if (cdnResult[key]) {
-        obj[name] = transform(cdnResult[key]);
-      }
-      return obj;
-    },
-    { __OPENSUMI_VERSION__: pkg.engines.opensumi }
-  );
-
-  fs.writeFileSync(
-    path.resolve(__dirname, '../packages/toolkit/define.json'),
-    JSON.stringify(config, null, 2)
-  );
+  console.log('manifest', manifest);
 
   signale.success('构建资源成功');
 });

typings/global/index.d.ts

@@ -14,8 +14,6 @@ declare module 'process' {
 // build 时会被替换
 declare var __DEV__: string;
 declare var __WORKER_HOST__: string;
-declare var __WEBVIEW_ENDPOINT__: string;
-declare var __WEBVIEW_SCRIPT__: string;
 declare var __VERSION__: string;
 
 type Optional<T, K extends keyof T> = Omit<T, K> & Partial<T>;
@@ -24,4 +22,4 @@ declare module '@codeblitzjs/ide-core/extensions/*' {
   import { IExtensionBasicMetadata } from '@codeblitzjs/ide-common';
   const metadata: IExtensionBasicMetadata;
   export = metadata;
-}
+}