Renomme le répertoire `mon-entreprise/` en `site/`

Pour éviter l'arborescence `mon-entreprise/mon-entreprise` qui prêtait
à confusion
pull/1843/head
Maxime Quandalle 2021-12-02 12:39:03 +01:00 committed by Maxime Quandalle
parent d5979264d2
commit 7db1a3394e
521 changed files with 25 additions and 27 deletions

View File

@ -67,7 +67,7 @@ module.exports = {
"jsx": true
},
"tsconfigRootDir": __dirname,
"project": [ "./mon-entreprise/tsconfig.json" ]
"project": [ "./site/tsconfig.json" ]
},
plugins: [ "@typescript-eslint" ],
rules: {

View File

@ -51,7 +51,7 @@ jobs:
ATINTERNET_API_SECRET_KEY: ${{ secrets.ATINTERNET_API_SECRET_KEY }}
ATINTERNET_API_ACCESS_KEY: ${{ secrets.ATINTERNET_API_ACCESS_KEY }}
- name: Build app
run: yarn workspace mon-entreprise build
run: yarn workspace site build
env:
AT_INTERNET_SITE_ID: ${{ needs.deploy-context.outputs.env-name == 'master' && 617190 || 617189 }}
NODE_ENV: production
@ -62,7 +62,7 @@ jobs:
run: sed -i "s|:SITE_FR|$FR_BASE_URL|g" netlify.toml;
sed -i "s|:SITE_EN|$EN_BASE_URL|g" netlify.toml;
- name: Update Algolia index
run: yarn workspace mon-entreprise algolia:update
run: yarn workspace site algolia:update
env:
ALGOLIA_APP_ID: ${{ secrets.ALGOLIA_APP_ID }}
ALGOLIA_ADMIN_KEY: ${{ secrets.ALGOLIA_ADMIN_KEY }}
@ -72,7 +72,7 @@ jobs:
with:
name: static-site
path: |
mon-entreprise/dist/**
site/dist/**
netlify.toml
if-no-files-found: error
@ -91,7 +91,7 @@ jobs:
- id: deploy-netlify
uses: nwtgck/actions-netlify@v1.1
with:
publish-dir: './mon-entreprise/dist'
publish-dir: './site/dist'
netlify-config-path: ./netlify.toml
production-deploy: false
github-token: ${{ secrets.GITHUB_TOKEN }}
@ -120,7 +120,7 @@ jobs:
- id: deploy-netlify
uses: nwtgck/actions-netlify@v1.1
with:
publish-dir: './mon-entreprise/dist'
publish-dir: './site/dist'
netlify-config-path: ./netlify.toml
production-deploy: true
github-token: ${{ secrets.GITHUB_TOKEN }}
@ -208,7 +208,7 @@ jobs:
node_modules
key: cypress-cache-${{ runner.os }}-${{ hashFiles('package-lock.json') }}
- run: node mon-entreprise/scripts/get-cypress-packages.js | xargs npm i
- run: node site/scripts/get-cypress-packages.js | xargs npm i
- name: Test e2e mon-entreprise on preview (site=${{ matrix.site }}, browser=${{ matrix.browser}}, viewport=${{ matrix.viewport }})
uses: cypress-io/github-action@v2
@ -274,7 +274,7 @@ jobs:
node_modules
key: cypress-cache-${{ runner.os }}-${{ hashFiles('package-lock.json') }}
- run: node mon-entreprise/scripts/get-cypress-packages.js | xargs npm i
- run: node site/scripts/get-cypress-packages.js | xargs npm i
- name: Test e2e mon-entreprise on production (site=${{ matrix.site }}, browser=${{ matrix.browser}}, viewport=${{ matrix.viewport }})
uses: cypress-io/github-action@v2

View File

@ -29,7 +29,7 @@ jobs:
ATINTERNET_API_SECRET_KEY: ${{ secrets.ATINTERNET_API_SECRET_KEY }}
ATINTERNET_API_ACCESS_KEY: ${{ secrets.ATINTERNET_API_ACCESS_KEY }}
- name: Remove temporary algolia index
run: yarn workspace mon-entreprise algolia:clean
run: yarn workspace site algolia:clean
env:
ALGOLIA_APP_ID: ${{ secrets.ALGOLIA_APP_ID }}
ALGOLIA_ADMIN_KEY: ${{ secrets.ALGOLIA_ADMIN_KEY }}

View File

@ -21,7 +21,7 @@ jobs:
node_modules
key: cypress-cache-${{ runner.os }}-${{ hashFiles('package-lock.json') }}
- run: node mon-entreprise/scripts/get-cypress-packages.js | xargs npm i
- run: node site/scripts/get-cypress-packages.js | xargs npm i
- name: Test external integration
uses: cypress-io/github-action@v2

View File

@ -3,8 +3,7 @@ on:
pull_request:
paths:
- modele-social/règles/**
- publicodes/core/**
- mon-entreprise/test/regressions/**
- site/test/regressions/**
jobs:
test:
runs-on: ubuntu-18.04

View File

@ -50,6 +50,6 @@ jobs:
path: '**/node_modules'
key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}-v2
- run: yarn install --frozen-lockfile
- working-directory: mon-entreprise
- working-directory: site
run: yarn run i18n:rules:check;
yarn run i18n:ui:check

