Skip to content

Commit

Permalink
Issue 4927 - rebase lib389 and cockpit in 1.4.4
Browse files Browse the repository at this point in the history
Description:  389-ds-base-1.4.4 has somehow become out of sync
              with critical fixes in lib389 and cockpit. It is
              too difficult to try and find which patches are
              missing. Instead we can just rebase the source
              code for lib389 and cockpit from branch 389-ds-base-2.0.

fixes: #4927

Reviewed by: spichugi & jchapman(Thanks!!)
  • Loading branch information
mreynolds389 committed Sep 20, 2021
1 parent ebacadd commit 01a2abe
Show file tree
Hide file tree
Showing 115 changed files with 50,617 additions and 66,913 deletions.
7 changes: 0 additions & 7 deletions src/cockpit/389-console/.babelrc

This file was deleted.

14 changes: 14 additions & 0 deletions src/cockpit/389-console/.babelrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"presets": [
["@babel/env", {
"targets": {
"chrome": "57",
"firefox": "52",
"safari": "10.3",
"edge": "16",
"opera": "44"
}
}],
"@babel/preset-react"
]
}
1 change: 1 addition & 0 deletions src/cockpit/389-console/.eslintignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
node_modules/*
src/lib/*
29 changes: 12 additions & 17 deletions src/cockpit/389-console/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,53 +1,48 @@
{
"root": true,
"env": {
"browser": true,
"es6": true
},
"extends": ["eslint:recommended", "standard", "standard-react"],
"parser": "babel-eslint",
"parser": "@babel/eslint-parser",
"parserOptions": {
"ecmaVersion": "7",
"ecmaFeatures": {
"experimentalObjectRestSpread": true,
"jsx": true
},
"sourceType": "module"
},
"plugins": ["flowtype", "react"],
"plugins": ["flowtype", "react", "react-hooks"],
"rules": {
"indent": [
"error",
4,
"indent": ["error", 4,
{
"ObjectExpression": "first",
"CallExpression": { "arguments": "first" },
"CallExpression": {"arguments": "first"},
"MemberExpression": 2,
"ignoredNodes": ["JSXAttribute", "JSXElement", "JSXAttribute *", "JSXElement *"]
}
],
"ignoredNodes": [ "JSXAttribute" ]
}],
"newline-per-chained-call": ["error", { "ignoreChainWithDepth": 2 }],
"lines-between-class-members": ["error", "always", { "exceptAfterSingleLine": true }],
"prefer-promise-reject-errors": ["error", { "allowEmptyReject": true }],
"react/jsx-indent": ["error", 4],
"semi": ["error", "always", { "omitLastInOneLineBlock": true }],

"react-hooks/rules-of-hooks": "error",
"react-hooks/exhaustive-deps": "error",

"camelcase": "off",
"comma-dangle": "off",
"curly": "off",
"jsx-quotes": "off",
"key-spacing": "off",
"no-console": "off",
"no-debugger": "off",
"quotes": "off",
"react/jsx-curly-spacing": "off",
"react/jsx-indent-props": "off",
"react/prop-types": "off",
"space-before-function-paren": "off",
"standard/no-callback-literal": "off",

"eqeqeq": "off",
"import/no-webpack-loader-syntax": "off",
"object-property-newline": "off",
"react/jsx-no-bind": "off"
"standard/no-callback-literal": "off"
},
"globals": {
"require": false,
Expand Down

0 comments on commit 01a2abe

Please sign in to comment.