fix: fs-watch and react version

Author: winjo

package.json

@@ -51,7 +51,6 @@
     "lint-staged": "^10.5.1",
     "minimist": "^1.2.5",
     "prettier": "^2.1.2",
-    "react-dom": "^17.0.1",
     "signale": "^1.4.0",
     "ts-node": "^9.0.0",
     "typescript": "^4.0.5"

packages/core/src/server/core/app.ts

@@ -16,13 +16,15 @@ import {
   ReporterService,
   ReporterMetadata,
   REPORT_HOST,
+  StoragePaths,
 } from '@ali/ide-core-common'
 import { IExtensionBasicMetadata } from '@alipay/spacex-shared'
 
 import { INodeLogger, NodeLogger } from './node-logger'
 import { FCServiceCenter, initFCService, ServerPort } from '../../connection'
 import { IServerApp } from '../../common'
 import { bootstrap } from './bootstrap'
+import { path, os } from '../node'
 
 export abstract class NodeModule extends BasicModule {}
 
@@ -57,7 +59,11 @@ interface Config {
   extensionMetadata?: IExtensionBasicMetadata[]
 }
 
-export interface AppConfig extends Partial<Config> {}
+export interface AppConfig extends Partial<Config> {
+  marketplace: {
+    extensionDir: string
+  }
+}
 
 export interface IServerAppOpts extends Partial<Config> {
   modules?: ModuleConstructor[]
@@ -90,6 +96,13 @@ export class ServerApp implements IServerApp {
       injector: this.injector,
       workspaceDir: opts.workspaceDir,
       extensionDir: opts.extensionDir,
+      marketplace: {
+        extensionDir: path.join(
+          os.homedir(),
+          StoragePaths.DEFAULT_STORAGE_DIR_NAME,
+          StoragePaths.MARKETPLACE_DIR
+        ),
+      },
       logDir: opts.logDir,
       logLevel: opts.logLevel,
       LogServiceClass: opts.LogServiceClass,

packages/core/src/server/core/bootstrap.ts

@@ -24,5 +24,9 @@ export const bootstrap = async (appConfig: AppConfig) => {
       }
     )
   })
-  await fse.ensureDir(appConfig.workspaceDir || WORKSPACE_DIR)
+  // 初始化文件目录
+  await Promise.all([
+    await fse.ensureDir(appConfig.workspaceDir || WORKSPACE_DIR),
+    await fse.ensureDir(appConfig.marketplace.extensionDir),
+  ])
 }

packages/core/src/server/node/extend/fs-watch.ts

