@ray-js/build-plugin-ray 0.6.21 → 0.6.22-beta-2

package/lib/index.js

@@ -5,29 +5,30 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const colors_1 = __importDefault(require("colors"));
 const path_1 = __importDefault(require("path"));
-const fs_extra_1 = __importDefault(require("fs-extra"));
 const shared_1 = require("@ray-js/shared");
+const slash_1 = __importDefault(require("slash"));
 colors_1.default.enable();
-const BUILD_TEMP_DIR = '.ray';
-const LOG_PREFIX = `build-plugin-ray`;
+const LOG_PREFIX = `@ray-js/ray => ray`;
 function PluginRay(api) {
-    const { options: { cwd }, } = api;
-    const rayFolder = path_1.default.join(cwd, BUILD_TEMP_DIR);
+    const cwd = api.options.cwd;
+    let rayMod;
+    try {
+        const p = (0, slash_1.default)(path_1.default.join(cwd, 'node_modules', '@ray-js/ray'));
+        rayMod = require.resolve(p);
+    }
+    catch (e) {
+        rayMod = require.resolve('@ray-js/ray');
+        shared_1.log.warn('', `Can't resolve module '@ray-js/ray' in ${cwd}`.yellow);
+    }
     return {
-        name: '@ray-js/build-plugin-ray',
+        name: LOG_PREFIX,
         setup() {
             shared_1.log.verbose(LOG_PREFIX, 'setup', api);
-            this.generateRayBootstrap();
         },
         configWebpack({ config }) {
-            shared_1.log.verbose(LOG_PREFIX, 'ray folder', rayFolder.blue.underline);
-            config.resolve.alias.set('ray', rayFolder);
-        },
-        generateRayBootstrap() {
-            const root = path_1.default.join(__dirname, '../templates');
-            fs_extra_1.default.copySync(root, rayFolder);
+            shared_1.log.verbose(LOG_PREFIX, 'ray folder', rayMod.blue.underline);
+            config.resolve.alias.set('ray', rayMod);
         },
     };
 }
 exports.default = PluginRay;
-//# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/build-plugin-ray",
-  "version": "0.6.21",
+  "version": "0.6.22-beta-2",
   "description": "Ray build plugin for ray/framework",
   "keywords": [
     "ray"
@@ -8,9 +8,7 @@
   "license": "MIT",
   "main": "lib/index.js",
   "files": [
-    "lib",
-    "templates",
-    "typings"
+    "lib"
   ],
   "publishConfig": {
     "access": "public",
@@ -22,12 +20,13 @@
     "watch": "tsc -p ./tsconfig.build.json --watch"
   },
   "dependencies": {
-    "@ray-js/shared": "^0.6.21",
+    "@ray-js/shared": "^0.6.22-beta-2",
     "colors": "1.4.0",
-    "fs-extra": "^10.0.0"
+    "fs-extra": "^10.0.0",
+    "slash": "^3.0.0"
   },
   "devDependencies": {
-    "@ray-js/types": "^0.6.21",
+    "@ray-js/types": "^0.6.22-beta-2",
     "@types/fs-extra": "^9.0.13"
   },
   "maintainers": [
@@ -36,6 +35,6 @@
       "email": "tuyafe@tuya.com"
     }
   ],
-  "gitHead": "cbb81571d068e6997e9b1fe95198c1b0275112e7",
+  "gitHead": "5d621bf1561047175b967cdf3aa35446f7d7198a",
   "repository": {}
 }

