Revert "chore: drop rollup-plugin-ts (#17480)" (#17543)

This reverts commit 8256f13.

Co-authored-by: chenjiajun79 <chenjiajun79@jd.com>

Author: Single-Dancer

.github/workflows/nodejs.yml

@@ -28,7 +28,7 @@ jobs:
     name: Build Rust WASM
     uses: ./.github/workflows/build-rust-wasm.yml
 
-  nodejs-testing:
+  nodejs-tesing:
     name: Testing on Node.js ${{ matrix.node-version }} (${{ matrix.host }})
     needs:
       - build-rust-binding
@@ -118,27 +118,31 @@ jobs:
         uses: codecov/codecov-action@v4
         if: ${{ matrix.host == 'ubuntu-latest' }}
         with:
+          move_coverage_to_trash: true
           flags: taro-cli
           files: ./packages/taro-cli/coverage/clover.xml
           token: ${{ secrets.CODECOV_TOKEN }}
       - name: Upload runner coverage to Codecov
         uses: codecov/codecov-action@v4
         if: ${{ matrix.host == 'ubuntu-latest' }}
         with:
+          move_coverage_to_trash: true
           flags: taro-runner
           files: ./packages/taro-webpack5-runner/coverage/clover.xml
           token: ${{ secrets.CODECOV_TOKEN }}
       - name: Upload [taro-runtime] coverage to Codecov
         uses: codecov/codecov-action@v4
         if: ${{ matrix.host == 'ubuntu-latest' }}
         with:
+          move_coverage_to_trash: true
           flags: taro-runtime
           files: ./packages/taro-runtime/coverage/clover.xml
           token: ${{ secrets.CODECOV_TOKEN }}
       - name: Upload [taro-web] coverage to Codecov
         uses: codecov/codecov-action@v4
         if: ${{ matrix.host == 'ubuntu-latest' }}
         with:
+          move_coverage_to_trash: true
           flags: taro-web
           files: ./packages/taro-components/coverage/clover.xml,./packages/taro-h5/coverage/clover.xml,./packages/taro-router/coverage/clover.xml
           token: ${{ secrets.CODECOV_TOKEN }}

packages/babel-plugin-transform-taroapi/__tests__/__snapshots__/index.spec.ts.snap

@@ -9,12 +9,12 @@ false;
 false;
 
 // 接口参数、回调或者返回值
+true;
 false;
 false;
 false;
 false;
-false;
-false;
+true;
 
 // 组件的属性
 true;
@@ -42,34 +42,34 @@ Taro.noop();"
 `;
 
 exports[`babel-plugin-transform-taroapi should not go wrong when using an api twice 1`] = `
-"import Taro from '@tarojs/taro-h5';
-const animation = Taro.createAnimation({
+"import Taro, { createAnimation as _createAnimation } from '@tarojs/taro-h5';
+const animation = _createAnimation({
   duration: dura * 1000,
   timingFunction: 'linear'
 });
-const resetAnimation = Taro.createAnimation({
+const resetAnimation = _createAnimation({
   duration: 0,
   timingFunction: 'linear'
 });"
 `;
 
 exports[`babel-plugin-transform-taroapi should not import taro duplicity 1`] = `
-"import Taro from '@tarojs/taro-h5';
+"import Taro, { createAnimation as _createAnimation, initPxTransform as _initPxTransform } from '@tarojs/taro-h5';
 Taro.Component;
-Taro.createAnimation();
-Taro.initPxTransform();"
+_createAnimation();
+_initPxTransform();"
 `;
 
 exports[`babel-plugin-transform-taroapi should preserve assignments in left hands 1`] = `
-"import Taro from '@tarojs/taro-h5';
+"import Taro, { createAnimation as _createAnimation, request as _request } from '@tarojs/taro-h5';
 let animation;
-animation = Taro.createAnimation({
+animation = _createAnimation({
   transformOrigin: "50% 50%",
   duration: 1000,
   timingFunction: "ease",
   delay: 0
 });
-Taro.request();
+_request();
 Taro.request = '';
 Taro['request'] = '';"
 `;
@@ -86,11 +86,11 @@ export class Connected extends Taro.Component {}"
 `;
 
 exports[`babel-plugin-transform-taroapi should work! 1`] = `
-"import Taro from '@tarojs/taro-h5';
-Taro.initPxTransform(Taro.param);
-Taro.initPxTransform();
-Taro.initPxTransform();
-Taro['getStorage']();
-Taro.setStorage();
+"import Taro, { setStorage as _setStorage, initPxTransform as _initPxTransform, getStorage as _getStorage } from '@tarojs/taro-h5';
+_initPxTransform(Taro.param);
+_initPxTransform();
+_initPxTransform();
+_getStorage();
+_setStorage();
 export { Taro };"
 `;

packages/taro-h5/package.json

@@ -23,8 +23,8 @@
     "prebuild": "rimraf ./dist",
     "build": "pnpm run rollup --environment NODE_ENV:production",
     "dev": "pnpm run rollup --environment NODE_ENV:development -w",
-    "rollup": "rollup --config rollup.config.ts --configPlugin @rollup/plugin-typescript --bundleConfigAsCjs",
-    "test": "jest",
+    "rollup": "rollup --config rollup.config.mts --configPlugin @rollup/plugin-typescript --bundleConfigAsCjs",
+    "test": "node_modules/jest/bin/jest.js",
     "test:ci": "jest --ci -i --coverage --silent",
     "test:dev": "jest --watch",
     "test:coverage": "jest --coverage"
@@ -70,7 +70,7 @@
     "react-test-renderer": "^18.2.0",
     "rollup": "^3.29.4",
     "rollup-plugin-node-externals": "^5.0.0",
-    "@rollup/plugin-typescript": "^12.1.2",
+    "rollup-plugin-ts": "^3.4.5",
     "@rollup/plugin-node-resolve": "^15.2.3"
   },
   "peerDependencies": {

packages/taro-h5/rollup.config.ts packages/taro-h5/rollup.config.mtspackages/taro-h5/rollup.config.ts renamed to packages/taro-h5/rollup.config.mts

@@ -1,10 +1,10 @@
 import commonjs from '@rollup/plugin-commonjs'
 import { nodeResolve } from '@rollup/plugin-node-resolve'
-import ts from '@rollup/plugin-typescript'
 import { mergeWith } from 'lodash'
 import { defineConfig } from 'rollup'
 import externals from 'rollup-plugin-node-externals'
 import postcss from 'rollup-plugin-postcss'
+import ts from 'rollup-plugin-ts'
 
 import type { InputPluginOption, RollupOptions } from 'rollup'
 
@@ -24,7 +24,10 @@ const baseConfig: RollupOptions = {
       mainFields: ['browser', 'module', 'jsnext:main', 'main'],
     }) as InputPluginOption,
     ts({
-      exclude: ['rollup.config.ts']
+      tsconfig: (e) => ({
+        ...e,
+        sourceMap: true,
+      }),
     }),
     commonjs() as InputPluginOption,
     postcss({

packages/taro-h5/tsconfig.json

@@ -5,7 +5,7 @@
     "declaration": true,
     "outDir": "dist",
     "module": "ESNext",
-    "sourceMap": true
+    "sourceMap": false
   },
-  "include": ["./src", "./types", "rollup.config.ts"]
+  "include": ["./src", "./types", "rollup.config.mts"]
 }

packages/taro-platform-h5/build/definition-json/parser.ts

@@ -94,7 +94,7 @@ export function parseAnyOrVoid (str = '', obj: unknown = str) {
 }
 
 export function parseDefinitionJSON ({
-  apisPath = require.resolve('@tarojs/taro-h5/dist/index.d.ts'),
+  apisPath = require.resolve('@tarojs/taro-h5/dist/index.esm.d.ts'),
   componentsPath = require.resolve('@tarojs/components/dist/types/components.d.ts'),
 } = {},
 config: ts.CompilerOptions = tsconfig,

packages/taro-platform-harmony-hybrid/package.json

@@ -60,13 +60,14 @@
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^15.2.3",
-    "@rollup/plugin-typescript": "^11.1.6",
+    "@rollup/plugin-typescript": "^11.1.0",
     "@tarojs/taro": "workspace:*",
     "@types/node": "^14.14.31",
     "fast-glob": "^3.3.1",
     "lodash": "^4.17.21",
     "rollup": "^3.29.4",
     "rollup-plugin-node-externals": "^5.0.0",
+    "rollup-plugin-ts": "^3.4.5",
     "tsconfig-paths": "^3.14.1"
   }
 }

packages/taro-platform-harmony-hybrid/rollup.config.ts

@@ -1,15 +1,19 @@
+import path from 'node:path'
+
 import commonjs from '@rollup/plugin-commonjs'
 import json from '@rollup/plugin-json'
 import { nodeResolve } from '@rollup/plugin-node-resolve'
-import ts from '@rollup/plugin-typescript'
 import { merge } from 'lodash'
 import { defineConfig } from 'rollup'
 import externals from 'rollup-plugin-node-externals'
+import ts from 'rollup-plugin-ts'
 
 import exportNameOnly from './build/rollup-plugin-export-name-only'
 
 import type { InputPluginOption, RollupOptions } from 'rollup'
 
+const cwd = __dirname
+
 const baseConfig: RollupOptions = {
   output: {
     format: 'es',
@@ -31,7 +35,11 @@ function getPlugins<T = InputPluginOption> (pre: T[] = [], post: T[] = []) {
       preferConst: true,
     }),
     ts({
-      exclude: ['rollup.config.ts']
+      tsconfig: e => ({
+        ...e,
+        declaration: true,
+        sourceMap: true,
+      })
     }),
     commonjs(),
     ...post
@@ -69,7 +77,7 @@ const variesConfig: RollupOptions[] = [{
     devDeps: false,
   })])
 }, {
-  input: 'src/runtime/apis/index.ts', // 供 babel-plugin-transform-taroapi 使用，为了能 tree-shaking
+  input: path.join(cwd, 'src/runtime/apis/index.ts'), // 供 babel-plugin-transform-taroapi 使用，为了能 tree-shaking
   output: {
     file: 'dist/taroApis.js',
     format: 'cjs',
@@ -80,7 +88,7 @@ const variesConfig: RollupOptions[] = [{
 
 if (process.env.NODE_ENV === 'production') {
   variesConfig.push({
-    input: 'build/rollup-plugin-export-name-only.js',
+    input: path.join(cwd, 'build/rollup-plugin-export-name-only.js'),
     output: {
       file: 'dist/rollup-plugin-export-name-only.js',
       format: 'cjs',

packages/taro-platform-harmony-hybrid/tsconfig.json

@@ -6,9 +6,7 @@
     "esModuleInterop": true,
     "module": "ESNext",
     "preserveConstEnums": true,
-    "sourceMap": true,
-    "declaration": true,
-    "outDir": "dist"
+    "sourceMap": true
   },
   "include": ["./src", "./types", "./rollup.config.ts"],
   "ts-node": {

packages/taro-platform-harmony/package.json

@@ -47,7 +47,7 @@
     "rollup": "^3.29.4",
     "rollup-plugin-copy": "workspace:*",
     "rollup-plugin-node-externals": "^5.0.0",
-    "@rollup/plugin-typescript": "^12.1.2",
+    "rollup-plugin-ts": "^3.4.5",
     "solid-js": "^1.8.16",
     "tslib": "^2.4.0"
   }