fix: 更新taro-webpack-runner包的快照

.eslintrc.js

@@ -48,6 +48,7 @@ module.exports = {
     'react/prop-types': 0,
     'react/no-find-dom-node': 0,
     'react/no-unknown-property': 0,
+    'import/no-named-default': 'off',
     quotes: [2, 'single', { avoidEscape: true, allowTemplateLiterals: true }],
     semi: [2, 'never'],
     'simple-import-sort/imports': [2, {

packages/postcss-unit-transform/.eslintrc.js

@@ -0,0 +1,17 @@
+module.exports = {
+  parser: '@typescript-eslint/parser',
+  plugins: [
+    '@typescript-eslint'
+  ],
+  parserOptions: { },
+  extends: [
+    'eslint:recommended',
+    'standard',
+    'plugin:@typescript-eslint/recommended',
+    'prettier'
+  ],
+  rules: {
+    '@typescript-eslint/no-unused-vars': 0,
+    '@typescript-eslint/no-var-requires': 0
+  }
+}

packages/postcss-unit-transform/README.md

@@ -0,0 +1,3 @@
+# postcss-taro-unit-transform
+
+小程序的单位转换

packages/postcss-unit-transform/index.js

@@ -0,0 +1,18 @@
+const postcss = require('postcss')
+
+module.exports = postcss.plugin('postcss-taro-unit-transform', plugin)
+
+function plugin (opts) {
+  return function (root) {
+    root.walkDecls(function (decl) {
+      let value = decl.value
+      value = value.replace(/\b-?(\d+(\.\d+)?)px\b/ig, function (match, size) {
+        // 绝对值<1的非0数值转十进制后会被转成0,赋值为1
+        return Number(size) === 0 ? '0px': parseInt(size, 10) !== 0? (parseInt(size, 10) * 2) + 'px': '1px'
+      }).replace(/\b-?(\d+(\.\d+)?)rpx\b/ig, function (match, size) {
+        return size + 'px'
+      })
+      decl.value = value
+    })
+  }
+}

packages/postcss-unit-transform/package.json

@@ -0,0 +1,19 @@
+{
+  "name": "postcss-taro-unit-transform",
+  "version": "3.6.8",
+  "description": "小程序单位转换",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "luckyadam",
+  "license": "MIT",
+  "dependencies": {
+    "postcss": "^6.0.21",
+    "typescript": "^4.7.4"
+  },
+  "devDependencies": {
+    "@typescript-eslint/eslint-plugin": "^5.17.0",
+    "@typescript-eslint/parser": "^5.17.0"
+  }
+}

packages/postcss-unit-transform/yarn.lock

@@ -0,0 +1,53 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+ansi-styles@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.npm.taobao.org/ansi-styles/download/ansi-styles-3.2.1.tgz?cache=0&sync_timestamp=1589682811931&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fansi-styles%2Fdownload%2Fansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  dependencies:
+    color-convert "^1.9.0"
+
+chalk@^2.4.1:
+  version "2.4.2"
+  resolved "https://registry.npm.taobao.org/chalk/download/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
+color-convert@^1.9.0:
+  version "1.9.3"
+  resolved "https://registry.npm.taobao.org/color-convert/download/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+  dependencies:
+    color-name "1.1.3"
+
+color-name@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.npm.taobao.org/color-name/download/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+
+escape-string-regexp@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.npm.taobao.org/escape-string-regexp/download/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+
+has-flag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npm.taobao.org/has-flag/download/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+
+postcss@^6.0.21:
+  version "6.0.23"
+  resolved "https://registry.npm.taobao.org/postcss/download/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324"
+  dependencies:
+    chalk "^2.4.1"
+    source-map "^0.6.1"
+    supports-color "^5.4.0"
+
+source-map@^0.6.1:
+  version "0.6.1"
+  resolved "https://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz?cache=0&sync_timestamp=1589682764497&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsource-map%2Fdownload%2Fsource-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+
+supports-color@^5.3.0, supports-color@^5.4.0:
+  version "5.5.0"
+  resolved "https://registry.npm.taobao.org/supports-color/download/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  dependencies:
+    has-flag "^3.0.0"

packages/taro-cli-convertor/.eslintrc.js

@@ -5,5 +5,6 @@ module.exports = {
   rules: {
     ...config.rules,
     'no-console': 0
-  }
+  },
+  ignorePatterns: ['report/']
 }

packages/taro-cli-convertor/__tests__/__snapshots__/index.test.ts.snap

@@ -0,0 +1,17 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`parseAst require引用为空 1`] = `
+"import withWeapp, { cacheOptions } from \\"@tarojs/with-weapp\\";
+import { Block } from \\"@tarojs/components\\";
+import React from \\"react\\";
+import Taro from \\"@tarojs/taro\\";
+const aa = require();
+cacheOptions.setOptionsToCache({});
+@withWeapp(cacheOptions.getOptionsFromCache())
+class _C extends React.Component {
+  render() {
+    return null;
+  }
+}
+export default _C;"
+`;

packages/taro-cli-convertor/__tests__/index.test.ts

@@ -0,0 +1,154 @@
+import * as taroize from '@tarojs/taroize'
+
+import Convertor from '../src/index'
+import { generateMinimalEscapeCode } from './util'
+
+interface ITaroizeOptions {
+  json?: string
+  script?: string
+  wxml?: string
+  path?: string
+  rootPath?: string
+  scriptPath?: string
+}
+
+describe('parseAst', () => {
+  let convert
+  let param: ITaroizeOptions
+  beforeAll(() => {
+    const entryJSON = { pages: ['pages/index/index'] }
+    /**
+     * json：index.json的内容
+     * path：index的根目录（文件路径)
+     * rootPath：小程序的根目录（文件路径）
+     * script：index.js的内容
+     * scriptPath：index.js的绝对路径
+     * wxml：index.html的内容
+     */
+    param = {
+      json: '{}',
+      path: '',
+      rootPath: '',
+      script: '',
+      scriptPath: '',
+      wxml: '',
+    }
+
+    // new Convertot后会直接执行 init()，为确保 init() 在测试中通过采用 spyOn 去模拟
+    jest.spyOn(Convertor.prototype, 'getApp').mockImplementation(() => {
+      Convertor.prototype.entryJSON = entryJSON
+    })
+    jest.spyOn(Convertor.prototype, 'getPages').mockImplementation(() => {
+      Convertor.prototype.pages = new Set(entryJSON.pages)
+    })
+    convert = new Convertor('', false)
+    convert.pages = Convertor.prototype.pages
+  })
+
+  test('当使用e.target.dataset时引入工具函数 getTarget', () => {
+    param.script = `
+      app.createPage({
+        data:{
+          tagInfo:{
+            id:123456,
+            data:'茅台',
+          },
+          msg:'',
+          tagName:{}  
+        },
+        getMsg(e){
+          const detail = e.currentTarget
+          //变量赋值
+          const tagName_ = e.currentTarget.dataset.tagName
+          const tagData_ = e.currentTarget.dataset.tagData
+          //结构赋值
+          const { tagName } = e?.target?.dataset
+          const { tagData } = e?.target?.dataset
+        },
+        getMsg02(e){
+          const detail = e.currentTarget
+          const tagname_ = e.currentTarget.dataset.tagname
+          const tagdata_ = e.currentTarget.dataset.tagdata
+          const { tagname } = detail?.dataset
+          const { tagdata } = detail?.dataset
+        },
+      })
+    `
+
+    param.wxml = `
+      <view>测试data-xxx-xxx写法</view>
+      <button data-tag-name="WX1314" data-tag-data="{{ tagInfo }}" bindtap="getMsg">获取</button>
+      <view>测试data-xxxXxxx 驼峰写法</view>
+      <button data-tagName="WX1314" data-tagData="{{ tagInfo }}" bindtap="getMsg02">获取</button>
+      `
+
+    // 解析wxml的时候有缓存，需保证test的path唯一
+    param.path = 'e_target_dataset'
+    const taroizeResult = taroize({
+      ...param,
+      framework: 'react',
+    })
+
+    const { ast } = convert.parseAst({
+      ast: taroizeResult.ast,
+      sourceFilePath: '',
+      outputFilePath: '',
+      importStylePath: '',
+      depComponents: new Set(),
+      imports: [],
+    })
+    expect(ast).toMatchSnapshot()
+  })
+
+  // 测试require
+  // 场景1：require引用为空
+  test('require引用为空', () => {
+    param.script = `const aa = require()`
+    param.wxml = ''
+
+    // 解析wxml的时候有缓存，需保证test的path唯一
+    param.path = 'require'
+
+    // 转换页面js脚本
+    const taroizeResult = taroize({
+      ...param,
+      framework: 'react',
+    })
+
+    const { ast } = convert.parseAst({
+      ast: taroizeResult.ast,
+      sourceFilePath: '',
+      outputFilePath: '',
+      importStylePath: '',
+      depComponents: new Set(),
+      imports: [],
+    })
+
+    // 将ast转换为代码
+    const jsCode = generateMinimalEscapeCode(ast)
+    expect(jsCode).toMatchSnapshot()
+  })
+
+  // 场景1：require引用包含变量
+  test('require引用包含变量', () => {
+    param.script = `const aa = require('aa' + aa)`
+    param.wxml = ''
+
+    // 转换页面js脚本
+    const taroizeResult = taroize({
+      ...param,
+      framework: 'react',
+    })
+
+    expect(() =>
+      convert.parseAst({
+        ast: taroizeResult.ast,
+        sourceFilePath: '',
+        outputFilePath: '',
+        importStylePath: '',
+        depComponents: new Set(),
+        imports: [],
+      })
+    ).toThrow()
+  })
+})