diff --git a/packages/rax-provider/tsconfig.json b/packages/rax-provider/tsconfig.json index 60bf4d611..e1a57bf23 100644 --- a/packages/rax-provider/tsconfig.json +++ b/packages/rax-provider/tsconfig.json @@ -1,12 +1,25 @@ { - "extends": "../../tsconfig.json", "compilerOptions": { - "declaration": false, - "outDir": "lib", + "lib": ["es2015", "dom"], + "target": "esnext", + "module": "esnext", + "moduleResolution": "node", "strict": false, - "rootDir": "../" + "strictPropertyInitialization": false, + "allowSyntheticDefaultImports": true, + "esModuleInterop": true, + "jsx": "preserve", + "importHelpers": true, + "experimentalDecorators": true, + "emitDecoratorMetadata": true, + "sourceMap": true, + "forceConsistentCasingInFileNames": true, + "resolveJsonModule": true, + "skipLibCheck": true, + "outDir": "lib" }, + "exclude": ["test", "lib", "es", "node_modules"], "include": [ - "./src/" + "src" ] } diff --git a/packages/rax-render/package.json b/packages/rax-render/package.json index 5ab65c43e..f9eb41e98 100644 --- a/packages/rax-render/package.json +++ b/packages/rax-render/package.json @@ -40,6 +40,7 @@ "debug": "^4.1.1", "events": "^3.0.0", "fetch-jsonp": "^1.1.3", + "fs-extra": "^9.0.1", "intl-messageformat": "^9.3.1", "jsonuri": "^2.1.2", "keymaster": "^1.6.2", diff --git a/packages/rax-render/src/comp/visualDom/index.jsx b/packages/rax-render/src/comp/visualDom/index.tsx similarity index 97% rename from packages/rax-render/src/comp/visualDom/index.jsx rename to packages/rax-render/src/comp/visualDom/index.tsx index b18e7d039..ef3a9f6d8 100644 --- a/packages/rax-render/src/comp/visualDom/index.jsx +++ b/packages/rax-render/src/comp/visualDom/index.tsx @@ -1,3 +1,4 @@ +// @ts-nocheck import { Component } from 'rax'; import './index.css'; diff --git a/packages/rax-render/src/context/appContext.js b/packages/rax-render/src/context/appContext.ts similarity index 100% rename from packages/rax-render/src/context/appContext.js rename to packages/rax-render/src/context/appContext.ts diff --git a/packages/rax-render/src/engine/base.jsx b/packages/rax-render/src/engine/base.tsx similarity index 99% rename from packages/rax-render/src/engine/base.jsx rename to packages/rax-render/src/engine/base.tsx index 850804129..b888e2a61 100644 --- a/packages/rax-render/src/engine/base.jsx +++ b/packages/rax-render/src/engine/base.tsx @@ -1,3 +1,4 @@ +// @ts-nocheck import { Component, createElement } from 'rax'; import PropTypes from 'prop-types'; import Debug from 'debug'; diff --git a/packages/rax-render/src/engine/blockEngine.jsx b/packages/rax-render/src/engine/blockEngine.tsx similarity index 99% rename from packages/rax-render/src/engine/blockEngine.jsx rename to packages/rax-render/src/engine/blockEngine.tsx index 718059244..5aefc730a 100644 --- a/packages/rax-render/src/engine/blockEngine.jsx +++ b/packages/rax-render/src/engine/blockEngine.tsx @@ -1,3 +1,4 @@ +// @ts-nocheck import { createElement } from 'rax'; import PropTypes from 'prop-types'; import Debug from 'debug'; diff --git a/packages/rax-render/src/engine/compEngine.jsx b/packages/rax-render/src/engine/compEngine.tsx similarity index 99% rename from packages/rax-render/src/engine/compEngine.jsx rename to packages/rax-render/src/engine/compEngine.tsx index 772071987..6d4f50ef5 100644 --- a/packages/rax-render/src/engine/compEngine.jsx +++ b/packages/rax-render/src/engine/compEngine.tsx @@ -1,3 +1,5 @@ +// @ts-nocheck + import { createElement } from 'rax'; import PropTypes from 'prop-types'; import Debug from 'debug'; diff --git a/packages/rax-render/src/engine/index.jsx b/packages/rax-render/src/engine/index.tsx similarity index 99% rename from packages/rax-render/src/engine/index.jsx rename to packages/rax-render/src/engine/index.tsx index 2a4af143f..6215a46ed 100644 --- a/packages/rax-render/src/engine/index.jsx +++ b/packages/rax-render/src/engine/index.tsx @@ -1,3 +1,4 @@ +// @ts-nocheck /* eslint-disable */ import { Component, createElement } from 'rax'; import PropTypes from 'prop-types'; diff --git a/packages/rax-render/src/engine/pageEngine.jsx b/packages/rax-render/src/engine/pageEngine.tsx similarity index 99% rename from packages/rax-render/src/engine/pageEngine.jsx rename to packages/rax-render/src/engine/pageEngine.tsx index 464abf649..e09b02b22 100644 --- a/packages/rax-render/src/engine/pageEngine.jsx +++ b/packages/rax-render/src/engine/pageEngine.tsx @@ -1,3 +1,5 @@ +// @ts-nocheck + import { createElement } from 'rax'; import PropTypes from 'prop-types'; import Debug from 'debug'; diff --git a/packages/rax-render/src/engine/tempEngine.jsx b/packages/rax-render/src/engine/tempEngine.tsx similarity index 99% rename from packages/rax-render/src/engine/tempEngine.jsx rename to packages/rax-render/src/engine/tempEngine.tsx index 582ab1ee0..5946eee07 100644 --- a/packages/rax-render/src/engine/tempEngine.jsx +++ b/packages/rax-render/src/engine/tempEngine.tsx @@ -1,3 +1,5 @@ +// @ts-nocheck + import { createElement } from 'rax'; import PropTypes from 'prop-types'; import Debug from 'debug'; diff --git a/packages/rax-render/src/hoc/compFactory.js b/packages/rax-render/src/hoc/compFactory.tsx similarity index 99% rename from packages/rax-render/src/hoc/compFactory.js rename to packages/rax-render/src/hoc/compFactory.tsx index cf4ea40e6..719b4fd9b 100644 --- a/packages/rax-render/src/hoc/compFactory.js +++ b/packages/rax-render/src/hoc/compFactory.tsx @@ -1,3 +1,5 @@ +// @ts-nocheck + import { Component, createElement, forwardRef } from 'rax'; import PropTypes from 'prop-types'; import AppHelper from '../utils/appHelper'; diff --git a/packages/rax-render/src/hoc/compWrapper.js b/packages/rax-render/src/hoc/compWrapper.tsx similarity index 80% rename from packages/rax-render/src/hoc/compWrapper.js rename to packages/rax-render/src/hoc/compWrapper.tsx index 8a396c22c..a32a69526 100644 --- a/packages/rax-render/src/hoc/compWrapper.js +++ b/packages/rax-render/src/hoc/compWrapper.tsx @@ -1,7 +1,9 @@ +// @ts-nocheck + import { createElement, Component } from 'rax'; export default function (Comp) { - class compWrapper extends Component { + return class CompWrapper extends Component { constructor(props, context) { super(props, context); } @@ -12,6 +14,4 @@ export default function (Comp) { }); } } - - return compWrapper; } diff --git a/packages/rax-render/src/index.jsx b/packages/rax-render/src/index.tsx similarity index 100% rename from packages/rax-render/src/index.jsx rename to packages/rax-render/src/index.tsx diff --git a/packages/rax-render/src/utils/appHelper.js b/packages/rax-render/src/utils/appHelper.ts similarity index 98% rename from packages/rax-render/src/utils/appHelper.js rename to packages/rax-render/src/utils/appHelper.ts index e39741ddc..b4fef97c3 100644 --- a/packages/rax-render/src/utils/appHelper.js +++ b/packages/rax-render/src/utils/appHelper.ts @@ -1,3 +1,5 @@ +// @ts-nocheck + import EventEmitter from 'events'; let instance = null; diff --git a/packages/rax-render/src/utils/dataHelper.js b/packages/rax-render/src/utils/dataHelper.ts similarity index 99% rename from packages/rax-render/src/utils/dataHelper.js rename to packages/rax-render/src/utils/dataHelper.ts index 6c838a739..bdd44974b 100644 --- a/packages/rax-render/src/utils/dataHelper.js +++ b/packages/rax-render/src/utils/dataHelper.ts @@ -1,3 +1,5 @@ +// @ts-nocheck + import { transformArrayToMap, isJSFunction, transformStringToFunction, clone } from './index'; import { jsonp, mtop, request, get, post, bzb } from './request'; diff --git a/packages/rax-render/src/utils/index.js b/packages/rax-render/src/utils/index.ts similarity index 99% rename from packages/rax-render/src/utils/index.js rename to packages/rax-render/src/utils/index.ts index 9100f9619..76d067936 100644 --- a/packages/rax-render/src/utils/index.js +++ b/packages/rax-render/src/utils/index.ts @@ -1,3 +1,5 @@ +// @ts-nocheck + import Debug from 'debug'; import _keymaster from 'keymaster'; import { forEach as _forEach, shallowEqual as _shallowEqual } from '@ali/b3-one/lib/obj'; @@ -13,9 +15,10 @@ import _debounce from 'lodash/debounce'; import _serialize from 'serialize-javascript'; import * as _jsonuri from 'jsonuri'; import IntlMessageFormat from 'intl-messageformat'; -import pkg from '../../package.json'; +import * as fs from 'fs-extra'; -window.sdkVersion = pkg.version; +const sdkVersion = fs.readJSONSync(path.join(__dirname, '..', '..', 'package.json')); +window.sdkVersion = sdkVersion; export const moment = _moment; moment.locale('zh-cn'); @@ -281,7 +284,7 @@ export function goldlog(gmKey, params = {}, logKey = 'other') { // vscode 黄金令箭API const sendIDEMessage = window.sendIDEMessage || getParentWinValue('sendIDEMessage'); const goKey = serializeParams({ - sdkVersion: pkg.version, + sdkVersion, env: getEnv(), ...params, }); diff --git a/packages/rax-render/src/utils/request.js b/packages/rax-render/src/utils/request.ts similarity index 99% rename from packages/rax-render/src/utils/request.js rename to packages/rax-render/src/utils/request.ts index f03bd4203..97cb4d395 100644 --- a/packages/rax-render/src/utils/request.js +++ b/packages/rax-render/src/utils/request.ts @@ -1,3 +1,5 @@ +// @ts-nocheck + import 'whatwg-fetch'; import fetchMtop from '@ali/lib-mtop'; import fetchJsonp from 'fetch-jsonp'; diff --git a/packages/rax-render/tsconfig.json b/packages/rax-render/tsconfig.json new file mode 100644 index 000000000..e1a57bf23 --- /dev/null +++ b/packages/rax-render/tsconfig.json @@ -0,0 +1,25 @@ +{ + "compilerOptions": { + "lib": ["es2015", "dom"], + "target": "esnext", + "module": "esnext", + "moduleResolution": "node", + "strict": false, + "strictPropertyInitialization": false, + "allowSyntheticDefaultImports": true, + "esModuleInterop": true, + "jsx": "preserve", + "importHelpers": true, + "experimentalDecorators": true, + "emitDecoratorMetadata": true, + "sourceMap": true, + "forceConsistentCasingInFileNames": true, + "resolveJsonModule": true, + "skipLibCheck": true, + "outDir": "lib" + }, + "exclude": ["test", "lib", "es", "node_modules"], + "include": [ + "src" + ] +}