Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit92196d0

Browse files
committed
no logging by default and bumped dependencies
1 parentde8282d commit92196d0

File tree

8 files changed

+3374
-35
lines changed

8 files changed

+3374
-35
lines changed

‎.babelrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"presets": ["react","es2015","stage-0"],
2+
"presets": ["latest","stage-2"],
33
"plugins": ["transform-runtime"]
44
}

‎package.json‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@
99
"doc"
1010
],
1111
"scripts": {
12-
"link-dev":"npm link ../redux-addons ../redux-blueprint ../redux-middleware ../redux-mux",
1312
"start":"babel src/lib -d lib --watch",
1413
"prebuild":"rimraf build",
15-
"build":"babel src/lib -d lib",
14+
"build":"babel src/lib -d lib --ignore __tests__,__mocks__",
1615
"predoc":"rimraf doc",
1716
"doc":"esdoc -c ./esdoc.json",
1817
"prerelease":"npm run build",
@@ -21,8 +20,7 @@
2120
"prerelease-doc":"npm run doc",
2221
"release-doc":"git subtree push --prefix doc origin gh-pages",
2322
"postrelease-doc":"git commit -am\"doc-release\" && git push --follow-tags",
24-
"upgrade":"ncu -a && npm update",
25-
"test":"echo\"Error: no test specified\" && exit 1"
23+
"test":"jest"
2624
},
2725
"repository": {
2826
"type":"git",
@@ -35,26 +33,23 @@
3533
"monitor"
3634
],
3735
"dependencies": {
38-
"babel-plugin-transform-decorators-legacy":"^1.3.4",
3936
"chai":"^3.5.0",
40-
"localsync":"latest",
37+
"localsync":"^1.1.8",
4138
"redux":"^3.5.2",
4239
"redux-actions":"^0.9.1",
43-
"redux-addons":"*",
4440
"redux-blueprint":"*",
4541
"redux-middleware":"*",
46-
"redux-mux":"*",
47-
"regenerator-runtime":"^0.9.5"
42+
"redux-mux":"*"
4843
},
4944
"devDependencies": {
50-
"babel-cli":"^6.6.5",
51-
"babel-plugin-transform-runtime":"^6.12.0",
52-
"babel-preset-es2015":"^6.6.0",
53-
"babel-preset-react":"^6.5.0",
54-
"babel-preset-stage-0":"^6.5.0",
45+
"babel-cli":"latest",
46+
"babel-plugin-transform-runtime":"latest",
47+
"babel-preset-latest":"latest",
48+
"babel-preset-stage-2":"latest",
5549
"esdoc":"^0.4.6",
5650
"esdoc-es7-plugin":"0.0.3",
57-
"rimraf":"^2.5.2"
51+
"jest":"latest",
52+
"rimraf":"latest"
5853
},
5954
"author":"Cole Chamberlain <cole.chamberlain@gmail.com> (https://github.com/cchamberlain)",
6055
"license":"MIT",

‎src/lib/actions.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import { IS_DEV, IDLESTATUS_ACTIVE, USER_ACTIVE, NEXT_IDLE_STATUS, RESET_IDLE_ST
33
importlocalsyncfrom'localsync'
44
constshould=require('chai').should()
55

6-
constSTOP_TYPES=['pointermove','MSPointerMove']
7-
constFILTER_TYPES=['mousemove']
6+
constSTOP_TYPES=['pointermove','MSPointerMove']
7+
constFILTER_TYPES=['mousemove']
88

99
constisBrowser=()=>typeofwindow==='object'
1010

‎src/lib/blueprints.js‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,4 @@ export const nextIdleStatusBlueprint = createBlueprint(NEXT_IDLE_STATUS_BLUEPRIN
1717
return{ nextIdleStatus}
1818
})
1919

20-
exportconstlastIdleStatusBlueprint=createBlueprint(LAST_IDLE_STATUS_BLUEPRINT)//, lastIdleStatus => {
21-
/*
22-
assert.ok(lastIdleStatus, 'lastIdleStatus must be defined')
23-
return { lastIdleStatus }
24-
*/
25-
//})
20+
exportconstlastIdleStatusBlueprint=createBlueprint(LAST_IDLE_STATUS_BLUEPRINT)

