Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Update cozy-ui from 93.1.1 to 100.0.0 #12

Merged
merged 18 commits into from
Dec 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
146 changes: 0 additions & 146 deletions .bundlemonrc

This file was deleted.

2 changes: 0 additions & 2 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
node_modules/**
src/authentication/node_modules/**
src/authentication/build/**
src/drive/targets/mobile/**
!src/drive/targets/mobile/InitAppMobile.*
19 changes: 0 additions & 19 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,25 +34,6 @@ desktop.ini
.flooignore
.brackets.json

# Mobile
src/drive/targets/mobile/hooks
src/drive/targets/mobile/ul_web_hooks
src/drive/targets/mobile/platforms
src/drive/targets/mobile/plugins
src/drive/targets/mobile/www
src/drive/targets/mobile/keys
src/drive/targets/mobile/res/icons
src/drive/targets/mobile/res/screens
src/drive/targets/mobile/icon.png
src/drive/targets/mobile/store

# fastlane
src/drive/targets/mobile/fastlane/README.md
src/drive/targets/mobile/fastlane/report.xml
src/drive/targets/mobile/fastlane/Error*.png
src/drive/targets/mobile/fastlane/Preview.html
src/drive/targets/mobilePreview.html

# testcafe data
testcafe/data/FILES TO TEST

Expand Down
20 changes: 10 additions & 10 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
How to contribute to Cozy Drive?
How to contribute to Cozy Photos?
====================================

Thank you for your interest in contributing to Cozy! There are many ways to contribute, and we appreciate all of them.
Expand All @@ -23,7 +23,7 @@ Opening an issue is as easy as following [this link][issues] and filling out the
- What did you try, step by step?
- What did you expect?
- What did happen instead?
- What is the version of the Cozy Drive?
- What is the version of the Cozy Photos?


Pull Requests
Expand All @@ -48,9 +48,9 @@ Pull requests are the primary mechanism we use to change Cozy. GitHub itself has
Fork the project on GitHub and [check out your copy locally][forking].

```
$ git clone github.com/cozy/cozy-drive.git
$ cd cozy-drive
$ git remote add fork git://github.com/yourusername/cozy-drive.git
$ git clone github.com/cozy/cozy-photos.git
$ cd cozy-photos
$ git remote add fork git://github.com/yourusername/cozy-photos.git
```

#### Step 2: Branch
Expand All @@ -70,7 +70,7 @@ Well, we think you know how to do that. Just be sure to follow the coding guidel
Don't forget to add tests and be sure they are green:

```
$ cd cozy-drive
$ cd cozy-photos
$ npm run test
```

Expand All @@ -93,7 +93,7 @@ $ git rebase origin/master my-branch
$ git push -u fork my-branch
```

Go to https://github.com/yourusername/cozy-drive and select your branch. Click the 'Pull Request' button and fill out the form.
Go to https://github.com/yourusername/cozy-photos and select your branch. Click the 'Pull Request' button and fill out the form.

Alternatively, you can use [hub] to open the pull request from your terminal:

Expand All @@ -113,7 +113,7 @@ Documentation improvements are very welcome. We try to keep a good documentation
Translations
------------

The Cozy Drive is translated on a platform called [Transifex][tx]. [This tutorial][tx-start] can help you to learn how to make your first steps here. If you have any question, don't hesitate to ask us!
The Cozy Photos is translated on a platform called [Transifex][tx]. [This tutorial][tx-start] can help you to learn how to make your first steps here. If you have any question, don't hesitate to ask us!


Community
Expand All @@ -123,12 +123,12 @@ You can help us by making our community even more vibrant. For example, you can



[issues]: https://github.com/cozy/cozy-drive/issues/new
[issues]: https://github.com/cozy/cozy-photos/issues/new
[pr]: https://help.github.com/categories/collaborating-with-issues-and-pull-requests/
[forking]: http://blog.campoy.cat/2014/03/github-and-go-forking-pull-requests-and.html
[stdjs]: http://standardjs.com/
[commitmsg]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
[localization]: https://github.com/cozy/cozy-drive/blob/master/README.md#localization
[localization]: https://github.com/cozy/cozy-photos/blob/master/README.md#localization
[hub]: https://hub.github.com/
[tx]: https://www.transifex.com/cozy/
[tx-start]: https://help.transifex.com/en/articles/6248698-getting-started-as-a-translator
Expand Down
22 changes: 2 additions & 20 deletions app.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
const path = require('path')
const { DefinePlugin } = require('webpack')
const { target } = require('cozy-scripts/config/webpack.vars')
const pkg = require(path.resolve(__dirname, './package.json'))

const SRC_DIR = path.resolve(__dirname, './src')
Expand All @@ -14,20 +13,7 @@ configurationFiles.push(
require('cozy-scripts/config/webpack.config.css-modules')
)

const isDrive = process.env.COZY_APP_SLUG === 'drive'
const isPhotos = process.env.COZY_APP_SLUG === 'photos'

if (isDrive) configurationFiles.push(require('./webpack/drive.config.js'))

if (isDrive && target === 'browser') {
configurationFiles.push(require('./webpack/assets.config.js'))
}

if (isDrive && target === 'mobile')
configurationFiles.push(require('./webpack/mobile.config.js'))

if (target !== 'mobile')
configurationFiles.push(require('./webpack/appicon.config.js'))
configurationFiles.push(require('./webpack/appicon.config.js'))

const extraConfig = {
module: {
Expand Down Expand Up @@ -65,11 +51,7 @@ const extraConfig = {
}
configurationFiles.push(extraConfig)

if (
isPhotos &&
configurationFiles[0].multiple &&
configurationFiles[0].multiple.services
) {
if (configurationFiles[0].multiple && configurationFiles[0].multiple.services) {
// FIXME: Will be handled correctly by next major version of cozy-scripts
configurationFiles[0].multiple.services.__mergeStrategy.strategy[
'resolve.modules'
Expand Down
4 changes: 1 addition & 3 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ module.exports = {
'.svg$': '<rootDir>/jestHelpers/mocks/iconMock.js',
'.styl$': 'identity-obj-proxy',
'\\.(css|less)$': 'identity-obj-proxy',
'^drive/locales/.*': '<rootDir>/src/drive/locales/en.json',
'^photos/locales/.*': '<rootDir>/src/photos/locales/en.json',
'^drive/(.*)': '<rootDir>/src/drive/$1',
'^models(.*)': '<rootDir>/src/models$1',
'^photos/(.*)': '<rootDir>/src/photos/$1',
'^sharing(.*)': '<rootDir>/src/sharing$1',
Expand Down Expand Up @@ -44,7 +42,7 @@ module.exports = {
},
testMatch: ['**/(*.)(spec|test).[jt]s?(x)'],
globals: {
__APP_SLUG__: 'drive',
__APP_SLUG__: 'photos',
__TARGET__: 'browser',
__DEVELOPMENT__: true
},
Expand Down
1 change: 0 additions & 1 deletion jsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"baseUrl": ".",
"paths": {
"components/*": ["src/components/*"],
"drive/*": ["src/drive/*"],
"test/*": ["test/*"],
"lib/*": ["src/lib/*"],
"photos/*": ["src/photos/*"],
Expand Down
13 changes: 6 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,14 @@
"version": "1.64.0",
"main": "src/main.jsx",
"scripts": {
"build": "COZY_APP_SLUG=photos cozy-scripts build --manifest src/photos/targets/manifest.webapp --build-dir build/photos --src-dir src/photos --barV7 false --cozyClientJs",
"watch": "COZY_APP_SLUG=photos cozy-scripts watch --manifest src/photos/targets/manifest.webapp --build-dir build/photos --src-dir src/photos --barV7 false --cozyClientJs",
"start": "COZY_APP_SLUG=photos cozy-scripts start --manifest src/photos/targets/manifest.webapp --build-dir build/photos --src-dir src/photos --barV7 false --cozyClientJs",
"build": "cozy-scripts build --manifest src/photos/targets/manifest.webapp --build-dir build/photos --src-dir src/photos --barV7 false --cozyClientJs",
"watch": "cozy-scripts watch --manifest src/photos/targets/manifest.webapp --build-dir build/photos --src-dir src/photos --barV7 false --cozyClientJs",
"start": "cozy-scripts start --manifest src/photos/targets/manifest.webapp --build-dir build/photos --src-dir src/photos --barV7 false --cozyClientJs",
"deploy": "cozy-app-publish --token $REGISTRY_TOKEN --build-dir 'build/photos/' --prepublish downcloud --postpublish mattermost",
"tx": "tx pull --all || true",
"lint": "npm-run-all --parallel 'lint:*'",
"lint:styles": "stylint src --config ./node_modules/cozy-scripts/config/.stylintrc",
"lint:js": "eslint '{src,test}/**/*.{js,jsx}'",
"testcafe:drive": "node testcafe/runner-drive.js",
"testcafe:photos": "node testcafe/runner-photos.js",
"test": "env NODE_ENV='test' jest",
"version": "yarn version:photos",
Expand Down Expand Up @@ -86,7 +85,7 @@
"cozy-authentication": "2.10.10",
"cozy-bar": "10.0.0",
"cozy-ci": "0.5.2",
"cozy-client": "^44.0.0",
"cozy-client": "^45.1.0",
"cozy-client-js": "0.20.0",
"cozy-device-helper": "^2.5.0",
"cozy-doctypes": "1.85.4",
Expand All @@ -100,8 +99,8 @@
"cozy-scanner": "^7.0.0",
"cozy-scripts": "^8.1.0",
"cozy-sharing": "10.0.0",
"cozy-stack-client": "^44.0.0",
"cozy-ui": "93.1.1",
"cozy-stack-client": "^45.0.1",
"cozy-ui": "100.0.0",
"date-fns": "1.30.1",
"diacritics": "1.3.0",
"fastclick": "1.0.6",
Expand Down
Loading
Loading