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

None fix yarn lock file remove optional on build #2615

Closed
wants to merge 8 commits into from
Closed

None fix yarn lock file remove optional on build #2615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8e1d3cf
Fix yarn lock to use public registry
gxueatlassian Dec 13, 2023
da9f2a1
remove optional
gxueatlassian Dec 13, 2023
2379ab1
Fix lint
gxueatlassian Dec 13, 2023
ce9b5ff
try remove optional on build
gxueatlassian Dec 13, 2023
a03ef3d
fix
gxueatlassian Dec 13, 2023
8ff83c0
fix
gxueatlassian Dec 13, 2023
dbbd9c3
fix
gxueatlassian Dec 13, 2023
4d08919
fix
gxueatlassian Dec 14, 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
16 changes: 16 additions & 0 deletions .github/workflows/on-push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ jobs:
with:
path: '**/node_modules'
key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
- name: remove internal package
run: |
sed -i '/sqs-queue-dlq-service/d' ./package.json
cat ./package.json
- run: yarn install --frozen-lockfile
- run: yarn run lint
- run: yarn run build:release
Expand All @@ -31,6 +35,10 @@ jobs:
with:
path: '**/node_modules'
key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
- name: remove internal package
run: |
sed -i '/sqs-queue-dlq-service/d' ./package.json
cat ./package.json
- run: yarn install --frozen-lockfile
- run: yarn run playwright install
- name: create .env file
Expand Down Expand Up @@ -84,6 +92,10 @@ jobs:
with:
path: '**/node_modules'
key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
- name: remove internal package
run: |
sed -i '/sqs-queue-dlq-service/d' ./package.json
cat ./package.json
- run: yarn install --frozen-lockfile
- run: yarn spa:build
- name: create .env file
Expand Down Expand Up @@ -138,6 +150,10 @@ jobs:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v1
- name: remove internal package
run: |
sed -i '/sqs-queue-dlq-service/d' ./package.json
cat ./package.json
- name: Build Docker image
uses: docker/[email protected]
with:
Expand Down
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
"ts-retry-promise": "^0.7.0",
"tsconfig-paths": "^3.14.0",
"tslib": "~2.3.1",
"typescript": "~4.5.5",
"typescript": "^5.3.3",
"uuid": "^8.3.2",
"xml2json-light": "^1.0.6",
"yaml": "^2.2.2"
Expand All @@ -140,6 +140,7 @@
"@types/express": "^4.17.13",
"@types/express-rate-limit": "^5.1.3",
"@types/hbs": "^4.0.1",
"@types/ioredis": "4.28.5",
"@types/jest": "~27.4.0",
"@types/jest-when": "^3.5.0",
"@types/lodash": "^4.14.178",
Expand Down
4 changes: 3 additions & 1 deletion spa/src/pages/ConfigSteps/test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,9 @@ test("Connect GitHub Screen - Checking the GitHub Cloud flow when authenticated

// Clicking first connect button
await act(async () => { await userEvent.click(screen.getAllByRole("button", { name: "Connect" })[0]); });
expect(await screen.findAllByRole("button", { name: "Loading button" })).toHaveLength(1);

expect(await screen.findAllByRole("button", { name: /Loading/ })).toHaveLength(1);

expect(await screen.findAllByRole("button", { name: "Connect" })).toHaveLength(2);
expect(screen.getAllByRole("button", { name: "Connect" })[0]).toBeDisabled();
expect(screen.getAllByRole("button", { name: "Connect" })[1]).toBeDisabled();
Expand Down
6,777 changes: 3,227 additions & 3,550 deletions spa/yarn.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/routes/api/api-router.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ ApiRouter.use(slauthMiddleware);

const rateLimitMiddleware = rateLimit({
store: new RedisStore({
client: new IORedis(getRedisInfo("express-rate-limit"))
client: new IORedis(getRedisInfo("express-rate-limit")) as any
}),
windowMs: 60 * 1000, // 1 minutes
max: 60 // limit each IP to 60 requests per windowMs
Expand Down
3 changes: 1 addition & 2 deletions src/transforms/push.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Logger from "bunyan";
import { uniq } from "lodash";
import { compact, isEmpty, uniq } from "lodash";
import { Subscription } from "models/subscription";
import { getJiraClient, JiraClient } from "../jira/client/jira-client";
import { JiraClientError } from "../jira/client/axios";
Expand All @@ -10,7 +10,6 @@ import { isBlocked, shouldSendAll, booleanFlag, BooleanFlags } from "config/feat
import { sqsQueues } from "../sqs/queues";
import { GitHubAppConfig, PushQueueMessagePayload } from "~/src/sqs/sqs.types";
import { GitHubInstallationClient } from "../github/client/github-installation-client";
import { compact, isEmpty } from "lodash";
import { GithubCommitFile, GitHubPushData } from "interfaces/github";
import { transformRepositoryDevInfoBulk } from "~/src/transforms/transform-repository";
import { saveIssueStatusToRedis, getIssueStatusFromRedis } from "utils/jira-issue-check-redis-util";
Expand Down
Loading
Loading