Merge branch 'develop'

.env.dist

@@ -1,11 +1,4 @@
-REACT_APP_CLIENT_ID=app
-REACT_APP_ENCRYPT=encrypt
 REACT_APP_ENDPOINT_URL=https://api.aesirx.io/
-REACT_APP_TEST_MODE=false
-
-REACT_APP_LICENSE=[REPLACE THIS WITH THE PROVIDED REACT_APP_LICENSE from https://crm.aesirx.io]
-REACT_APP_CLIENT_SECRET=[REPLACE THIS WITH THE PROVIDED REACT_APP_CLIENT_SECRET from https://crm.aesirx.io]
 REACT_APP_SSO_CLIENT_ID=[REPLACE THIS WITH THE PROVIDED REACT_APP_SSO_CLIENT_ID from https://crm.aesirx.io]
 REACT_APP_SSO_CLIENT_SECRET=[REPLACE THIS WITH THE PROVIDED REACT_APP_SSO_CLIENT_SECRET from https://crm.aesirx.io]
-REACT_APP_DAM_LICENSE=[REPLACE THIS WITH THE PROVIDED REACT_APP_LICENSE from https://crm.aesirx.io]
 PORT=3000

.github/workflows/release.yml

@@ -12,6 +12,18 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16
+
+      - run: yarn install
+      - run: yarn lint
+      - run: CI=false yarn run build
+      - uses: JS-DevTools/npm-publish@v1
+        with:
+          token: ${{ secrets.NPM_TOKEN }}
+          check-version: true
+
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v4

.gitignore

@@ -10,6 +10,7 @@
 
 # production
 /build
+/dist
 
 #vscode
 .vscode
@@ -27,3 +28,5 @@
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+.yalc
+yalc.lock

craco.config.js

@@ -1,5 +1,19 @@
+const { DefinePlugin } = require('webpack');
+const { GitRevisionPlugin } = require('git-revision-webpack-plugin');
+const gitRevisionPlugin = new GitRevisionPlugin();
+
 module.exports = {
   eslint: {
     enable: false,
   },
+
+  webpack: {
+    plugins: {
+      add: [
+        new DefinePlugin({
+          VERSION: JSON.stringify(gitRevisionPlugin.version()),
+        }),
+      ],
+    },
+  },
 };

docker-compose.yml

@@ -4,14 +4,8 @@ services:
   app:
     image: aesirxio/crm-app:latest
     environment:
-      REACT_APP_CLIENT_ID: ${REACT_APP_CLIENT_ID}
-      REACT_APP_CLIENT_SECRET: ${REACT_APP_CLIENT_SECRET}
       REACT_APP_ENDPOINT_URL: ${REACT_APP_ENDPOINT_URL}
-      REACT_APP_ENCRYPT: ${REACT_APP_ENCRYPT}
-      REACT_APP_LICENSE: ${REACT_APP_LICENSE}
-      REACT_APP_TEST_MODE: ${REACT_APP_TEST_MODE}
       REACT_APP_SSO_CLIENT_ID: ${REACT_APP_SSO_CLIENT_ID}
       REACT_APP_SSO_CLIENT_SECRET: ${REACT_APP_SSO_CLIENT_SECRET}
-      REACT_APP_DAM_LICENSE: ${REACT_APP_DAM_LICENSE}
     ports:
       - '${PORT-3000}:3000'

package.json

@@ -1,71 +1,51 @@
 {
-  "name": "aesirx-crm",
-  "version": "1.0.1",
+  "name": "aesirx-crm-app",
+  "version": "1.1.0",
   "license": "GPL-3.0-only",
   "author": "AesirX",
   "repository": "https://github.com/aesirxio/crm-app",
+  "main": "dist/index.js",
+  "module": "dist/index.js",
   "dependencies": {
-    "@ckeditor/ckeditor5-build-classic": "^36.0.1",
-    "@ckeditor/ckeditor5-react": "^5.0.3",
-    "@fortawesome/fontawesome-svg-core": "^1.2.32",
-    "@fortawesome/free-brands-svg-icons": "^5.15.1",
-    "@fortawesome/free-regular-svg-icons": "^5.15.1",
-    "@fortawesome/free-solid-svg-icons": "^5.15.1",
-    "@fortawesome/react-fontawesome": "^0.1.12",
-    "aesirx-ckeditor": "^1.0.0",
-    "aesirx-dam-app": "^1.2.8",
-    "aesirx-dma-lib": "^1.8.0",
-    "aesirx-sso": "^1.0.3",
-    "axios": "^0.21.0",
-    "bootstrap": "5.2.2",
-    "d3-fetch": "^3.0.1",
+    "@fortawesome/fontawesome-svg-core": "^6.2.0",
+    "@fortawesome/free-regular-svg-icons": "^6.2.0",
+    "@fortawesome/free-solid-svg-icons": "^6.2.0",
+    "@fortawesome/react-fontawesome": "^0.2.0",
+    "aesirx-dam-app": "^1.3.0",
+    "aesirx-lib": "^1.10.0",
+    "aesirx-uikit": "^1.1.0",
     "date-fns": "^2.16.1",
     "date-fns-tz": "^1.1.6",
-    "file-saver": "^2.0.5",
-    "html-react-parser": "^1.2.7",
-    "i18next": "^19.8.4",
-    "i18next-browser-languagedetector": "^6.0.1",
-    "identity-obj-proxy": "3.0.0",
-    "lodash": "^4.17.21",
-    "mobx": "^6.0.4",
-    "mobx-react": "^7.0.5",
+    "mobx": "^6.9.0",
+    "mobx-react": "^7.6.0",
     "moment": "^2.29.4",
-    "react": "^17.0.2",
-    "react-big-calendar": "^0.33.5",
-    "react-bootstrap": "^2.5.0",
+    "react": "^18.2.0",
+    "react-bootstrap": "^2.7.4",
     "react-bootstrap-typeahead": "^6.0.0",
     "react-datepicker": "^4.8.0",
-    "react-dom": "^17.0.1",
-    "react-dropzone": "^11.2.4",
-    "react-google-charts": "^3.0.15",
-    "react-i18next": "^11.7.3",
-    "react-iframe": "^1.8.0",
-    "react-lazy-load-image-component": "^1.5.1",
-    "react-number-format": "^4.6.4",
+    "react-dom": "^18.2.0",
+    "react-i18next": "^12.3.1",
+    "react-number-format": "^5.2.1",
     "react-router-dom": "^5.2.0",
     "react-select": "^5.4.0",
-    "react-simple-maps": "^3.0.0",
-    "react-spinners": "^0.13.6",
     "react-table": "^7.6.2",
-    "react-timezone-select": "^1.0.7",
-    "react-toastify": "^9.0.8",
-    "react-transition-group": "^4.4.2",
     "recharts": "^2.1.14",
     "simple-react-validator": "^1.6.0",
-    "swiper": "^6.3.5",
-    "url": "^0.11.0",
-    "web-vitals": "^2.1.4"
+    "web-vitals": "^3.3.1"
   },
   "scripts": {
     "start": "yarn run build && serve -s build",
-    "build": "react-scripts build && react-inject-env set",
+    "build": "craco build build && react-inject-env set",
     "test": "react-scripts test",
     "dev": "craco start",
     "lint": "eslint --fix \"src/**/\"",
     "lint:check": "eslint \"src/**/\"",
     "lint:nowarns": "eslint --quiet \"src/**/\"",
     "format:check": "prettier --check 'src/**/*.{js,jsx,ts,tsx}'",
-    "format:write": "prettier --write 'src/**/*.{js,jsx,ts,tsx}'"
+    "format:write": "prettier --write 'src/**/*.{js,jsx,ts,tsx}'",
+    "build:lib": "NODE_ENV=production tsup",
+    "dev:lib": "NODE_ENV=development tsup --watch --onSuccess 'yalc push --no-scripts'",
+    "prepublishOnly": "yarn build:lib"
   },
   "eslintConfig": {
     "extends": [
@@ -88,20 +68,29 @@
   "devDependencies": {
     "@babel/eslint-parser": "^7.18",
     "@babel/preset-react": "^7.17",
-    "@ckeditor/ckeditor5-font": "^35.2.0",
-    "@ckeditor/ckeditor5-html-embed": "^35.2.0",
+    "@craco/craco": "^7.1.0",
     "@testing-library/jest-dom": "^5.16.3",
     "@testing-library/react": "^12.1.4",
     "@testing-library/user-event": "^13.5.0",
+    "esbuild-plugin-inline-image": "^0.0.9",
+    "esbuild-sass-plugin": "^2.9.0",
+    "esbuild-scss-modules-plugin": "^1.1.1",
     "eslint": "^8.17",
+    "git-revision-webpack-plugin": "^5.0.0",
     "prettier": "^2.8.4",
+    "react-inject-env": "^2.1.0",
     "react-scripts": "^5.0.1",
     "sass": "^1.52",
     "serve": "^13.0.2",
-    "craco": "^0.0.3",
-    "react-inject-env": "^2.1.0"
+    "tsup": "^6.7.0"
   },
-  "overrides": {
-    "autoprefixer": "10.4.5"
-  }
+  "resolutions": {
+    "bootstrap": "5.2.3",
+    "react": "^18",
+    "react-dom": "^18"
+  },
+  "files": [
+    "dist",
+    "public/assets/images"
+  ]
 }