Migrate to rsbuild

.bundlemonrc

@@ -1,26 +1,67 @@
 {
     "baseDir": "./build",
+    "pathLabels": {
+        "chunkId": "[\\d-]+"
+    },
     "files": [
         {
-            "path": "app/store.<hash>.js"
+            "path": "intent/static/js/<chunkId>.<hash>.js"
         },
         {
-            "path": "app-store.<hash>.min.css"
+            "path": "intent/static/js/cozy.<hash>.js"
         },
         {
-            "path": "vendors-store.<hash>.min.css"
+            "path": "intent/static/js/intents.<hash>.js"
         },
         {
-            "path": "intent-store.<hash>.min.css"
+            "path": "intent/static/js/lib-router.<hash>.js"
         },
         {
-            "path": "intent/store.<hash>.js"
+            "path": "intent/static/js/lib-react.<hash>.js"
         },
         {
-            "path": "services/installSuggestion/store.js"
+            "path": "intent/static/css/cozy.<hash>.css"
         },
         {
-            "path": "vendors/store.<hash>.js"
+            "path": "intent/static/css/intents.<hash>.css"
+        },
+        {
+            "path": "static/js/<chunkId>.<hash>.js"
+        },
+        {
+            "path": "static/js/cozy.<hash>.js"
+        },
+        {
+            "path": "static/js/main.<hash>.js"
+        },
+        {
+            "path": "static/js/lib-react.<hash>.js"
+        },
+        {
+            "path": "static/js/lib-router.<hash>.js"
+        },
+        {
+            "path": "static/css/cozy.<hash>.css"
+        },
+        {
+            "path": "static/css/main.<hash>.css"
+        },
+        {
+            "path": "static/svg/*.<hash>.svg"
+        },
+        {
+            "path": "services/installSuggestion.js"
+        }
+    ],
+    "groups": [
+        {
+            "path": "**/*.js"
+        },
+        {
+            "path": "**/*.css"
+        },
+        {
+            "path": "**/*.{png,svg,ico}"
         }
     ],
     "reportOutput": ["github"]

jest.config.js

@@ -9,7 +9,9 @@ module.exports = {
     // identity-obj-proxy module is installed by cozy-scripts
     '.styl$': 'identity-obj-proxy',
     '\\.(css|less)$': 'identity-obj-proxy',
-    '^cozy-client$': 'cozy-client/dist/index'
+    '^cozy-client$': 'cozy-client/dist/index',
+    'test/(.*)$': '<rootDir>/test/$1',
+    '^@/(.*)$': '<rootDir>/src/$1'
   },
   transformIgnorePatterns: ['node_modules/(?!cozy-ui)'],
   globals: {
@@ -18,5 +20,6 @@ module.exports = {
     __SENTRY_TOKEN__: 'token',
     cozy: {}
   },
-  snapshotSerializers: ['enzyme-to-json/serializer']
+  snapshotSerializers: ['enzyme-to-json/serializer'],
+  testEnvironment: 'jsdom'
 }

manifest.webapp

@@ -3,7 +3,7 @@
   "name_prefix": "Twake",
   "slug": "store",
   "type": "webapp",
-  "icon": "icon.svg",
+  "icon": "assets/icon.svg",
   "editor": "Cozy",
   "description": "The apps store for Twake",
   "categories": [

package.json

@@ -3,18 +3,18 @@
   "version": "1.20.0",
   "main": "src/index.jsx",
   "scripts": {
-    "postinstall": "patch-package",
     "deploy": "env HUSKY_SKIP_HOOKS=1 git-directory-deploy --directory build/ --branch=${DEPLOY_BRANCH:-build} --repo=${DEPLOY_REPOSITORY:-origin}",
     "tx": "tx pull --all",
     "lint": "yarn lint:js && yarn lint:styles",
     "lint:js": "eslint '{src,test}/**/*.{ts,tsx,js,jsx}'",
     "lint:styles": "stylint src/styles --config ./.stylintrc",
     "prebuild": "yarn lint",
-    "build": "cozy-scripts build --barV7 false",
-    "watch": "cozy-scripts watch --barV7 false",
-    "start": "cozy-scripts start --barV7 false",
+    "build": "rsbuild build",
+    "watch": "rsbuild build --watch --mode development",
+    "start": "rsbuild dev",
+    "analyze": "RSDOCTOR=true yarn build",
     "cozyPublish": "cozy-app-publish --token $REGISTRY_TOKEN --prepublish downcloud --postpublish mattermost",
-    "test": "cs test --verbose --coverage",
+    "test": "env NODE_ENV='test' jest",
     "stack:docker": "docker run --rm -it -p 8080:8080 -v \"$(pwd)/build\":/data/cozy-app/app cozy/cozy-app-dev"
   },
   "repository": {
@@ -30,13 +30,14 @@
   "devDependencies": {
     "@babel/eslint-parser": "7.19.1",
     "@babel/polyfill": "^7.12.1",
+    "@rsbuild/core": "^1.3.20",
     "@testing-library/jest-dom": "5.16.5",
     "@testing-library/react": "11.2.7",
     "@typescript-eslint/eslint-plugin": "5.54.0",
     "@typescript-eslint/parser": "5.54.0",
     "babel-preset-cozy-app": "^2.1.0",
     "bundlemon": "3.1.0",
-    "cozy-scripts": "^8.4.0",
+    "cozy-app-publish": "^0.41.0",
     "cozy-tsconfig": "^1.2.0",
     "enzyme": "3.3.0",
     "enzyme-adapter-react-16": "1.15.6",
@@ -52,10 +53,12 @@
     "eslint-plugin-react-hooks": "4.6.0",
     "git-directory-deploy": "1.5.1",
     "identity-obj-proxy": "3.0.0",
+    "jest": "28.1.3",
+    "jest-environment-jsdom": "28.1.3",
     "npm-run-all": "4.1.5",
-    "patch-package": "8.0.0",
     "prettier": "1.19",
     "react-hot-loader": "4.13.1",
+    "rsbuild-config-cozy-app": "^0.5.0",
     "sinon-stub-promise": "4.0.0",
     "stylint": "2.0.0"
   },
@@ -65,7 +68,7 @@
     "@sentry/react": "^8.5.0",
     "cozy-bar": "^22.1.1",
     "cozy-client": "^57.7.2",
-    "cozy-dataproxy-lib": "^4.1.0",
+    "cozy-dataproxy-lib": "^4.5.0",
     "cozy-device-helper": "^3.8.0",
     "cozy-devtools": "^1.3.0",
     "cozy-doctypes": "^1.97.2",

rsbuild.config.mjs

@@ -0,0 +1,9 @@
+import { defineConfig } from '@rsbuild/core'
+import { getRsbuildConfig } from 'rsbuild-config-cozy-app'
+
+const config = getRsbuildConfig({
+  title: 'Twake Store',
+  hasIntents: true
+})
+
+export default defineConfig(config)

src/ducks/AlternativeStore/tests/transformData.spec.ts

@@ -1,6 +1,6 @@
-import AlternativeStoreConfig from 'ducks/AlternativeStore/fixtures/flag.json'
-import { transformData } from 'ducks/AlternativeStore/transformData'
-import { AlternativeShortcut } from 'ducks/AlternativeStore/types'
+import AlternativeStoreConfig from '@/ducks/AlternativeStore/fixtures/flag.json'
+import { transformData } from '@/ducks/AlternativeStore/transformData'
+import { AlternativeShortcut } from '@/ducks/AlternativeStore/types'
 
 describe('transformData', () => {
   test('categorizes files correctly based on metadata category and path', () => {

src/ducks/AlternativeStore/transformData.ts

@@ -1,9 +1,9 @@
 import {
   AlternativeShortcut,
   AlternativeStoreConfig
-} from 'ducks/AlternativeStore/types'
+} from '@/ducks/AlternativeStore/types'
 
 import { IOCozyFile } from 'cozy-client/types/types'
 
 export const transformData = (
   data: IOCozyFile[],

src/ducks/AlternativeStore/useAlternativeStore.ts

@@ -1,10 +1,10 @@
-import { generateI18nConfig } from 'ducks/AlternativeStore/helpers'
-import { transformData } from 'ducks/AlternativeStore/transformData'
+import { generateI18nConfig } from '@/ducks/AlternativeStore/helpers'
+import { transformData } from '@/ducks/AlternativeStore/transformData'
 import {
   AlternativeShortcut,
   AlternativeStoreConfig
-} from 'ducks/AlternativeStore/types'
-import { buildFileByPathsQuery, buildFilesByDirIdsQuery } from 'ducks/queries'
+} from '@/ducks/AlternativeStore/types'
+import { buildFileByPathsQuery, buildFilesByDirIdsQuery } from '@/ducks/queries'
 import { useMemo } from 'react'
 
 import { useQueryAll } from 'cozy-client'

src/ducks/apps/Containers.jsx

@@ -1,11 +1,11 @@
-import DiscoverComponent from 'ducks/apps/components/Discover'
-import MyApplicationsComponent from 'ducks/apps/components/MyApplications'
-import SidebarCategoriesComponent from 'ducks/apps/components/SidebarCategories'
+import DiscoverComponent from '@/ducks/apps/components/Discover'
+import MyApplicationsComponent from '@/ducks/apps/components/MyApplications'
+import SidebarCategoriesComponent from '@/ducks/apps/components/SidebarCategories'
 import { connect } from 'react-redux'
 
 import { translate } from 'cozy-ui/transpiled/react/providers/I18n'
 
 import { getInstalledApps, getRegistryApps } from './index'
 
 const mapStateToProps = state => ({
   apps: getRegistryApps(state),

src/ducks/apps/components/AppInstallation.jsx

@@ -1,11 +1,11 @@
-import storeConfig from 'config'
-import { APP_TYPE, getAppBySlug, installAppFromRegistry } from 'ducks/apps'
-import { hasPendingUpdate, isUnderMaintenance } from 'ducks/apps/appStatus'
-import Partnership from 'ducks/apps/components/Partnership'
-import PermissionsList from 'ducks/apps/components/PermissionsList'
-import ReactMarkdownWrapper from 'ducks/components/ReactMarkdownWrapper'
+import storeConfig from '@/config/index.json'
+import { APP_TYPE, getAppBySlug, installAppFromRegistry } from '@/ducks/apps'
+import { hasPendingUpdate, isUnderMaintenance } from '@/ducks/apps/appStatus'
+import Partnership from '@/ducks/apps/components/Partnership'
+import PermissionsList from '@/ducks/apps/components/PermissionsList'
+import ReactMarkdownWrapper from '@/ducks/components/ReactMarkdownWrapper'
 import FocusTrap from 'focus-trap-react'
-import { getTranslatedManifestProperty } from 'lib/helpers'
+import { getTranslatedManifestProperty } from '@/lib/helpers'
 import compose from 'lodash/flowRight'
 import get from 'lodash/get'
 import pickBy from 'lodash/pickBy'

src/ducks/apps/components/ApplicationPage/Details.jsx

@@ -1,12 +1,12 @@
-import androidIcon from 'assets/icons/platforms/icon-android.svg'
-import iosIcon from 'assets/icons/platforms/icon-ios.svg'
-import { isAppOrKonnectorFile } from 'ducks/AlternativeStore/helpers'
-import { getContext, REGISTRY_CHANNELS } from 'ducks/apps'
-import { isUnderMaintenance } from 'ducks/apps/appStatus'
-import Maintenance from 'ducks/apps/components/ApplicationPage/Maintenance'
-import ReactMarkdownWrapper from 'ducks/components/ReactMarkdownWrapper'
-import getChannel from 'lib/getChannelFromSource'
-import { getTranslatedManifestProperty } from 'lib/helpers'
+import androidIcon from '@/assets/icons/platforms/icon-android.svg'
+import iosIcon from '@/assets/icons/platforms/icon-ios.svg'
+import { isAppOrKonnectorFile } from '@/ducks/AlternativeStore/helpers'
+import { getContext, REGISTRY_CHANNELS } from '@/ducks/apps'
+import { isUnderMaintenance } from '@/ducks/apps/appStatus'
+import Maintenance from '@/ducks/apps/components/ApplicationPage/Maintenance'
+import ReactMarkdownWrapper from '@/ducks/components/ReactMarkdownWrapper'
+import getChannel from '@/lib/getChannelFromSource'
+import { getTranslatedManifestProperty } from '@/lib/helpers'
 import PropTypes from 'prop-types'
 import React, { useState } from 'react'
 import { useLocation, useNavigate } from 'react-router-dom'

src/ducks/apps/components/ApplicationPage/Header.jsx

@@ -1,5 +1,5 @@
-import { isShortcutFile } from 'ducks/AlternativeStore/helpers'
-import { getAppIconProps } from 'ducks/apps'
+import { isShortcutFile } from '@/ducks/AlternativeStore/helpers'
+import { getAppIconProps } from '@/ducks/apps'
 import React from 'react'
 import { connect } from 'react-redux'
 

src/ducks/apps/components/ApplicationPage/HeaderActions.jsx

@@ -1,10 +1,10 @@
-import { APP_TYPE, openApp } from 'ducks/apps'
+import { APP_TYPE, openApp } from '@/ducks/apps'
 import {
   hasPendingUpdate,
   isUnderMaintenance,
   isInstalledAndNothingToReport
-} from 'ducks/apps/appStatus'
-import AsyncButton from 'ducks/components/AsyncButton'
+} from '@/ducks/apps/appStatus'
+import AsyncButton from '@/ducks/components/AsyncButton'
 import React from 'react'
 import { Link, useLocation } from 'react-router-dom'
 

src/ducks/apps/components/ApplicationPage/HeaderShortcutActions.jsx

@@ -1,4 +1,4 @@
-import { buildFileFromPathQuery } from 'ducks/queries'
+import { buildFileFromPathQuery } from '@/ducks/queries'
 import React, { useState } from 'react'
 
 import { useClient, useFetchShortcut } from 'cozy-client'

src/ducks/apps/components/ApplicationPage/Maintenance.jsx

@@ -1,5 +1,5 @@
-import maintenanceIllu from 'assets/illustrations/maintenance.svg'
-import ReactMarkdownWrapper from 'ducks/components/ReactMarkdownWrapper'
+import maintenanceIllu from '@/assets/illustrations/maintenance.svg'
+import ReactMarkdownWrapper from '@/ducks/components/ReactMarkdownWrapper'
 import React from 'react'
 
 import { translate } from 'cozy-ui/transpiled/react/providers/I18n'

src/ducks/apps/components/ApplicationPage/index.jsx

@@ -1,15 +1,15 @@
-import { getAppIconProps } from 'ducks/apps'
-import Details from 'ducks/apps/components/ApplicationPage/Details'
-import Gallery from 'ducks/apps/components/ApplicationPage/Gallery'
-import Header from 'ducks/apps/components/ApplicationPage/Header'
-import ApplicationPageLoading from 'ducks/components/ApplicationPageLoading'
+import { getAppIconProps } from '@/ducks/apps'
+import Details from '@/ducks/apps/components/ApplicationPage/Details'
+import Gallery from '@/ducks/apps/components/ApplicationPage/Gallery'
+import Header from '@/ducks/apps/components/ApplicationPage/Header'
+import ApplicationPageLoading from '@/ducks/components/ApplicationPageLoading'
 import FocusTrap from 'focus-trap-react'
-import { useLocationNoUpdates } from 'lib/RouterUtils'
-import { getTranslatedManifestProperty } from 'lib/helpers'
+import { useLocationNoUpdates } from '@/lib/RouterUtils'
+import { getTranslatedManifestProperty } from '@/lib/helpers'
 import {
   preventBackgroundScroll,
   unpreventBackgroundScroll
-} from 'lib/scrollHelpers.js'
+} from '@/lib/scrollHelpers.js'
 import PropTypes from 'prop-types'
 import React, { Component } from 'react'
 import { Link, useMatch, useParams } from 'react-router-dom'

src/ducks/apps/components/ApplicationRouting/ChannelRoute.jsx

@@ -1,5 +1,5 @@
-import { REGISTRY_CHANNELS } from 'ducks/apps'
-import ChannelModal from 'ducks/apps/components/ChannelModal'
+import { REGISTRY_CHANNELS } from '@/ducks/apps'
+import ChannelModal from '@/ducks/apps/components/ChannelModal'
 import React from 'react'
 import { useParams } from 'react-router-dom'
 

src/ducks/apps/components/ApplicationRouting/ConfigureRoute.jsx

@@ -1,4 +1,4 @@
-import ConfigureModal from 'ducks/apps/components/ConfigureModal'
+import ConfigureModal from '@/ducks/apps/components/ConfigureModal'
 import React from 'react'
 import { useParams } from 'react-router-dom'
 

src/ducks/apps/components/ApplicationRouting/InstallRoute.jsx

@@ -1,5 +1,5 @@
-import { redirectToConfigure } from 'ducks/apps/components/ApplicationRouting/helpers'
-import InstallModal from 'ducks/apps/components/InstallModal'
+import { redirectToConfigure } from '@/ducks/apps/components/ApplicationRouting/helpers'
+import InstallModal from '@/ducks/apps/components/InstallModal'
 import PropTypes from 'prop-types'
 import React from 'react'
 import { useParams } from 'react-router-dom'

src/ducks/apps/components/ApplicationRouting/PermissionsRoute.jsx

@@ -1,5 +1,5 @@
-import PermissionsModal from 'ducks/apps/components/PermissionsModal'
-import IntentPermissionsModal from 'ducks/components/intents/IntentPermissionsModal'
+import PermissionsModal from '@/ducks/apps/components/PermissionsModal'
+import IntentPermissionsModal from '@/ducks/components/intents/IntentPermissionsModal'
 import React from 'react'
 import { useLocation, useParams } from 'react-router-dom'
 

src/ducks/apps/components/ApplicationRouting/UninstallRoute.jsx

@@ -1,4 +1,4 @@
-import UninstallModal from 'ducks/apps/components/UninstallModal'
+import UninstallModal from '@/ducks/apps/components/UninstallModal'
 import React from 'react'
 import { useParams } from 'react-router-dom'