View File

@ -1,3 +1,3 @@
.eslintrc.js
dist
mon-entreprise/source/locales/*.yaml
site/source/locales/*.yaml

View File

@ -31,7 +31,7 @@ Nous utilisons :
### Démarrage
Si possible, assurez-vous d'avoir toutes les clés d'API nécessaires dans votre fichier
`mon-entreprise/.env` (un template est disponible dans `mon-entreprise/.env.template`).
`site/.env` (un template est disponible dans `site/.env.template`).
**NB : ne vous inquiétez pas, ceci n'est pas nécessaire pour effectuer une première contribution à
la base de code !** Cependant, vous en aurez besoin pour la commande `yarn prepare` et pour les
commandes de traduction automatique français -> anglais. Si vous êtes confronté à ce type de besoin,
@ -41,7 +41,7 @@ Si l'historique des commits est trop volumineux, vous pouvez utiliser le paramè
```
# Clone this repo on your computer
git clone --depth 100 git@github.com:betagouv/mon-entreprise.git && cd mon-entreprise
git clone --depth 100 git@github.com:betagouv/mon-entreprise.git
# Mettre à jour votre config git locale
git config blame.ignoreRevsFile .git-blame-ignore-revs
@ -52,7 +52,7 @@ yarn install
# Download some data
yarn prepare
# Watch changes in publicodes and run the server for mon-entreprise
# Run the dev server for mon-entreprise
yarn start
```
@ -129,9 +129,8 @@ Pré-requis:
- le serveur doit être lancé via `yarn start`
```sh
$ yarn workspace mon-entreprise test:dev-e2e:mon-entreprise
$ yarn workspace mon-entreprise test:dev-e2e:mycompanyinfrance
$ yarn workspace mon-entreprise test:dev-e2e:publicodes
$ yarn workspace site test:dev-e2e:mon-entreprise
$ yarn workspace site test:dev-e2e:mycompanyinfrance
```
### Traduction 👽
@ -183,7 +182,7 @@ Pour tester les règles, il est recommandé de:
- faire tourner un simulateur et vérifier à la main l'adéquation des règles avec les normes
traduites ;
- créer des cas de tests de non-régression sous la forme de nouveaux snapshots (cf.
`mon-entreprise/test/regressions`).
`site/test/regressions`).
En local, le moteur de recherche n'est pas mis à jour automatiquement et la liste des règles
est exposée ici: http://localhost:8080/mon-entreprise/documentation/dev

View File

@ -71,7 +71,7 @@ module.exports = {
// A map from regular expressions to module names that allow to stub out resources with a single module
moduleNameMapper: {
'\\.css$': 'mon-entreprise/test/regressions/styleMock.js',
'\\.css$': 'site/test/regressions/styleMock.js',
},
// An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
@ -163,7 +163,7 @@ module.exports = {
// It's not possible to have 2 piped transformers like in webpack
// ie ['jest-transform-nearley', 'babel-jest'], so we removed ES6 module from nearley output.
'\\.ne$': require.resolve('jest-transform-nearley'),
'\\.yaml$': 'mon-entreprise/test/regressions/yaml-transformer.js',
'\\.yaml$': 'site/test/regressions/yaml-transformer.js',
'\\.(js|tsx?)$': require.resolve('babel-jest'),
},

View File

@ -119,12 +119,12 @@
"test:type": "yarn workspaces run tsc -- --skipLibCheck --noEmit",
"test:regressions": "yarn workspace modele-social build && jest --silent",
"clean": "yarn workspaces run clean && rimraf node_modules",
"start": "yarn workspace mon-entreprise start",
"moso:up": "yarn workspace modele-social run up && yarn workspace mon-entreprise upgrade modele-social"
"start": "yarn workspace site start",
"moso:up": "yarn workspace modele-social run up && yarn workspace site upgrade modele-social"
},
"workspaces": [
"modele-social",
"mon-entreprise"
"site"
],
"resolutions": {
"@mui/styled-engine": "npm:@mui/styled-engine-sc@latest"

View File

@ -1,5 +1,5 @@
{
"name": "mon-entreprise",
"name": "site",
"license": "MIT",
"version": "1.2.8",
"description": "Library to compute the french social security contributions. Also a website that explains the calculations, and a generic engine to build cool forms that asks the question needed to compute an objective.",

Some files were not shown because too many files have changed in this diff Show More