‎src/lib/context.js‎

Lines changed: 80 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
import{assert}from'chai'
22
import{ROOT_STATE_KEY,ACTION_PREFIX,IDLESTATUS_ACTIVE}from'./constants'
33
import{getActiveEvents,getUseFastState,getUseLocalState,getUseWebRTCState,getUseWebSocketsState,getThresholds,getLevel}from'./defaults'
4-
5-
importconfigureContextfrom'redux-addons/lib/context'
6-
import{createLogger}from'redux-addons/lib/log'
7-
constnoop=()=>{}
4+
import{translateBlueprintsWith,translateBlueprintTypesWith}from'redux-blueprint'
85

96
constvalidateContext=(libContext,appContext)=>{
107
assert.ok(libContext,'must pass opts to validate')
@@ -55,3 +52,82 @@ export default function createContext({ appName
5552
constappOpts={ appName,IDLE_STATUSES, idleStatusDelay, activeStatusAction, idleStatusAction, activeEvents, useFastStore, useLocalStore, useWebRTCState, useWebSocketsState, thresholds, level}
5653
returnconfigureContext(libOpts)(appOpts)
5754
}
55+
56+
constcleanActionName=name=>name.toUpperCase().replace(/-+\s+/,'_')
57+
58+
/** Validates library creators options */
59+
constvalidateLibOpts=libOptsRaw=>{
60+
assert.ok(libOptsRaw,'libOpts definition is required')
61+
const{ libName, validateContext, configureAppContext, configureInitialState}=libOptsRaw
62+
assert(typeoflibName==='string','libName must be a string')
63+
assert(libName.length>0,'libName must not be empty')
64+
65+
assert.ok(validateContext,'validateContext must exist')
66+
assert(typeofvalidateContext==='function','validateContext must be a function')
67+
68+
assert.ok(configureAppContext,'configureAppContext must exist')
69+
assert(typeofconfigureAppContext==='function','configureAppContext must be a function')
70+
71+
assert.ok(configureInitialState,'configureInitialState must exist')
72+
assert(typeofconfigureInitialState==='function','configureInitialState must be a function')
73+
}
74+
75+
/** Validates library consumers options */
76+
constvalidateAppOpts=appOptsRaw=>{
77+
assert.ok(appOptsRaw,'appOpts are required')
78+
const{ appName}=appOptsRaw
79+
80+
assert(typeofappName==='string','appName opt must be a string')
81+
assert(appName.length>0,'appName opt must not be empty')
82+
}
83+
84+
functionconfigureContext(libOpts){
85+
constisDev=process.env.NODE_ENV!=='production'
86+
if(isDev)validateLibOpts(libOpts)
87+
const{ libName, validateContext, configureAppContext, configureInitialState}=libOpts
88+
returnappOpts=>{
89+
if(isDev)validateAppOpts(appOpts)
90+
const{ appName, level}=appOpts
91+
92+
consttranslateBlueprintType=blueprintType=>`${cleanActionName(libName)}_${cleanActionName(appName)}_${cleanActionName(blueprintType)}`
93+
consttranslateBlueprintTypes=translateBlueprintTypesWith(translateBlueprintType)
94+
consttranslateBlueprints=translateBlueprintsWith(translateBlueprintType)
95+
96+
constlibContext={log:createLogger({ libName, level})
97+
, libName
98+
, appName
99+
, translateBlueprintTypes
100+
, translateBlueprints
101+
}
102+
103+
constappContext=configureAppContext(libContext)(appOpts)
104+
if(isDev)validateContext(libContext,appContext)
105+
106+
returnObject.assign(appContext,libContext,{getinitialState(){returnconfigureInitialState(libContext)(appContext)}
107+
})
108+
}
109+
}
110+
111+
112+
constnoop=()=>{}
113+
114+
functioncreateLogger({ libName, level}){
115+
const_formatMessage=({ level, message, obj})=>{
116+
if(!message&&typeofobj==='string'){
117+
message=obj
118+
obj=noop()
119+
}
120+
return_formatLog(obj ?`${level}: '${message}' =>${JSON.stringify(obj)}` :`${level}: '${message}'`)
121+
}
122+
123+
const_formatLog=message=>`${libName} |${message}`
124+
125+
returnprocess.env.NODE_ENV!=='production' ?(
126+
{trace:(obj,message)=>level==='trace' ?console.trace(_formatMessage({level:'trace', message, obj})):noop()
127+
,debug:(obj,message)=>['trace','debug'].includes(level) ?console.log(_formatMessage({level:'debug', message, obj})) :noop()
128+
,info:(obj,message)=>['trace','debug','info'].includes(level) ?console.info(_formatMessage({level:'info', message, obj})) :noop()
129+
,warn:(obj,message)=>['trace','debug','info','warn'].includes(level) ?console.warn(_formatMessage({level:'warn', message, obj})) :noop()
130+
,error:(obj,message)=>['trace','debug','info','warn','error'].includes(level) ?console.error(_formatMessage({level:'error', message, obj})) :noop()
131+
}
132+
) :({trace:noop,debug:noop,info:noop,warn:noop,error:noop})
133+
}

‎src/lib/defaults.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ export const getUseWebSocketsState = () => true
99

1010
exportconstgetThresholds=({ mouse=20, phaseOffMS=2000, phaseOnMS=0}={})=>({ mouse, phaseOffMS, phaseOnMS})
1111

12-
exportconstgetLevel=()=>'info'
12+
exportconstgetLevel=()=>'error'

‎src/lib/middleware.js‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export const createMiddleware = context => {
3131
})
3232

3333

34-
constidleStatuses=[IDLESTATUS_ACTIVE, ...IDLE_STATUSES]
34+
constidleStatuses=[IDLESTATUS_ACTIVE, ...IDLE_STATUSES]
3535
constgetNextIdleStatus=getNextIdleStatusIn(idleStatuses)
3636
constIDLESTATUS_FIRST=getNextIdleStatus(IDLESTATUS_ACTIVE)
3737
constIDLESTATUS_LAST=IDLE_STATUSES.slice(-1)[0]
@@ -64,21 +64,17 @@ export const createMiddleware = context => {
6464
letnextMessage=`${NEXT_IDLE_STATUS} action continuing after${delay} MS delay, lastActive:${newDate().toTimeString()}`
6565
letnextCancelMessage=cancelledAt=>`${NEXT_IDLE_STATUS} action cancelled before${delay} MS delay by dispatcher, lastActive:${newDate().toTimeString()}, cancelledAt:${cancelledAt}`
6666
letnextIdleStatus=getNextIdleStatus(idleStatus)
67-
//log.trace(`Scheduling next idle status '${idleStatus}' in ${delay} MS, then '${nextIdleStatus}'`)
6867
nextTimeoutID=setTimeout(()=>{
69-
//log.trace(nextMessage)
7068
next(action)
7169
dispatch(idleStatusAction(idleStatus))
7270
if(nextIdleStatus){
7371
dispatch(nextIdleStatusAction(nextIdleStatus))
7472
}else{
75-
//log.info('No more actions to schedule, setting local state to idle')
7673
localSync.trigger(false)
7774
}
7875
},delay)
7976
returnfunctioncancel(){
8077
clearTimeout(nextTimeoutID)
81-
//log.trace(nextCancelMessage(new Date().toTimeString()))
8278
}
8379
}
8480

@@ -128,7 +124,6 @@ export const createMiddleware = context => {
128124
localSync.trigger(true)
129125
}
130126
if(payload.isTransition){
131-
//log.trace('Transition activity occurred, triggering user active action.')
132127
dispatch(activeStatusAction)
133128
}
134129
dispatch(nextIdleStatusAction(IDLESTATUS_FIRST))

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp