refactor: refactor redux-middleware and change directory name

Author: xinyao27

packages/browser/index.js

@@ -0,0 +1,7 @@
+'use strict'
+
+if (process.env.NODE_ENV === 'production') {
+  module.exports = require('./dist/ohbug-browser.cjs.prod.js')
+} else {
+  module.exports = require('./dist/ohbug-browser.cjs.js')
+}

packages/core/index.js

@@ -13,8 +13,8 @@
   },
   "license": "Apache-2.0",
   "main": "index.js",
-  "module": "dist/browser.esm.js",
-  "unpkg": "dist/browser.global.js",
+  "module": "dist/ohbug-browser.esm.js",
+  "unpkg": "dist/ohbug-browser.global.js",
   "types": "dist/index.d.ts",
   "files": [
     "index.js",

packages/browser/LICENSE renamed to packages/ohbug-browser/LICENSE

@@ -0,0 +1,7 @@
+'use strict'
+
+if (process.env.NODE_ENV === 'production') {
+  module.exports = require('./dist/ohbug-core.cjs.prod.js')
+} else {
+  module.exports = require('./dist/ohbug-core.cjs.js')
+}

packages/browser/README-zh_CN.md renamed to packages/ohbug-browser/README-zh_CN.md

@@ -13,8 +13,8 @@
   },
   "license": "Apache-2.0",
   "main": "index.js",
