Skip to content

Commit

Permalink
fix: resolve conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
clabroche committed Feb 11, 2024
1 parent a273e4f commit e29ed8c
Show file tree
Hide file tree
Showing 366 changed files with 9,123 additions and 14,015 deletions.
11 changes: 11 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/node_modules/*
/bin/*
package.json
package-lock.json
**/build/*
**/dist/*
**/node_modules/*
sandbox/*
commitlint.config.js
.eslintrc.js
**/tsup.config.ts
89 changes: 89 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
module.exports = {
extends: [
'eslint:recommended',
'airbnb',
],
parser: '@typescript-eslint/parser',
plugins: ['@typescript-eslint', 'jest', 'vue'],
settings: {
'import/extensions': ['.js', '.jsx', '.ts', '.tsx'],
'import/resolver': {
node: {
extensions: ['.js', '.jsx', '.ts', '.tsx'],
},
},
'import/parsers': {
'@typescript-eslint/parser': ['.ts', '.tsx'],
},
jest: {
version: 27,
},
},
parserOptions: {
ecmaVersion: 2021,
createDefaultProgram: false,
project: ['./tsconfig.json', './**/tsconfig.json'],
},
rules: {
"camelcase": "off",
"no-restricted-syntax": "off",
"class-methods-use-this": "off",
"no-shadow": "off",
"no-unused-vars": "off",
"@typescript-eslint/no-unused-vars": "error",
'linebreak-style': 0,
"import/no-extraneous-dependencies":[
"error",
{
"devDependencies":[
"**/*.test.ts",
"**/*.test.tsx",
"**/*.spec.js",
"**/*.spec.jsx",
"**/*.spec.jsx",
"**/*jest.config.ts",
"**/*jest.config.js",
]
}
],
'import/extensions': [
'error',
'ignorePackages',
{
js: 'never',
jsx: 'never',
ts: 'never',
tsx: 'never',
},
],
'no-use-before-define': 'off',
'no-console': 'off',
'import/no-dynamic-require': 'off',
'max-len': ['error', {
code: 120,
ignorePattern: 'true',
ignoreComments: true,
ignoreTrailingComments: true,
ignoreUrls: true,
ignoreStrings: true,
ignoreTemplateLiterals: true,
ignoreRegExpLiterals: true,
}],
'no-empty': ['error', { allowEmptyCatch: true }],
'no-param-reassign': 'off',
'jest/no-disabled-tests': 'warn',
'jest/no-focused-tests': 'error',
'jest/no-identical-title': 'error',
'jest/prefer-to-have-length': 'warn',
'jest/valid-expect': 'error',
'@typescript-eslint/naming-convention': 'off',
'eslint/space-before-blocks': 'off',
'@typescript-eslint/space-before-blocks': 'off',
'no-underscore-dangle': 'off',
'import/prefer-default-export': 'off',
'global-require': 'off',
},
env: {
'jest/globals': true,
},
};
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,5 @@ yarn-error.log
!.turbo/config.json
sandbox
lerna-debug.log
.pnp.*
.pnp.*
tsup.config.bundled*
5 changes: 3 additions & 2 deletions common/check-monorepo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,13 @@
"author": "",
"license": "ISC",
"dependencies": {
"fs-extra": "^10.1.0"
"fs-extra": "^11.2.0"
},
"devDependencies": {
"@clabroche/common-jest": "workspace:*",
"@clabroche/common-retrigger-all-build": "workspace:*",
"jest": "^28.1.3",
"@swc/jest": "^0.2.36",
"jest": "^29.7.0",
"jest-sonar-reporter": "^2.0.0"
}
}
2 changes: 1 addition & 1 deletion common/context/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"bluebird": "^3.7.2",
"express": "^4.18.2",
"jest-sonar-reporter": "^2.0.0",
"supertest": "^6.2.2"
"supertest": "^6.3.4"
},
"dependencies": {
"uuid": "^9.0.1"
Expand Down
2 changes: 1 addition & 1 deletion common/express-gulp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"author": "",
"license": "ISC",
"dependencies": {
"dotenv": "^16.0.3",
"dotenv": "^16.4.2",
"gulp": "^4.0.2",
"kill-port": "^2.0.1"
},
Expand Down
2 changes: 1 addition & 1 deletion common/express-health-check/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"@clabroche/common-jest": "workspace:*",
"@clabroche/common-retrigger-all-build": "workspace:*",
"jest-sonar-reporter": "^2.0.0",
"supertest": "^6.2.2"
"supertest": "^6.3.4"
},
"dependencies": {
"express": "^4.18.2"
Expand Down
2 changes: 1 addition & 1 deletion common/express-http-error/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"author": "",
"license": "ISC",
"dependencies": {
"dayjs": "^1.11.9",
"dayjs": "^1.11.10",
"uuid": "^9.0.1"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion common/express-logger/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"license": "ISC",
"dependencies": {
"@clabroche/common-express-http-error": "workspace:*",
"dayjs": "^1.11.9",
"dayjs": "^1.11.10",
"pino": "^8.14.1",
"rotating-file-stream": "^3.1.0",
"uuid": "^9.0.1"
Expand Down
4 changes: 1 addition & 3 deletions common/express/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
"@clabroche/common-express-health-check": "workspace:*",
"@clabroche/common-express-logger": "workspace:*",
"@clabroche/common-swagger": "workspace:*",
"bluebird": "^3.7.2",
"compression": "^1.7.4",
"cookie-parser": "^1.4.6",
"cors": "^2.8.5",
Expand All @@ -29,7 +28,6 @@
"pino-http": "^8.3.3"
},
"devDependencies": {
"@clabroche/common-retrigger-all-build": "workspace:*",
"@types/bluebird": "^3.5.38"
"@clabroche/common-retrigger-all-build": "workspace:*"
}
}
4 changes: 2 additions & 2 deletions common/jest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
"license": "ISC",
"dependencies": {
"@swc/core": "^1.3.99",
"@swc/jest": "^0.2.29",
"@swc/jest": "^0.2.36",
"fix-esm": "^1.0.1",
"jest": "^27.5.1"
"jest": "^29.7.0"
},
"devDependencies": {
"@clabroche/common-retrigger-all-build": "workspace:*"
Expand Down
2 changes: 1 addition & 1 deletion common/mongo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"author": "",
"license": "ISC",
"dependencies": {
"mongodb": "^4.7.0"
"mongodb": "^6.3.0"
},
"gitHead": "130d53f826acd5311d738a4097b22ce0a2861c49",
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions common/socket-front/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"vue": "^3.2.45"
},
"dependencies": {
"axios": "^1.6.2",
"socket.io-client": "^4.7.2"
"axios": "^1.6.7",
"socket.io-client": "^4.7.4"
},
"devDependencies": {
"@clabroche/common-retrigger-all-build": "workspace:*"
Expand Down
5 changes: 1 addition & 4 deletions common/socket-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@
"author": "",
"license": "ISC",
"dependencies": {
"express": "^4.18.2",
"lodash.clonedeep": "^4.5.0",
"socket.io": "^4.7.2",
"uuid": "^9.0.1"
"socket.io": "^4.7.4"
},
"devDependencies": {
"@clabroche/common-retrigger-all-build": "workspace:*"
Expand Down
4 changes: 1 addition & 3 deletions common/swagger/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,11 @@
"author": "",
"license": "ISC",
"dependencies": {
"bluebird": "^3.7.2",
"express": "^4.18.2",
"fs-extra": "^10.1.0",
"fs-extra": "^11.2.0",
"json-to-pretty-yaml": "^1.2.2",
"marked": "^11.1.1",
"swagger-jsdoc": "^6.2.1",
"swagger-ui-express": "^5.0.0",
"workspace-tools": "^0.36.3"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion common/workflow-conflict-resolver/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"bluebird": "^3.7.2",
"execa": "^7.2.0",
"fix-esm": "^1.0.1",
"fs-extra": "^10.1.0",
"fs-extra": "^11.2.0",
"semver": "^7.5.4"
}
}
5 changes: 3 additions & 2 deletions common/workflows/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@
"author": "",
"license": "ISC",
"devDependencies": {
"@clabroche/common-retrigger-all-build": "workspace:*"
"@clabroche/common-retrigger-all-build": "workspace:*",
"@types/fs-extra": "^11.0.4"
},
"dependencies": {
"bluebird": "^3.7.2",
"fs-extra": "^10.1.0"
"fs-extra": "^11.2.0"
}
}
31 changes: 0 additions & 31 deletions fronts/app/.npmignore

This file was deleted.

2 changes: 1 addition & 1 deletion fronts/app/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Launch multiples command at once. You can monitor projects.(like npm projects, g
- Show Mem percentage for each commands

## Usage
Create a config file like [this](./example/stack.js)
Create a config file

Then, in a terminal, type:
``` bash
Expand Down
6 changes: 3 additions & 3 deletions fronts/app/babel.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module.exports = {
presets: [
'@vue/cli-plugin-babel/preset'
]
}
'@vue/cli-plugin-babel/preset',
],
};
1 change: 0 additions & 1 deletion fronts/app/example/.gitignore

This file was deleted.

1 change: 0 additions & 1 deletion fronts/app/example/documentation/server/index.md

This file was deleted.

1 change: 0 additions & 1 deletion fronts/app/example/documentation/server/subFolder/index.md

This file was deleted.

4 changes: 0 additions & 4 deletions fronts/app/example/env.local.js

This file was deleted.

9 changes: 0 additions & 9 deletions fronts/app/example/env.preprod.js

This file was deleted.

24 changes: 0 additions & 24 deletions fronts/app/example/front/.gitignore

This file was deleted.

7 changes: 0 additions & 7 deletions fronts/app/example/front/README.md

This file was deleted.

13 changes: 0 additions & 13 deletions fronts/app/example/front/index.html

This file was deleted.

Loading

0 comments on commit e29ed8c

Please sign in to comment.