Skip to content

Commit

Permalink
Merge pull request #2263 from abilpraju-aot/security-fix-v.7.0.0-alpha
Browse files Browse the repository at this point in the history
updated security fix
  • Loading branch information
arun-s-aot authored Oct 16, 2024
2 parents 06aa4ec + bd7081d commit 359e0eb
Show file tree
Hide file tree
Showing 14 changed files with 10,238 additions and 17,617 deletions.
2 changes: 1 addition & 1 deletion forms-flow-api/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Author: Kurian Benoy
FROM python:3.12.1-slim-bullseye
FROM python:3.12.6-slim

# set label for image
LABEL Name="formsflow"
Expand Down
2 changes: 1 addition & 1 deletion forms-flow-documents/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Author: Kurian Benoy
FROM python:3.12.1-slim-bullseye
FROM python:3.12.6-slim

# set label for image
LABEL Name="formsflow"
Expand Down
2 changes: 1 addition & 1 deletion forms-flow-documents/Dockerfile-ARM64
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Author: Kurian Benoy
FROM python:3.12.1-slim-bullseye
FROM python:python:3.12.6-slim

WORKDIR /forms-flow-documents/app

Expand Down
4 changes: 2 additions & 2 deletions forms-flow-idm/keycloak/idp-selector/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<name>idp-selector</name>
<url>http://maven.apache.org</url>
<properties>
<keycloak.version>23.0.7</keycloak.version>
<keycloak.version>25.0.4</keycloak.version>
</properties>
<dependencies>
<dependency>
Expand Down Expand Up @@ -45,7 +45,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.10</version>
<version>1.2.13</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
2 changes: 1 addition & 1 deletion forms-flow-web-root-config/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ RUN if [ $NODE_ENV == "development" ]; then \


# Production stage
FROM nginx:1.25.4-alpine as production-stage
FROM nginx:1.27-alpine as production-stage

# Set label for image
LABEL Name="formsflow"
Expand Down
6,050 changes: 3,349 additions & 2,701 deletions forms-flow-web-root-config/package-lock.json

Large diffs are not rendered by default.

17 changes: 4 additions & 13 deletions forms-flow-web-root-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
"check-format": "prettier --check .",
"build": "concurrently npm:build:*",
"build:webpack": "webpack --mode=production",
"build-dev:webpack": "webpack --env isLocal --mode=development",
"preinstall": "npm install --package-lock-only --ignore-scripts && npx npm-force-resolutions"
"build-dev:webpack": "webpack --env isLocal --mode=development"
},
"devDependencies": {
"concurrently": "^6.2.1",
Expand All @@ -21,8 +20,8 @@
"jest-cli": "^27.0.6",
"prettier": "^2.3.2",
"pretty-quick": "^3.1.1",
"serve": "^12.0.0",
"webpack-dev-server": "^4.0.0"
"serve": "^14.2.3",
"webpack-dev-server": "^4.15.2"
},
"dependencies": {
"@types/jest": "^27.0.1",
Expand All @@ -34,7 +33,7 @@
"copy-webpack-plugin": "^11.0.0",
"html-webpack-plugin": "^5.3.2",
"jest": "^27.0.6",
"webpack": "^5.75.0",
"webpack": "^5.94.0",
"webpack-cli": "^4.8.0",
"webpack-config-single-spa": "^5.0.0",
"webpack-merge": "^5.8.0",
Expand All @@ -43,13 +42,5 @@
"@babel/plugin-transform-runtime": "^7.15.0",
"@babel/preset-env": "^7.15.0",
"@babel/runtime": "^7.15.3"
},
"resolutions": {
"semver": "7.5.3",
"minimatch": "3.0.5",
"webpack": "5.76.0",
"tough-cookie": "4.1.3",
"word-wrap": "1.2.4",
"postcss": "8.4.31"
}
}
3 changes: 1 addition & 2 deletions forms-flow-web-root-config/src/index.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>formsflow.ai</title>
<script src="/config/config.js"></script>
<link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/assets/element-templates.css">
<link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/assets/properties-panel.css">
<link rel="stylesheet" href="https://unpkg.com/@bpmn-io/properties-panel/dist/assets/properties-panel.css">
<!-- required dmn modeler styles -->
<link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/assets/diagram-js.css">
<link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/assets/dmn-js-shared.css">
Expand Down
29 changes: 16 additions & 13 deletions forms-flow-web/.eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,27 @@
"version": "detect"
}
},
"parser": "babel-eslint",
"parser": "@babel/eslint-parser",
"parserOptions": {
"sourceType": "module",
"allowImportExportEverywhere": true
"allowImportExportEverywhere": true,
"requireConfigFile": false,
"babelOptions": {
"plugins": ["@babel/plugin-syntax-jsx"]
}
},
"rules": {
"react/react-in-jsx-scope":"off",
"no-alert":"warn",
"no-console":"off",
"react/display-name":"off",
"react/prop-types":"off",
"max-len": ["error", {"code": 100, "ignoreUrls": true, "ignoreStrings": true, "ignoreComments": true}],
"react/react-in-jsx-scope": "off",
"no-alert": "warn",
"no-console": "off",
"react/display-name": "off",
"react/prop-types": "off",
"max-len": ["error", { "code": 100, "ignoreUrls": true, "ignoreStrings": true, "ignoreComments": true }],
"no-mixed-operators": "error",
"no-tabs": ["error", {"allowIndentationTabs": true}],
"semi":"error",
"no-tabs": ["error", { "allowIndentationTabs": true }],
"semi": "error",
"semi-style": ["error", "last"],
"space-infix-ops": ["error", { "int32Hint": false }],
"no-useless-concat":"error"

"no-useless-concat": "error"
}
}
}
2 changes: 1 addition & 1 deletion forms-flow-web/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ COPY . /forms-flow-web/app/
RUN npm run build

# Production stage
FROM nginx:1.25.4-alpine as production-stage
FROM nginx:1.27-alpine as production-stage

# Copy built files from build stage
COPY --from=build-stage /forms-flow-web/app/build /usr/share/nginx/html
Expand Down
15 changes: 13 additions & 2 deletions forms-flow-web/craco.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const SingleSpaAppcracoPlugin = require("craco-plugin-single-spa-app-aot");
const SingleSpaAppcracoPlugin = require("craco-plugin-single-spa-app-aot-test");

const shouldMinimize = process.env.NODE_ENV == "production";

Expand All @@ -18,10 +18,21 @@ const singleSpaAppPlugin = {
// Keep any other configuration you are exporting from CRACO and add the plugin to the plugins array
module.exports = {
plugins: [singleSpaAppPlugin],
webpack: {
configure: {
resolve: {
fallback: {
stream: require.resolve("stream-browserify"),
buffer: require.resolve("buffer/"),
net: false, // Unfortunately, net can't be polyfilled easily in the browser.
},
},
},
},
devServer: {
port: 3004,
headers: {
"Access-Control-Allow-Origin": "*",
},
},
};
};
Loading

0 comments on commit 359e0eb

Please sign in to comment.