-  "module": "dist/core.esm.js",
-  "unpkg": "dist/core.global.js",
+  "module": "dist/ohbug-core.esm.js",
+  "unpkg": "dist/ohbug-core.global.js",
   "types": "dist/index.d.ts",
   "files": [
     "index.js",

packages/browser/README.md renamed to packages/ohbug-browser/README.md

@@ -1,11 +1,10 @@
 import { createStore, applyMiddleware } from 'redux'
 import type { Action } from 'redux'
-import { init as initBrowser } from '@ohbug/browser'
-import { getHub } from '@ohbug/core'
-import createOhbugMiddleware from '../src'
+import Ohbug from '@ohbug/browser'
 
-const apiKey = 'test_id'
-const config = { apiKey }
+import { createOhbugMiddleware } from '../src/middleware'
+
+const apiKey = 'API_KEY_TEST'
 
 const defaultState = 0
 function counter(state = defaultState, action: Action) {
@@ -20,19 +19,15 @@ function counter(state = defaultState, action: Action) {
 }
 
 describe('redux-middleware', () => {
-  beforeAll(() => {
-    initBrowser(config)
-  })
-
   it('should works', () => {
+    const client = Ohbug.init({ apiKey })
     const store = createStore(counter, applyMiddleware(createOhbugMiddleware()))
 
     store.dispatch({ type: 'INCREMENT' })
     store.dispatch({ type: 'INCREMENT' })
     store.dispatch({ type: 'DECREMENT' })
 
-    const hub = getHub<Window>()
-    const actions = hub.getActions()
+    const actions = client._actions
 
     expect(store.getState()).toBe(1)
     expect(actions.length).toBe(3)
@@ -45,12 +40,12 @@ describe('redux-middleware', () => {
         type: `[ohbug] ${action.type}`,
       }
     }
+    const client = Ohbug.init({ apiKey })
     const store = createStore(counter, applyMiddleware(createOhbugMiddleware(before)))
 
     store.dispatch({ type: 'INCREMENT' })
 
-    const hub = getHub<Window>()
-    const actions = hub.getActions()
+    const actions = client._actions
 
     expect(store.getState()).toBe(1)
     expect(actions[actions.length - 1]?.data?.type).toBe('[ohbug] INCREMENT')
@@ -60,14 +55,14 @@ describe('redux-middleware', () => {
     function before(): false {
       return false
     }
+    const client = Ohbug.init({ apiKey })
     const store = createStore(counter, applyMiddleware(createOhbugMiddleware(before)))
 
-    const hub = getHub<Window>()
-    const _beforeLength = hub.getActions().length
+    const _beforeLength = client._actions.length
 
     store.dispatch({ type: 'INCREMENT' })
 
-    const _afterLength = hub.getActions().length
+    const _afterLength = client._actions.length
 
     expect(store.getState()).toBe(1)
     expect(_beforeLength).toBe(_afterLength)

packages/browser/__tests__/client.test.ts renamed to packages/ohbug-browser/__tests__/client.test.ts

@@ -0,0 +1,7 @@
+'use strict'
+
+if (process.env.NODE_ENV === 'production') {
+  module.exports = require('./dist/ohbug-redux-middleware.cjs.prod.js')
+} else {
+  module.exports = require('./dist/ohbug-redux-middleware.cjs.js')
+}

packages/browser/__tests__/notifier.test.ts renamed to packages/ohbug-browser/__tests__/notifier.test.ts

@@ -13,19 +13,19 @@
   },
   "license": "Apache-2.0",
   "main": "index.js",
-  "module": "dist/redux-middleware.esm.js",
-  "unpkg": "dist/redux-middleware.global.js",
+  "module": "dist/ohbug-redux-middleware.esm.js",
+  "unpkg": "dist/ohbug-redux-middleware.global.js",
   "types": "dist/index.d.ts",
   "files": [
     "index.js",
     "dist"
   ],
+  "dependencies": {
+    "@ohbug/utils": "^0.0.11"
+  },
   "devDependencies": {
     "redux": "^4.0.5"
   },
-  "peerDependencies": {
-    "@ohbug/core": "^0.0.7"
-  },
   "buildOptions": {
     "name": "OhbugReduxMiddleware",
     "formats": [

packages/ohbug-browser/index.js

@@ -0,0 +1 @@
+export { createOhbugMiddleware as default } from './middleware'

packages/browser/package.json renamed to packages/ohbug-browser/package.json

@@ -0,0 +1,20 @@
+import { getOhbugObject, error } from '@ohbug/utils'
+import type { Middleware, Action, MiddlewareAPI } from 'redux'
+
+const identity = (action: Action, _: MiddlewareAPI) => action
+
+type CreateOhbugMiddlewareOption = (action: Action, store: MiddlewareAPI) => Action | false
+export const createOhbugMiddleware = (
+  before: CreateOhbugMiddlewareOption = identity
+): Middleware => (store) => (next) => (action) => {
+  const data = before(action, store)
+
+  if (data) {
+    const ohbugObject = getOhbugObject<Window>()
+    error(Boolean(ohbugObject), '`Ohbug.init` is not running yet!')
+
+    ohbugObject.client.addAction('dispatch a redux action', data, 'redux-action')
+  }
+
+  return next(action)
+}

packages/browser/src/capture/action/captureClick.ts renamed to packages/ohbug-browser/src/capture/action/captureClick.ts

@@ -14,7 +14,7 @@ describe('utils dom', () => {
     const dom = getDOM()
     const button = dom.querySelector('button') as HTMLButtonElement
     let selector
-    button.addEventListener('click', e => {
+    button.addEventListener('click', (e) => {
       selector = getSelector(e)
     })
     userEvent.click(button)

packages/browser/src/capture/action/captureUrlChange.ts renamed to packages/ohbug-browser/src/capture/action/captureUrlChange.ts

@@ -0,0 +1,7 @@
+'use strict'
+
+if (process.env.NODE_ENV === 'production') {
+  module.exports = require('./dist/ohbug-utils.cjs.prod.js')
+} else {
+  module.exports = require('./dist/ohbug-utils.cjs.js')
+}

packages/browser/src/capture/console/captureConsole.ts renamed to packages/ohbug-browser/src/capture/console/captureConsole.ts

@@ -13,8 +13,8 @@
   },
   "license": "Apache-2.0",
   "main": "index.js",
-  "module": "dist/utils.esm.js",
-  "unpkg": "dist/utils.global.js",
+  "module": "dist/ohbug-utils.esm.js",
+  "unpkg": "dist/ohbug-utils.global.js",
   "types": "dist/index.d.ts",
   "files": [
     "index.js",

packages/browser/src/capture/index.ts renamed to packages/ohbug-browser/src/capture/index.ts

@@ -63,5 +63,5 @@ export const docCookies = {
       (sDomain ? '; domain=' + sDomain : '') +
       (sPath ? '; path=' + sPath : '')
     return true
-  }
+  },
 }

packages/browser/src/capture/network/captureAjaxError.ts renamed to packages/ohbug-browser/src/capture/network/captureAjaxError.ts

@@ -14,6 +14,7 @@ export function getGlobal<T = Window>(): T & OhbugGlobal {
 
 export function getOhbugObject<T = Window>(): OhbugObject {
   const global = getGlobal<T>()
+
   error(Boolean(global.__OHBUG__), 'Failed to get `OhbugObject`, please confirm if `Ohbug.init`')
 
   return global.__OHBUG__

packages/browser/src/capture/network/captureFetchError.ts renamed to packages/ohbug-browser/src/capture/network/captureFetchError.ts

@@ -34,6 +34,6 @@ export function parseUrl(
     host: match[4],
     path: match[5],
     protocol: match[2],
-    relative: match[5] + query + fragment
+    relative: match[5] + query + fragment,
   }
 }

packages/browser/src/capture/network/captureWebSocketError.ts renamed to packages/ohbug-browser/src/capture/network/captureWebSocketError.ts

@@ -30,9 +30,9 @@ export function createCompiler(options: webpack.Configuration = {}) {
           output: {
             path: `${__dirname}/dist`,
             filename: '[name].[chunkhash].js',
-            chunkFilename: '[id].[name].[chunkhash].js'
+            chunkFilename: '[id].[name].[chunkhash].js',
           },
-          ...options
+          ...options,
         }
   )
   return compiler
@@ -57,14 +57,14 @@ export const createTestServer = (): Promise<void> =>
         if (err) return reject(err)
         server = _server
         resolve()
-      }
+      },
     ]
 
     const _server = app.listen.apply(app, args)
   })
 
 export const closeTestServer = () =>
-  new Promise(resolve => {
+  new Promise((resolve) => {
     server &&
       server.close(() => {
         resolve()

packages/browser/src/capture/script/captureUncaughtError.ts renamed to packages/ohbug-browser/src/capture/script/captureUncaughtError.ts

@@ -0,0 +1,7 @@
+'use strict'
+
+if (process.env.NODE_ENV === 'production') {
+  module.exports = require('./dist/ohbug-webpack-plugin.cjs.prod.js')
+} else {
+  module.exports = require('./dist/ohbug-webpack-plugin.cjs.js')
+}

packages/browser/src/capture/script/captureUnhandledrejectionError.ts renamed to packages/ohbug-browser/src/capture/script/captureUnhandledrejectionError.ts

@@ -13,8 +13,8 @@
   },
   "license": "Apache-2.0",
   "main": "index.js",
-  "module": "dist/webpack-plugin.esm.js",
-  "unpkg": "dist/webpack-plugin.global.js",
+  "module": "dist/ohbug-webpack-plugin.esm.js",
+  "unpkg": "dist/ohbug-webpack-plugin.global.js",
   "types": "dist/index.d.ts",
   "files": [
     "index.js",