feat: add 2 new entries (core & core-live-query)

leeyeh · leeyeh · commit a355867bce57 · 2020-03-17T13:53:55.000+08:00
- remove the pre-compiled react-native bundle as the current implement is deprecated.
- (internal) do not get the hookKey from process.env
diff --git a/core-live-query.d.ts b/core-live-query.d.ts
@@ -0,0 +1 @@
+export * from './storage';
diff --git a/core-live-query.js b/core-live-query.js
@@ -0,0 +1 @@
+module.exports = require('./dist/cjs/entry/core-live-query');
diff --git a/core.d.ts b/core.d.ts
@@ -0,0 +1 @@
+export * from './storage';
diff --git a/core.js b/core.js
@@ -0,0 +1 @@
+module.exports = require('./dist/cjs/entry/core');
diff --git a/gulpfile.babel.js b/gulpfile.babel.js
@@ -26,18 +26,17 @@ gulp.task('bundle-rn', ['clean-dist'], shell.task('npm run build:rn'));
 gulp.task('bundle-weapp', ['clean-dist'], shell.task('npm run build:weapp'));
 
 // 编译出 Node 版本
-gulp.task('babel-node', ['clean-dist'], () => {
+gulp.task('babel-cjs', ['clean-dist'], () => {
   return gulp
     .src('src/**/*.js')
     .pipe(babel())
-    .pipe(gulp.dest('dist/node/'));
+    .pipe(gulp.dest('dist/cjs/'));
 });
 
 // 生成 release 文件
 gulp.task('build', [
   'clean-dist',
   'bundle-browser',
-  'bundle-rn',
   'bundle-weapp',
-  'babel-node',
+  'babel-cjs',
 ]);
diff --git a/live-query.js b/live-query.js
@@ -1 +1 @@
-module.exports = require('./dist/node/index-live-query');
+module.exports = require('./dist/cjs/entry/index-live-query');
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "leancloud-storage",
   "version": "4.3.1",
-  "main": "./dist/node/index.js",
+  "main": "./dist/cjs/entry/index.js",
   "description": "LeanCloud JavaScript SDK.",
   "repository": {
     "type": "git",
@@ -12,14 +12,13 @@
     "lint": "tsc storage.d.ts --strict",
     "test": "npm run lint && npm run test:node",
     "test:node": "cross-env NODE_ENV=test nyc --reporter lcov --reporter text mocha --timeout 300000 test/index.js",
-    "test:real": "cross-env NODE_ENV=test REAL_BACKEND=1 nyc --reporter lcov --reporter text mocha --timeout 300000 test/index.js",
+    "test:real": "cross-env REAL_BACKEND=1 npm run test:node",
     "docs": "jsdoc src README.md package.json -d docs -c .jsdocrc.json",
-    "build:node": "gulp babel-node",
+    "build:cjs": "gulp babel-cjs",
     "build:browser": "cross-env CLIENT_PLATFORM=Browser webpack --config webpack/browser.js",
-    "build:rn": "cross-env CLIENT_PLATFORM=ReactNative webpack --config webpack/rn.js",
     "build:weapp": "cross-env CLIENT_PLATFORM=Weapp webpack --config webpack/weapp.js",
     "build": "gulp build && npm run build:live-query",
-    "build:live-query": "export LIVE_QUERY=1 && npm run build:browser && npm run build:rn && npm run build:weapp",
+    "build:live-query": "export LIVE_QUERY=1 && npm run build:browser && npm run build:weapp",
     "prepublishOnly": "./script/check-version.js"
   },
   "dependencies": {
@@ -78,14 +77,14 @@
     "@leancloud/runtime-adapters-node": "@leancloud/runtime-adapters-browser",
     "./src/utils/parse-base64.js": "./src/utils/parse-base64-browser.js",
     "./src/ua/comments.js": "./src/ua/comments-browser.js",
-    "./dist/node/index.js": "./dist/av-min.js"
+    "./dist/cjs/entry/index.js": "./dist/av-min.js"
   },
   "react-native": {
-    "./dist/node/index.js": "./dist/av-rn-min.js"
+    "./dist/cjs/entry/index.js": "./dist/av-rn-min.js"
   },
   "weapp": {
     "@leancloud/runtime-adapters-node": "@leancloud/runtime-adapters-weapp",
-    "./dist/node/index.js": "./dist/av-weapp-min.js"
+    "./dist/cjs/entry/index.js": "./dist/av-weapp-min.js"
   },
   "typings": "./storage.d.ts",
   "types": "./storage.d.ts",
diff --git a/src/av.js b/src/av.js
@@ -1,7 +1,7 @@
 const _ = require('underscore');
 const uuid = require('uuid/v4');
 const debug = require('debug');
-const userAgent = require('./ua');
+const getUA = require('./ua');
 const { inherits, parseDate } = require('./utils');
 const Promise = require('./promise');
 const { setAdapters } = require('./adapter');
@@ -19,7 +19,7 @@ AV._config = {
 
 // configs shared by all AV instances
 AV._sharedConfig = {
-  userAgent,
+  userAgent: getUA(),
   liveQueryRealtime: null,
 };
 
diff --git a/src/entry/core-live-query.js b/src/entry/core-live-query.js
@@ -0,0 +1,4 @@
+const AV = require('./core');
+const useLiveQuery = require('./use-live-query');
+
+module.exports = useLiveQuery(AV);
diff --git a/src/entry/core.js b/src/entry/core.js
@@ -0,0 +1 @@
+module.exports = require('../index');
diff --git a/src/entry/index-live-query.js b/src/entry/index-live-query.js
@@ -0,0 +1,5 @@
+const AV = require('./index');
+const useLiveQuery = require('./use-live-query');
+const useAdatpers = require('./use-adapters');
+
+module.exports = useAdatpers(useLiveQuery(AV));
diff --git a/src/entry/index.js b/src/entry/index.js
@@ -0,0 +1,4 @@
+const AV = require('./core');
+const useAdatpers = require('./use-adapters');
+
+module.exports = useAdatpers(AV);
diff --git a/src/entry/use-adapters.js b/src/entry/use-adapters.js
@@ -0,0 +1,12 @@
+const adapters = require('@leancloud/runtime-adapters-node');
+const getUA = require('../ua');
+const comments = (process.env.CLIENT_PLATFORM
+  ? [process.env.CLIENT_PLATFORM]
+  : []
+).concat(require('../ua/comments'));
+
+module.exports = AV => {
+  AV.setAdapters(adapters);
+  AV._sharedConfig.userAgent = getUA(comments);
+  return AV;
+};
diff --git a/src/entry/use-live-query.js b/src/entry/use-live-query.js
@@ -0,0 +1,18 @@
+const {
+  Realtime,
+  setAdapters: setRTMAdapters,
+} = require('leancloud-realtime/core');
+const { LiveQueryPlugin } = require('leancloud-realtime-plugin-live-query');
+Realtime.__preRegisteredPlugins = [LiveQueryPlugin];
+
+module.exports = AV => {
+  AV._sharedConfig.liveQueryRealtime = Realtime;
+
+  const { setAdapters } = AV;
+  AV.setAdapters = adapters => {
+    setAdapters(adapters);
+    setRTMAdapters(adapters);
+  };
+
+  return AV;
+};
diff --git a/src/file.js b/src/file.js
@@ -117,13 +117,8 @@ module.exports = function(AV) {
     this._data = data;
     this._uploadHeaders = {};
 
-    if (
-      process.env.CLIENT_PLATFORM === 'ReactNative' ||
-      process.env.CLIENT_PLATFORM === 'Weapp'
-    ) {
-      if (data && data.blob) {
-        this._extName = extname(data.blob.uri);
-      }
+    if (data && data.blob && typeof data.blob.uri === 'string') {
+      this._extName = extname(data.blob.uri);
     }
 
     if (typeof Blob !== 'undefined' && data instanceof Blob) {
diff --git a/src/index-live-query.js b/src/index-live-query.js
diff --git a/src/index.js b/src/index.js
@@ -9,9 +9,6 @@ const _ = require('underscore');
 
 const AV = require('./av');
 
-const adapters = require('@leancloud/runtime-adapters-node');
-AV.setAdapters(adapters);
-
 AV._ = _;
 AV.version = require('./version');
 AV.Promise = require('./promise');
diff --git a/src/init.js b/src/init.js
@@ -75,7 +75,7 @@ AV.init = function init(options, ...params) {
   if (!appId) throw new TypeError('appId must be a string');
   if (!appKey) throw new TypeError('appKey must be a string');
   if (process.env.CLIENT_PLATFORM && masterKey)
-    console.warn('MasterKey is not supposed to be used in browser.');
+    console.warn('MasterKey is not supposed to be used at client side.');
   if (isCNApp(appId)) {
     if (!serverURLs && isEmpty(AV._config.serverURLs)) {
       throw new TypeError(
@@ -86,8 +86,7 @@ AV.init = function init(options, ...params) {
   AV._config.applicationId = appId;
   AV._config.applicationKey = appKey;
   AV._config.masterKey = masterKey;
-  if (!process.env.CLIENT_PLATFORM)
-    AV._config.hookKey = hookKey || process.env.LEANCLOUD_APP_HOOK_KEY;
+  AV._config.hookKey = hookKey;
   AV.setProduction(production);
   if (typeof disableCurrentUser !== 'undefined')
     AV._config.disableCurrentUser = disableCurrentUser;
diff --git a/src/object.js b/src/object.js
@@ -1349,11 +1349,11 @@ module.exports = function(AV) {
             hookName
           )
         ) {
-          console.trace('Unsupported hookName: ' + hookName);
+          throw new Error('Unsupported hookName: ' + hookName);
         }
 
         if (!AV.hookKey) {
-          console.trace('ignoreHook required hookKey');
+          throw new Error('ignoreHook required hookKey');
         }
 
         if (!this._flags.__ignore_hooks) {
diff --git a/src/ua/index.js b/src/ua/index.js
@@ -1,6 +1,9 @@
 const version = require('../version');
-const comments = [process.env.CLIENT_PLATFORM || 'Node.js'].concat(
-  require('./comments')
-);
-
-module.exports = `LeanCloud-JS-SDK/${version} (${comments.join('; ')})`;
+const getUA = (comments = []) => {
+  let ua = `LeanCloud-JS-SDK/${version}`;
+  if (comments.length) {
+    ua += ` (${comments.join('; ')})`;
+  }
+  return ua;
+};
+module.exports = getUA;
diff --git a/test/test.js b/test/test.js
@@ -3,7 +3,7 @@ if (typeof process === 'undefined') process = { env: {} };
 if (typeof require !== 'undefined') {
   global.debug = require('debug')('test');
   global.expect = require('expect.js');
-  global.AV = require('../src');
+  global.AV = require('../src/entry');
 }
 
 // AV.init({
diff --git a/webpack/common.js b/webpack/common.js
@@ -2,8 +2,8 @@ const path = require('path');
 const webpack = require('webpack');
 
 const entry = (exports.entry = process.env.LIVE_QUERY
-  ? './src/index-live-query.js'
-  : './src/index.js');
+  ? './src/entry/index-live-query.js'
+  : './src/entry/index.js');
 exports.name = process.env.LIVE_QUERY ? 'av-live-query' : 'av';
 
 exports.create = () => ({
diff --git a/webpack/rn.js b/webpack/rn.js

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+module.exports = require('./dist/cjs/entry/core-live-query');`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-module.exports = require('./dist/node/index-live-query');`
	`1`	`+module.exports = require('./dist/cjs/entry/index-live-query');`