Skip to content

Commit

Permalink
Merge pull request #710 from cozy/deps
Browse files Browse the repository at this point in the history
  • Loading branch information
ptbrowne authored Nov 4, 2020
2 parents d59098b + 69dda76 commit 8f0c4d7
Show file tree
Hide file tree
Showing 9 changed files with 64 additions and 487 deletions.
6 changes: 1 addition & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,7 @@ cache:
directories:
- node_modules
script:
- yarn lint
- yarn build
- yarn shasum
- yarn test
- yarn bundlesize
- ./scripts/travis.sh
before_deploy:
- touch .npmignore
deploy:
Expand Down
2 changes: 1 addition & 1 deletion examples/logs.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import minilog from 'minilog'
import minilog from '@cozy/minilog'

window.minilog = minilog
22 changes: 10 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
"description": "cozy-bar.js library, a small lib provided by cozy-stack to inject the Cozy-bar component into each app",
"main": "dist/cozy-bar.js",
"author": "Cozy Cloud <[email protected]> (https://cozy.io/)",
"files": [
"dist",
"src",
"transpiled"
],
"repository": {
"type": "git",
"url": "https://github.com/cozy/cozy-bar.git"
Expand Down Expand Up @@ -36,6 +41,7 @@
"@babel/core": "7.6.2",
"@babel/polyfill": "^7.10.4",
"@material-ui/core": "3.9.4",
"@svgr/cli": "5.4.0",
"@testing-library/react": "^10.2.1",
"autoprefixer": "9.6.0",
"babel-jest": "24.9.0",
Expand All @@ -55,10 +61,7 @@
"enzyme": "3.10.0",
"enzyme-adapter-react-16": "1.3",
"enzyme-to-json": "3.3.5",
"eslint": "4.19.1",
"eslint-config-cozy-app": "1.3.3",
"eslint-plugin-prettier": "3.1.0",
"eslint-plugin-react": "7.16.0",
"eslint-config-cozy-app": "2.0.0",
"file-loader": "2.0.0",
"foreman": "3.0.1",
"identity-obj-proxy": "3.0.0",
Expand Down Expand Up @@ -87,24 +90,19 @@
"webpack": "4.39.2",
"webpack-bundle-analyzer": "3.5.0",
"webpack-cli": "3.3.9",
"webpack-merge": "4.2.2",
"yaml-jest": "1.0.5"
"webpack-merge": "4.2.2"
},
"dependencies": {
"@svgr/cli": "5.4.0",
"@cozy/minilog": "^1.0.0",
"cozy-client": "13.8.3",
"cozy-device-helper": "1.8.0",
"cozy-flags": "2.4.1",
"cozy-interapp": "0.4.9",
"cozy-realtime": "3.2.1",
"cozy-ui": "40.1.0",
"hammerjs": "2.0.8",
"lerna-changelog": "0.8.2",
"localforage": "1.7.3",
"lodash.debounce": "4.0.8",
"lodash.unionwith": "4.6.0",
"minilog": "https://github.com/cozy/minilog.git#master",
"piwik-react-router": "0.12.1",
"prop-types": "15.7.2",
"react-autosuggest": "9.4.3",
"react-redux": "5.1.1",
Expand All @@ -130,6 +128,7 @@
"styl",
"yaml"
],
"modulePathIgnorePatterns": ["<rootDir>/transpiled/"],
"setupFiles": [
"<rootDir>/test/jestLib/setup.js"
],
Expand All @@ -138,7 +137,6 @@
"src"
],
"transform": {
"\\.yaml$": "yaml-jest",
"\\.(js|jsx)$": "babel-jest"
},
"moduleNameMapper": {
Expand Down
11 changes: 11 additions & 0 deletions scripts/travis.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/usr/bin/env bash

set -euxo pipefail

yarn lint
yarn test
yarn transpile
yarn build
yarn shasum
yarn test
yarn bundlesize
2 changes: 1 addition & 1 deletion src/components/Settings/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ let hasAnOffer = undefined
let isFremiumFixed = undefined
if (models) {
instanceModel = models.instance
//TODO fallback from cozy-client
// TODO fallback from cozy-client
isFremiumFixed = data => {
const GB = 1000 * 1000 * 1000
const PREMIUM_QUOTA = 50 * GB
Expand Down
2 changes: 1 addition & 1 deletion src/lib/api/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ export const createBarAPI = store => {
// setBar{Left,Right,Center} and <Bar{Left,Right,Center} />
const methods = {}
locations.forEach(location => {
/// expose JS API
// expose JS API
methods[getJsApiName(location)] = value =>
store.dispatch(setContent(location, wrapInElement(value), 'js'))

Expand Down
2 changes: 1 addition & 1 deletion src/lib/logger.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import flag from 'cozy-flags'
import _minilog from 'minilog'
import _minilog from '@cozy/minilog'

const minilog = window.minilog || _minilog
const logger = minilog('cozy-bar')
Expand Down
4 changes: 2 additions & 2 deletions src/lib/reducers/apps.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ export const setDefaultApp = appsList => async dispatch => {
context.data.attributes &&
context.data.attributes.default_redirection
let homeApp = null
//self hosted cozy has no context by default
//so let's use hardcoded home slug if needed
// self hosted cozy has no context by default
// so let's use hardcoded home slug if needed
if (!defaultRedirection) {
const HOME_APP_SLUG = 'home'
homeApp = findAppInArray(HOME_APP_SLUG, appsList)
Expand Down
Loading

0 comments on commit 8f0c4d7

Please sign in to comment.