@ray-js/framework-shared 1.6.18 → 1.6.20-alpha.0

package/lib/emitter/index.js

@@ -1,6 +1,5 @@
 import "core-js/modules/esnext.iterator.constructor.js";
 import "core-js/modules/esnext.iterator.for-each.js";
-import "core-js/modules/web.dom-collections.iterator.js";
 export class Emitter {
   constructor() {
     this.listeners = {};

package/lib/filterProps/index.js

@@ -1,5 +1,3 @@
-import "core-js/modules/es.regexp.exec.js";
-import "core-js/modules/es.string.replace.js";
 import "core-js/modules/esnext.iterator.constructor.js";
 import "core-js/modules/esnext.iterator.reduce.js";
 export const isPlatformSpecifyProp = prop => prop.match(/^(ali|wechat|toutiao)-/);

package/lib/inlineStyle/index.js

@@ -1,9 +1,6 @@
-import "core-js/modules/es.regexp.exec.js";
-import "core-js/modules/es.string.replace.js";
 import "core-js/modules/esnext.iterator.constructor.js";
 import "core-js/modules/esnext.iterator.filter.js";
 import "core-js/modules/esnext.iterator.for-each.js";
-import "core-js/modules/web.dom-collections.iterator.js";
 import { isWeb } from '@ray-js/env';
 import { isUnitlessNumber } from './CSSProperty';
 
@@ -28,15 +25,15 @@ export function inlineStyle() {
     else if (!(key in isUnitlessNumber)) {
       if (!Number.isNaN(Number(value))) {
         if (isWeb) {
-          style[key] = "".concat(value / 100, "rem");
+          style[key] = `${value / 100}rem`;
         } else {
-          style[key] = "".concat(value, "rpx");
+          style[key] = `${value}rpx`;
         }
       } else if (/\b([.\d]+)rpx\b/.test(value) && isWeb) {
         // TODO: 支持 native 的样式抹平
         style[key] = value.replace(/\b([.\d]+)rpx\b/g, (match, x) => {
           const size = Number(x);
-          return "".concat(size / 100, "rem");
+          return `${size / 100}rem`;
         });
       }
     }

package/lib/normalizeTabBar.js

@@ -1,10 +1,8 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import "core-js/modules/es.json.stringify.js";
 import "core-js/modules/esnext.iterator.constructor.js";
 import "core-js/modules/esnext.iterator.filter.js";
 import "core-js/modules/esnext.iterator.find.js";
 import "core-js/modules/esnext.iterator.map.js";
-import "core-js/modules/web.dom-collections.iterator.js";
 import { match, parse } from 'path-to-regexp';
 export function normalizeTabBar(tabBar, routes) {
   let list = tabBar.list;
@@ -33,7 +31,7 @@ export function normalizeTabBar(tabBar, routes) {
       tab = _objectSpread({}, tab);
       const m = routes.find(i => tab.pagePath === i.path);
       if (!m) {
-        throw new Error("tabBar.list[".concat(index, "].pagePath: ").concat(tab.pagePath, " \u9700\u8981\u5728\u8DEF\u7531\u914D\u7F6E\u4E2D:  ").concat(JSON.stringify(routes, null, 2)));
+        throw new Error(`tabBar.list[${index}].pagePath: ${tab.pagePath} 需要在路由配置中:  ${JSON.stringify(routes, null, 2)}`);
       }
       if (!tab.route) {
         // 判断 routes[number].route 是否为模式匹配规则
@@ -42,7 +40,7 @@ export function normalizeTabBar(tabBar, routes) {
       // 判断是否能被路由命中
       const matched = match((_m$route = m.route) !== null && _m$route !== void 0 ? _m$route : m.path)(tab.route);
       if (!matched) {
-        console.warn("tabBar.list[".concat(index, "]\n.route: ").concat(tab.route, "\n.pagePath: ").concat(tab.pagePath, "\n\u5E94\u88AB\u8DEF\u7531\u547D\u4E2D: \n").concat(JSON.stringify(m, null, 2)));
+        console.warn(`tabBar.list[${index}]\n.route: ${tab.route}\n.pagePath: ${tab.pagePath}\n应被路由命中: \n${JSON.stringify(m, null, 2)}`);
         return;
       }
       // 判断是否还被其他路由命中
@@ -52,7 +50,7 @@ export function normalizeTabBar(tabBar, routes) {
       });
       const unusable = otherMatched.filter(r => r.path !== tab.pagePath);
       if (unusable.length) {
-        console.warn("tabBar.list[".concat(index, "]\n.route: ").concat(tab.route, "\n%c.pagePath: ").concat(tab.pagePath, "\n%c\u88AB\u5176\u5B83\u8DEF\u7531\u547D\u4E2D\uFF1A\n").concat(JSON.stringify(unusable, null, 2)), 'background:#290000;color:green', 'background:#290000;color:green', 'color:red');
+        console.warn(`tabBar.list[${index}]\n.route: ${tab.route}\n%c.pagePath: ${tab.pagePath}\n%c被其它路由命中：\n${JSON.stringify(unusable, null, 2)}`, 'background:#290000;color:green', 'background:#290000;color:green', 'color:red');
         return;
       }
       return tab;

package/lib/plainStyle/index.js

@@ -1,9 +1,6 @@
-import "core-js/modules/es.regexp.exec.js";
-import "core-js/modules/es.string.replace.js";
 import "core-js/modules/esnext.iterator.constructor.js";
 import "core-js/modules/esnext.iterator.filter.js";
 import "core-js/modules/esnext.iterator.reduce.js";
-import "core-js/modules/web.dom-collections.iterator.js";
 const vendorPrefixes = ['webkit', 'moz', 'ms', 'o'];
 const transformReactStyleKey = key => {
   var _styleValue;
@@ -12,7 +9,7 @@ const transformReactStyleKey = key => {
     return key;
   }
   let styleValue = key.replace(/\.?([A-Z]+)/g, function (_x, y) {
-    return "-".concat(y.toLowerCase());
+    return `-${y.toLowerCase()}`;
   });
 
   // vendor prefix
@@ -20,7 +17,7 @@ const transformReactStyleKey = key => {
     const firstWord = styleValue.split('-').filter(s => s)[0];
     styleValue = styleValue.replace(/^-/, '');
     if (vendorPrefixes.find(prefix => prefix === firstWord)) {
-      styleValue = "-".concat(styleValue);
+      styleValue = `-${styleValue}`;
     }
   }
   return styleValue;
@@ -31,6 +28,6 @@ export const plainStyle = style => {
   }
   return Object.keys(style).reduce((acc, key) => {
     const value = style[key];
-    return [...acc, "".concat(transformReactStyleKey(key), ":").concat(value, ";")];
+    return [...acc, `${transformReactStyleKey(key)}:${value};`];
   }, []).join('\n');
 };

package/lib/useStylesheet/index.js

@@ -1,11 +1,12 @@
 import React from 'react';
 import { plainStyle } from '../plainStyle';
 let clsxId = 0;
-const generateClassName = () => "placeholder-style-".concat(clsxId++);
+const generateClassName = () => `placeholder-style-${clsxId++}`;
 export function useStylesheet(css) {
   const className = React.useRef(generateClassName());
   React.useEffect(() => {
-    const styleContent = ".".concat(className.current, "::placeholder {\n").concat(plainStyle(css), "}");
+    const styleContent = `.${className.current}::placeholder {
+${plainStyle(css)}}`;
     const style = window.document.createElement('style');
     style.type = 'text/css';
     style.appendChild(document.createTextNode(styleContent));

package/lib/useThrottle/index.js

@@ -1,4 +1,3 @@
-import "core-js/modules/web.dom-collections.iterator.js";
 import { useRef, useState } from 'react';
 
 /**

package/lib/useTouch/index.js

@@ -6,7 +6,6 @@ import "core-js/modules/esnext.iterator.filter.js";
 import "core-js/modules/esnext.iterator.for-each.js";
 import "core-js/modules/esnext.iterator.map.js";
 import "core-js/modules/esnext.iterator.reduce.js";
-import "core-js/modules/web.dom-collections.iterator.js";
 import * as React from 'react';
 import { isWeb } from '@ray-js/env';
 const LONG_TAP_DURATION = 350;

package/lib/useTransition/index.js

@@ -1,4 +1,3 @@
-import "core-js/modules/web.dom-collections.iterator.js";
 import { useEffect, useRef, useState } from 'react';
 const nextFrame = function () {
   let duration = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 1000 / 30;
@@ -33,6 +32,6 @@ export function useTransition(options, deps) {
     updateShow(visible);
   }, [visible]);
   return [status, {
-    animationDuration: "".concat(duration / 1000, "s")
+    animationDuration: `${duration / 1000}s`
   }, updateShow];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/framework-shared",
-  "version": "1.6.18",
+  "version": "1.6.20-alpha.0",
   "description": "Ray shared for framework",
   "keywords": [
     "ray"
@@ -24,16 +24,16 @@
   },
   "dependencies": {
     "@ray-core/wechat": "^0.4.8",
-    "@ray-js/env": "1.6.18",
-    "@ray-js/types": "1.6.18",
+    "@ray-js/env": "1.6.20-alpha.0",
+    "@ray-js/types": "1.6.20-alpha.0",
     "path-to-regexp": "^6.3.0"
   },
   "devDependencies": {
-    "@ray-js/cli": "1.6.18"
+    "@ray-js/cli": "1.6.20-alpha.0"
   },
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.com"
   },
-  "gitHead": "537ce09350475f32d1ac01abd36cc9171f9c7ecd"
+  "gitHead": "6111376e4f7189596d01d840c06e43284eb74d2e"
 }