@@ -206,7 +206,7 @@ fs.closeSync = (fd) => {
 const _writeFile = fs.writeFile
 fs.writeFile = (filename: any, data: any, arg3?: any, cb?: any) => {
   const p = resolvePath(filename)
-  const flag = arg3 && typeof arg3 === 'object' ? arg3.flag : 'w'
+  const flag = arg3?.flag ?? 'w'
   fs.stat(p, (err) => {
     // 文件不存在且为写模式，那么会自动创建文件
     const willCreated = err && mayCreatedFile(flag)
@@ -215,7 +215,6 @@ fs.writeFile = (filename: any, data: any, arg3?: any, cb?: any) => {
     const newCb: any = (err: any, fd: any) => {
       const res = _cb(err, fd)
       if (!err) {
-        console.log(11111111)
         emitter.fire({
           action: willCreated ? ActionType.CREATED : ActionType.MODIFIED,
           directory: path.dirname(p),
@@ -235,7 +234,7 @@ fs.writeFile = (filename: any, data: any, arg3?: any, cb?: any) => {
 const _writeFileSync = fs.writeFileSync
 fs.writeFileSync = (filename: any, data: any, arg3?: any) => {
   const p = resolvePath(filename)
-  const flag = arg3 && typeof arg3 === 'object' ? arg3.flag : 'w'
+  const flag = arg3?.flag ?? 'w'
   const willCreated = !fs.existsSync(p) && mayCreatedFile(flag)
   _writeFileSync(p, data, arg3)
   emitter.fire({

packages/core/src/server/node/index.ts

@@ -1,7 +1,8 @@
 export * from './internal'
 
+// should place before other fs api
+export * from './extend/fs-watch'
+
 export { default as fse } from './extend/fs-extra'
 
 export * from './extend/write-file-atomic'
-
-export * from './extend/fs-watch'

packages/spacex/package.json

@@ -75,8 +75,8 @@
     "less-loader": "^6.0.0",
     "mini-css-extract-plugin": "^1.3.0",
     "node-notifier": "^8.0.0",
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1",
+    "react": "^16.14.0",
+    "react-dom": "^16.14.0",
     "style-loader": "^0.23.1",
     "style-resources-loader": "^1.2.1",
     "thread-loader": "^3.0.1",

yarn.lock

@@ -9979,14 +9979,15 @@ react-custom-scrollbars@^4.2.1:
     prop-types "^15.5.10"
     raf "^3.1.0"
 
-react-dom@^17.0.1:
-  version "17.0.1"
-  resolved "https://registry.npm.alibaba-inc.com/react-dom/download/react-dom-17.0.1.tgz#1de2560474ec9f0e334285662ede52dbc5426fc6"
-  integrity sha1-HeJWBHTsnw4zQoVmLt5S28VCb8Y=
+react-dom@^16.14.0:
+  version "16.14.0"
+  resolved "https://registry.npm.alibaba-inc.com/react-dom/download/react-dom-16.14.0.tgz#7ad838ec29a777fb3c75c3a190f661cf92ab8b89"
+  integrity sha1-etg47Cmnd/s8dcOhkPZhz5Kri4k=
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
-    scheduler "^0.20.1"
+    prop-types "^15.6.2"
+    scheduler "^0.19.1"
 
 react-is@^16.12.0, react-is@^16.7.0, react-is@^16.8.1:
   version "16.13.1"
@@ -10063,7 +10064,7 @@ react-window@^1.8.5:
     "@babel/runtime" "^7.0.0"
     memoize-one ">=3.1.1 <6"
 
-react@^16.8.6:
+react@^16.14.0, react@^16.8.6:
   version "16.14.0"
   resolved "https://registry.npm.alibaba-inc.com/react/download/react-16.14.0.tgz#94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d"
   integrity sha1-lNd23dCqo32j7aj8W2sYpMmjEU0=
@@ -10072,14 +10073,6 @@ react@^16.8.6:
     object-assign "^4.1.1"
     prop-types "^15.6.2"
 
-react@^17.0.1:
-  version "17.0.1"
-  resolved "https://registry.npm.alibaba-inc.com/react/download/react-17.0.1.tgz#6e0600416bd57574e3f86d92edba3d9008726127"
-  integrity sha1-bgYAQWvVdXTj+G2S7bo9kAhyYSc=
-  dependencies:
-    loose-envify "^1.1.0"
-    object-assign "^4.1.1"
-
 read-pkg-up@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npm.alibaba-inc.com/read-pkg-up/download/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
@@ -10548,10 +10541,10 @@ saxes@^5.0.0:
   dependencies:
     xmlchars "^2.2.0"
 
-scheduler@^0.20.1:
-  version "0.20.1"
-  resolved "https://registry.npm.alibaba-inc.com/scheduler/download/scheduler-0.20.1.tgz#da0b907e24026b01181ecbc75efdc7f27b5a000c"
-  integrity sha1-2guQfiQCawEYHsvHXv3H8ntaAAw=
+scheduler@^0.19.1:
+  version "0.19.1"
+  resolved "https://registry.npm.alibaba-inc.com/scheduler/download/scheduler-0.19.1.tgz#4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196"
+  integrity sha1-Tz4u0sGn1laB9MhU+oxaHMtA8ZY=
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"