package/lib/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;AACA,oDAA2B;AAC3B,gDAAuB;AACvB,wDAA0B;AAC1B,2CAAoC;AAEpC,gBAAM,CAAC,MAAM,EAAE,CAAA;AAEf,MAAM,cAAc,GAAG,MAAM,CAAA;AAE7B,MAAM,UAAU,GAAG,kBAAkB,CAAA;AAErC,SAAwB,SAAS,CAAC,GAAQ;IACxC,MAAM,EACJ,OAAO,EAAE,EAAE,GAAG,EAAE,GACjB,GAAG,GAAG,CAAA;IACP,MAAM,SAAS,GAAG,cAAI,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,CAAA;IAChD,OAAO;QACL,IAAI,EAAE,0BAA0B;QAChC,KAAK;YACH,YAAG,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,EAAE,GAAG,CAAC,CAAA;YACrC,IAAI,CAAC,oBAAoB,EAAE,CAAA;QAC7B,CAAC;QACD,aAAa,CAAC,EAAE,MAAM,EAAE;YACtB,YAAG,CAAC,OAAO,CAAC,UAAU,EAAE,YAAY,EAAE,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YAC/D,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA;QAC5C,CAAC;QACD,oBAAoB;YAClB,MAAM,IAAI,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC,CAAA;YACjD,kBAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;QAC/B,CAAC;KACF,CAAA;AACH,CAAC;AApBD,4BAoBC"}

package/templates/README.md

@@ -1,19 +0,0 @@
-# Ray
-
-由 `@ray-js/build-plugin-ray` 进行文件内容的生成，不要进行对该文件夹下任何文件进行修改。
-
-实现 `import * form 'ray';` 的导出，通过 `webpack.resolve.alias` 来配置构建。
-
-底层由 `@ray-js/framework` 进行实现，主要包含对应应用类型（web, wechat tuya）执行的上下文 PageInstanceContext 来进行运行时的框架抹平完成应用的同构。
-
-受限于小程序厂商的能力，尽量在此基础上，以 web 标准开发进行抹平，业务开发也尽可能的保持面向 WEB 开发的心智。
-
-build-plugin-ray/template 目录说明
-
-```
-template
-├── index.ts                        # 构建web、小程序时，导入的模块 `import * form 'ray';`
-├── main.mini.tsx                   # 小程序（tuya、wechat等）构建入口文件
-├── main.tsx                        # web构建入口文件
-└── README.md
-```

package/templates/index.ts

@@ -1,5 +0,0 @@
-export * from '@ray-js/framework' // 由构建器别名替换到 @ray-js/framework-mp
-import router from '@ray-js/router' // 由构建器别名替换到 @ray-js/router-mp
-import location from '@ray-js/location'
-
-export { router, location }

package/templates/main.mini.tsx

@@ -1,10 +0,0 @@
-//@ts-nocheck
-import { createRouter } from '@ray-js/router-mp'
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const routesModule = require('@/routes.config')
-
-createRouter({
-  routes: routesModule.routes || [],
-  tabBar: routesModule.tabBar || {},
-  subpackages: routesModule.subpackages || [],
-})

package/templates/main.tsx

@@ -1,17 +0,0 @@
-import { createApp } from '@ray-js/framework'
-
-import App from '@/app'
-import * as globalConfig from '@/global.config'
-import * as routesConfig from '@/routes.config'
-import { PAGES } from './router.config'
-
-const globalConfigDefault = globalConfig.default || {}
-const globalConfigTarget = globalConfig[process.env.PLATFORM] || {}
-
-createApp({
-  app: App,
-  globalConfig: { ...globalConfigTarget, ...globalConfigDefault },
-  pages: PAGES,
-  routes: routesConfig.routes,
-  tabBar: routesConfig.tabBar || {},
-})

package/typings/index.d.ts

@@ -1,33 +0,0 @@
-declare module '*.less'
-
-type RequestRes = {
-  data: string
-  statusCode: number
-  header: Record<string, string>
-  cookies: Array<string>
-  profile: any
-  taskId: string
-}
-
-type RequestParams = {
-  url: string
-  data?: string
-  header?: Record<string, string>
-  timeout?: number
-  method?: string
-  dataType?: string
-  responseType?: string
-  enableHttp2?: boolean
-  enableQuic?: boolean
-  enableCache?: boolean
-  success?: (successRes: RequestRes) => void
-  fail?: (successRes: RequestRes) => void
-  complete?: (successRes: RequestRes) => void
-}
-declare global {
-  interface Window {
-    devToolsExtension?: () => any
-  }
-}
-
-export {}