Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pull request update/231121 #169

Merged
merged 4 commits into from
Nov 21, 2023
Merged

Pull request update/231121 #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d3235bf
OS-6745: Clean up console errors and warnings in debug environment
ab-hystax Nov 19, 2023
699f5ed
OS-7019. Updated jira_ui packages
ek-hystax Nov 20, 2023
359716f
OS-6767. Ability to create new deployment with --no-pull and tag
sd-hystax Nov 20, 2023
1754c46
OS-7028. Removed acura cert in clients
nk-hystax Nov 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions jira_ui/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -------- Setup --------
ARG IMAGE=node:14.16.0-alpine3.13
ARG IMAGE=node:18.14.2-alpine3.16

FROM $IMAGE as builder

Expand All @@ -10,7 +10,7 @@ ENV NODE_ENV production
# -------- UI --------
WORKDIR /usr/src/app/ui
COPY jira_ui/ui/package*.json ./
RUN npm ci --ignore-scripts
RUN npm ci --ignore-scripts --legacy-peer-deps
COPY jira_ui/ui/ ./
# .eslintrc.json on build step will produce an error, but it is still needed on testing
RUN mv .eslintrc.json .disabled.eslintrc.json
Expand Down
2 changes: 1 addition & 1 deletion jira_ui/Dockerfile_tests
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ WORKDIR "/usr/src/app/ui"
USER root

RUN mv .disabled.eslintrc.json .eslintrc.json
RUN npm ci --ignore-scripts -D
RUN npm ci --legacy-peer-deps --ignore-scripts -D
1 change: 1 addition & 0 deletions jira_ui/ui/.eslintignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
/node_modules
/build/**
22 changes: 14 additions & 8 deletions jira_ui/ui/.eslintrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,18 @@
"node": true,
"jest": true
},
"extends": ["eslint:recommended", "plugin:react/recommended", "airbnb-base", "prettier"],
"extends": ["react-app", "eslint:recommended", "plugin:react/recommended", "airbnb-base", "prettier"],
"globals": {
"Atomics": "readonly",
"SharedArrayBuffer": "readonly"
"SharedArrayBuffer": "readonly",
"globalThis": "readonly"
},
"parser": "babel-eslint",
"parser": "@babel/eslint-parser",
"parserOptions": {
"babelOptions": {
"presets": ["@babel/preset-react"]
},
"ecmaFeatures": {
"jsx": true
},
"ecmaVersion": 2020,
"ecmaVersion": 2022,
"sourceType": "module"
},
"plugins": ["react", "react-hooks", "unused-imports"],
Expand Down Expand Up @@ -46,11 +44,19 @@
"import/no-extraneous-dependencies": 0,
"import/prefer-default-export": 0,
"no-const-assign": "warn",
"no-underscore-dangle": [
"error",
{
"allowAfterThis": true,
"allowAfterThisConstructor": true
}
],
"no-this-before-super": "warn",
"no-undef": "warn",
"no-unreachable": "warn",
"no-unused-vars": "warn",
"unused-imports/no-unused-imports": "warn",
"arrow-body-style": "warn",
"import/order": [
"warn",
{
Expand Down Expand Up @@ -81,7 +87,7 @@
}
],
"max-params": ["warn", 3],
"arrow-body-style": ["warn", "as-needed"]
"default-param-last": 0
},
"settings": {
"import/resolver": {
Expand Down
Loading
Loading