Merge branch 'CE-3116-react-scripts' into 'develop'

CE-3116: Cleanup react scripts See merge request !569

Merge branch 'CE-3116-react-scripts' into 'develop'
3d5e8eec · Max Frederiksen · 584b032f · 53ead1c9 · 3d5e8eec · 3d5e8eec
Commit 3d5e8eec authored 4 months ago by Max Frederiksen
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,7 @@ install-dependencies:
 lint:
  stage: check
  script:
-    - npm run code-quality
+    - npm run ci:code-quality
  artifacts:
    reports:
      codequality: gl-codequality.json

--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ ENV PATH /usr/src/app/node_modules/.bin:$PATH
 COPY . /usr/src/app
 RUN npm ci

-RUN VITE_APP_MUI_PRO_LICENSE_KEY=${REACT_APP_MUI_PRO_LICENSE_KEY} npm run build
+RUN VITE_APP_MUI_PRO_LICENSE_KEY=${REACT_APP_MUI_PRO_LICENSE_KEY} npm run ci:build

 # production environment
 FROM nginx:1.19.6-alpine

--- a/README.md
+++ b/README.md
@@ -68,7 +68,7 @@ Environment variables are stored in `.env` files.
 Precedency of environment variable files are (files on the left have more priority than files on the right):

 - npm start: `.env.development.local`, `.env.local`, `.env.development`, `.env`
- npm run build: `.env.production.local`, `.env.local`, `.env.production`, `.env`
+- npm run ci:build: `.env.production.local`, `.env.local`, `.env.production`, `.env`

 All environment variables start with `REACT_APP_` prefix.

@@ -118,12 +118,6 @@ npm run prettier:fix

 will run `npm run prettier -- --write` which will run prettier on all files in the src directory and write out which files have be changed in your console.

-```bash
-npm run format
-```
-
-will run `npm run prettier:fix && npm run lint:fix` which will run lint:fix and the prettier:fix scripts mentioned above.
-
 ## [Pre-Commit](https://pre-commit.com/)

 ### Installation
@@ -151,7 +145,6 @@ npx cypress open

 To run Cypress tests from command line (without the test-dialog), enter

-
 ```bash
 npx cypress run
 ```
@@ -159,7 +152,7 @@ npx cypress run
 ## Building

 ```bash
-npm run build
+npm run ci:build
 ```

 Builds the app for production to the `build` folder.\

--- a/index.html
+++ b/index.html
@@ -37,7 +37,7 @@

      Unlike "/favicon.ico" or "favicon.ico", "/favicon.ico" will
      work correctly both with client-side routing and a non-root public URL.
-      Learn how to configure a non-root public URL by running `npm run build`.
+      Learn how to configure a non-root public URL by running `npm run ci:build`.
    -->
  </head>
  <body>
@@ -51,9 +51,12 @@
      The build step will place the bundled scripts into the <body> tag.

      To begin the development, run `npm start` or `yarn start`.
-      To create a production bundle, use `npm run build` or `yarn build`.
+      To create a production bundle, use `npm run ci:build` or `yarn ci:build`.
    -->
    <script src="/config.js"></script>
-    <script type="module" src="/src/index.jsx"></script>
+    <script
+      type="module"
+      src="/src/index.jsx"
+    ></script>
  </body>
 </html>
--- a/package.json
+++ b/package.json
@@ -21,22 +21,17 @@
  },
  "scripts": {
    "start": "vite",
-    "test": "npm run testComponents",
    "cypress:open": "cypress open --component",
-    "build": "tsc && vite build",
-    "preview": "vite preview",
-    "testComponents": "npx cypress run --component --browser chrome",
-    "code-quality": "eslint src --ext .js,.ts,.jsx,.tsx -o eslint/quality -f gitlab",
    "storybook": "storybook dev -p 6006",
-    "build-storybook": "storybook build",
-    "check-types": "tsc --noemit",
    "eslint": "npx eslint src",
-    "lint": "npm run check-types && npm run eslint",
+    "lint": "tsc --noemit && npm run eslint",
    "lint:fix": "npm run eslint -- --fix",
    "prettier": "npx prettier src --check",
    "prettier:fix": "npm run prettier -- --write",
-    "format": "npm run prettier:fix && npm run lint:fix",
-    "generate-api": "npx @rtk-query/codegen-openapi openapi-config.ts"
+    "generate-api": "npx @rtk-query/codegen-openapi openapi-config.ts",
+    "ci:build": "tsc && vite build",
+    "ci:build-storybook": "storybook build",
+    "ci:code-quality": "eslint src --ext .js,.ts,.jsx,.tsx -o eslint/quality -f gitlab"
  },
  "browserslist": {
    "production": [