Skip to content

Commit

Permalink
fix: update config & package after removing drama-queen folder
Browse files Browse the repository at this point in the history
  • Loading branch information
QRuhier committed Dec 12, 2024
1 parent e244486 commit 3ac7ec9
Show file tree
Hide file tree
Showing 10 changed files with 130 additions and 3,245 deletions.
6 changes: 6 additions & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
VITE_QUEEN_API_URL=
# If no environment variable for external resources is provided, the application will not trigger external resources treatments.
VITE_EXTERNAL_RESOURCES_URL=
# If no environment variables for OIDC are provided, the application will use a mock OIDC.
VITE_OIDC_ISSUER=
VITE_OIDC_CLIENT_ID=
5 changes: 0 additions & 5 deletions .env.drama.sample

This file was deleted.

2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,3 @@ dist-ssr
*.njsproj
*.sln
*.sw?
drama-queen/.env
queen
7 changes: 2 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@ Web application for the management of questionnaires powered by Lunatic (https:/
## Getting Started

```
cp .env.drama.sample ./drama-queen/.env
cp .env.queen.sample ./queen/.env.local
npx lerna bootstrap
yarn dev:drama-queen
yarn dev:queen
yarn
yarn dev
yarn build
```
5 changes: 0 additions & 5 deletions lerna.json

This file was deleted.

31 changes: 0 additions & 31 deletions nx.json

This file was deleted.

71 changes: 60 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,22 +1,71 @@
{
"name": "drama-queen-container",
"name": "drama-queen",
"private": true,
"version": "2.3.1",
"workspaces": [
"drama-queen"
],
"type": "module",
"scripts": {
"test": "lerna run test",
"test:coverage": "lerna run test:coverage",
"build": "lerna run build",
"build:drama-queen": "lerna run build --scope 'drama-queen'",
"serve:drama-queen": "lerna run serve --scope 'drama-queen'",
"dev:drama-queen": "lerna run dev --scope 'drama-queen'",
"dev": "vite --port 5001 --strictPort",
"test": "vitest",
"test:coverage": "vitest --coverage",
"build": "tsc && vite build",
"postbuild": "node build/remote-env.cjs remoteEntry.js",
"preview": "vite preview --port 5001 --strictPort",
"_format": "prettier 'src/**/*.{ts,tsx,js,jsx,json,md}'",
"format": "npm run _format -- --write",
"lint": "eslint src/",
"format:check": "npm run _format -- --list-different",
"stop": "kill-port --port 5000,5001,5002"
},
"dependencies": {
"@emotion/react": "^11.11.4",
"@emotion/styled": "^11.11.0",
"@inseefr/lunatic": "^3.4.8",
"@mui/icons-material": "^5.15.14",
"@mui/material": "^5.15.14",
"@types/memoizee": "^0.4.11",
"axios": "^1.7.7",
"dexie": "^3.2.7",
"dexie-react-hooks": "^1.1.7",
"evt": "^2.5.7",
"i18nifty": "^3.2.1",
"jwt-decode": "^4.0.0",
"oidc-spa": "^5.4.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-hook-form": "^7.51.1",
"react-hot-keys": "^2.7.3",
"react-router-dom": "^6.26.2",
"redux-clean-architecture": "^4.3.2",
"tsafe": "^1.6.6",
"tss-react": "^4.9.13",
"zod": "^3.22.4"
},
"devDependencies": {
"@originjs/vite-plugin-federation": "^1.2.3",
"@testing-library/dom": "^10.4.0",
"@testing-library/jest-dom": "^6.5.0",
"@testing-library/react": "^16.0.1",
"@eslint/js": "^9.13.0",
"@types/node": "^20.16.10",
"@types/react": "^18.3.10",
"@types/react-dom": "^18.2.22",
"@vitejs/plugin-react": "^4.3.2",
"@vitest/coverage-v8": "^2.1.3",
"jsdom": "^25.0.1",
"eslint": "^9.13.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-react": "^7.37.2",
"globals": "^15.11.0",
"kill-port": "^2.0.1",
"lerna": "^7.1.1"
"prettier": "^3.2.5",
"ts-node": "^10.9.2",
"typescript": "^5.6.2",
"typescript-eslint": "^8.11.0",
"vite": "^5.4.8",
"vite-envs": "^4.4.5",
"vite-plugin-pwa": "^0.19.8",
"vite-tsconfig-paths": "^4.3.2",
"vitest": "^2.1.3"
}
}
30 changes: 12 additions & 18 deletions renovate.json
Original file line number Diff line number Diff line change
@@ -1,51 +1,45 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": ["config:recommended"],
"labels": ["dependencies"],
"dependencyDashboard": true,
"packageRules": [
{
"matchPaths": ["drama-queen/package.json"],
"matchPaths": ["package.json"],
"matchDepTypes": ["dependencies"],
"matchUpdateTypes": ["minor", "patch"],
"groupName": "drama-queen dependencies minor and patch updates",
"groupSlug": "minor-patch",
"groupName": "dependencies minor and patch updates",
"groupSlug": "minor-patch",
"labels": ["dependencies"]
},
{
"matchPaths": ["drama-queen/package.json"],
"matchPaths": ["package.json"],
"matchDepTypes": ["devDependencies"],
"matchUpdateTypes": ["minor", "patch"],
"groupName": "drama-queen devDependencies minor and patch updates",
"groupSlug": "dev-minor-patch",
"groupName": "devDependencies minor and patch updates",
"groupSlug": "dev-minor-patch",
"labels": ["devDependencies"]
},
{
"matchPaths": ["drama-queen/package.json"],
{
"matchPaths": ["package.json"],
"matchDepTypes": ["dependencies"],
"matchUpdateTypes": ["minor", "patch"],
"matchPackagePatterns": ["@inseefr/lunatic"],
"labels": ["lunatic"]
},
{
{
"matchPaths": ["website/**"],
"matchDepTypes": ["dependencies", "devDependencies"],
"matchUpdateTypes": ["minor", "patch"],
"groupName": "website minor and patch updates",
"groupSlug": "website-minor-patch",
"labels": ["dependencies", "website"]
},
{
"matchFiles": ["package.json"],
"groupName": "drama-queen-container updates",
"groupSlug": "container-updates",
"labels": ["drama-queen-container"]
},
{
{
"description": "CI dependencies",
"matchPaths": [".github/workflows/**"],
"groupName": "CI dependencies",
"labels": ["CI"]
}
]
}
}
8 changes: 4 additions & 4 deletions sonar-project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ sonar.projectName=Drama-Queen
sonar.projectVersion=1.0

# Path to sources
sonar.sources=drama-queen/src
sonar.sources=src
sonar.exclusions=**/*.test.js, **/*.test.jsx, **/*.test.ts, **/*.test.tsx

# Path to tests
sonar.test.inclusions=drama-queen/src/**/*.test.js, drama-queen/src/**/*.test.jsx, drama-queen/src/**/*.test.ts, drama-queen/src/**/*.test.tsx
sonar.test.inclusions=src/**/*.test.js, src/**/*.test.jsx,src/**/*.test.ts, src/**/*.test.tsx

# Coverage
sonar.javascript.lcov.reportPaths=drama-queen/coverage/lcov.info
sonar.coverage.exclusions=drama-queen/src/**/*.test.js, drama-queen/src/**/*.test.jsx, drama-queen/src/**/*.test.ts, drama-queen/src/**/*.test.tsx
sonar.javascript.lcov.reportPaths=coverage/lcov.info
sonar.coverage.exclusions=src/**/*.test.js, src/**/*.test.jsx, src/**/*.test.ts, src/**/*.test.tsx

# Source encoding
sonar.sourceEncoding=UTF-8
Loading

0 comments on commit 3ac7ec9

Please sign in to comment.