Skip to content
This repository has been archived by the owner on Oct 20, 2023. It is now read-only.

Commit

Permalink
Merge branch 'develop' into cypress/rerun-failed-tests-only
Browse files Browse the repository at this point in the history
  • Loading branch information
sang2925 committed Mar 15, 2023
2 parents 3470fdb + 603b746 commit d31fb14
Show file tree
Hide file tree
Showing 10 changed files with 346 additions and 167 deletions.
2 changes: 1 addition & 1 deletion .moon/tasks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ tasks:

# Library mode commands
build-library:
command: 'npx -c "tsup-node ./src/index.ts --minify --format esm && tsc --emitDeclarationOnly --outDir dist"'
command: 'cross-env npx -c "tsup-node ./src/index.ts --minify --format esm && tsc --emitDeclarationOnly --outDir dist"'
inputs:
- '@globs(sources)'
- '@globs(assets)'
Expand Down
2 changes: 2 additions & 0 deletions applications/client/moon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@ tasks:
deps:
- ~:build-vite
start-dev:
local: true
deps:
- ^:build
- ~:start-vite
options:
runInCI: false
runDepsInParallel: false
graphql:
command: mk-gql --outDir=./src/store/graphql ../server/schema.graphql
deps:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,7 @@ export const CommentBox = observer<CommentBoxProps>(
intent={Intent.PRIMARY}
alignText={Alignment.LEFT}
loading={state.loading}
disabled={state.loading}
disabled={state.loading || !state.text}
// where the added beacon link is created
onClick={() => state.submitAnnotation()}
rightIcon={<CarbonIcon icon={AddComment16} />}
Expand Down
25 changes: 18 additions & 7 deletions applications/redeye-e2e/moon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,34 @@ dependsOn:
- 'client'
tasks:
open-cy:
command: 'npx -c "moon run @redeye/client:start-dev @redeye/server:start-dev & moon run @redeye/e2e:start-cypress"'
command: 'concurrently "yarn start" "yarn moon run redeye-e2e:start-cypress"'
local: true
platform: node
options:
runFromWorkspaceRoot: true
open-cy-blue:
command: 'npx -c "SERVER_BLUE_TEAM=true moon run @redeye/client:start-dev @redeye/server:start-dev & moon run @redeye/e2e:start-cypress"'
command: 'concurrently "yarn start:blue" "yarn moon run redeye-e2e:start-cypress"'
local: true
options:
runFromWorkspaceRoot: true
env:
SERVER_BLUE_TEAM: 'true'
cy-ci-chrome-redteam:
local: true
command: 'npx -c "moon run @redeye/e2e:run-cypress -- --headed --browser=chrome --spec **/**/e2e/redteam/**/**/** & moon run @redeye/client:start-dev @redeye/server:start-dev || exit 0"'
command: 'concurrently "yarn start:server" "yarn start:client" "yarn moon run redeye-e2e:run-cypress -- --headed --browser=chrome --spec **/**/e2e/redteam/**/**/**"'
options:
runFromWorkspaceRoot: true
cy-ci-firefox-redteam:
local: true
command: 'npx -c "moon run @redeye/e2e:run-cypress -- --browser=firefox --headed --spec **/**/e2e/redteam/**/**/** & moon run @redeye/client:start-dev @redeye/server:start-dev || exit 0"'
command: 'concurrently "yarn start:server" "yarn start:client" "yarn moon run redeye-e2e:run-cypress -- --browser=firefox --headed --spec **/**/e2e/redteam/**/**/**"'
options:
runFromWorkspaceRoot: true
cy-ci-safari-redteam:
local: true
command: 'npx -c "moon run @redeye/e2e:run-cypress -- --browser=webkit --headed --spec **/**/e2e/redteam/**/**/** & moon run @redeye/client:start-dev @redeye/server:start-dev || exit 0"'
command: 'concurrently "yarn start:server" "yarn start:client" "yarn moon run redeye-e2e:run-cypress -- --browser=webkit --headed --spec **/**/e2e/redteam/**/**/**"'
options:
runFromWorkspaceRoot: true
cy-ci-chrome-blueteam:
local: true
command: 'npx -c "moon run @redeye/e2e:run-cypress -- --headed --browser=chrome --spec **/**/e2e/blueteam/**/**/** & SERVER_BLUE_TEAM=true moon run @redeye/client:start-dev @redeye/server:start-dev || exit 0"'
command: 'concurrently "SERVER_BLUE_TEAM=true yarn start:server" "SERVER_BLUE_TEAM=true yarn start:client" "yarn moon run redeye-e2e:run-cypress -- --headed --browser=chrome --spec **/**/e2e/blueteam/**/**/**"'
options:
runFromWorkspaceRoot: true
61 changes: 34 additions & 27 deletions applications/server/.swcrc
Original file line number Diff line number Diff line change
@@ -1,28 +1,35 @@
{
"minify": true,
"exclude": ["node_modules","jest.config.ts",".*.spec.tsx?$",".*.test.tsx?$","./src/jest-setup.ts$","./**/jest-setup.ts$",".*.js$"],
"jsc": {
"baseUrl": ".",
"target": "es2018",
"keepClassNames": true,
"loose": false,
"parser": {
"syntax": "typescript",
"tsx": false,
"decorators": true,
"dynamicImport": true
},
"transform": {
"legacyDecorator": true,
"decoratorMetadata": true
}
},
"module": {
"type": "commonjs",
"strict": true,
"strictMode": true,
"lazy": false,
"noInterop": false
}
}

"minify": true,
"exclude": [
"node_modules",
"jest.config.ts",
".*.spec.tsx?$",
".*.test.tsx?$",
"./src/jest-setup.ts$",
"./**/jest-setup.ts$",
".*.js$"
],
"jsc": {
// "baseUrl": ".",
"target": "es2018",
"keepClassNames": true,
"loose": false,
"parser": {
"syntax": "typescript",
"tsx": false,
"decorators": true,
"dynamicImport": true
},
"transform": {
"legacyDecorator": true,
"decoratorMetadata": true
}
},
"module": {
"type": "commonjs",
"strict": true,
"strictMode": true,
"lazy": false,
"noInterop": false
}
}
1 change: 1 addition & 0 deletions applications/server/moon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ tasks:
- ~:start-node
options:
runInCI: false
runDepsInParallel: false
release-mac:
deps:
- '@redeye/client:build'
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
"@mikro-orm/entity-generator": "5.6.6",
"@mikro-orm/migrations": "5.6.6",
"@mikro-orm/seeder": "5.6.6",
"@moonrepo/cli": "^0.25.4",
"@moonrepo/cli": "^0.26.1",
"@swc/cli": "~0.1.55",
"@swc/core": "~1.2.143",
"@swc/helpers": "~0.3.3",
Expand Down Expand Up @@ -202,7 +202,7 @@
"vite-tsconfig-paths": "^3.5.0"
},
"lint-staged": {
"**/*.{json,yml,yaml,js,jsx,ts,tsx}": [
"**/*.{json,yml,yaml,js,jsx,ts,tsx,graphql}": [
"yarn prettier --ignore-path .gitignore --write"
]
},
Expand Down
57 changes: 32 additions & 25 deletions packages/cs-parser/.swcrc
Original file line number Diff line number Diff line change
@@ -1,27 +1,34 @@
{
"minify": true,
"exclude": ["node_modules","jest.config.ts",".*.spec.tsx?$",".*.test.tsx?$","./src/jest-setup.ts$","./**/jest-setup.ts$",".*.js$"],
"jsc": {
"baseUrl": ".",
"target": "es2018",
"keepClassNames": true,
"loose": false,
"parser": {
"syntax": "typescript",
"tsx": false,
"decorators": true,
"dynamicImport": true
},
"transform": {
"legacyDecorator": true,
"decoratorMetadata": true
}
},
"module": {
"type": "commonjs",
"strict": true,
"strictMode": true,
"lazy": false,
"noInterop": false
}
"minify": true,
"exclude": [
"node_modules",
"jest.config.ts",
".*.spec.tsx?$",
".*.test.tsx?$",
"./src/jest-setup.ts$",
"./**/jest-setup.ts$",
".*.js$"
],
"jsc": {
"target": "es2018",
"keepClassNames": true,
"loose": false,
"parser": {
"syntax": "typescript",
"tsx": false,
"decorators": true,
"dynamicImport": true
},
"transform": {
"legacyDecorator": true,
"decoratorMetadata": true
}
},
"module": {
"type": "commonjs",
"strict": true,
"strictMode": true,
"lazy": false,
"noInterop": false
}
}
57 changes: 32 additions & 25 deletions packages/models/.swcrc
Original file line number Diff line number Diff line change
@@ -1,27 +1,34 @@
{
"minify": true,
"exclude": ["node_modules","jest.config.ts",".*.spec.tsx?$",".*.test.tsx?$","./src/jest-setup.ts$","./**/jest-setup.ts$",".*.js$"],
"jsc": {
"baseUrl": ".",
"target": "es2018",
"keepClassNames": true,
"loose": false,
"parser": {
"syntax": "typescript",
"tsx": false,
"decorators": true,
"dynamicImport": true
},
"transform": {
"legacyDecorator": true,
"decoratorMetadata": true
}
},
"module": {
"type": "commonjs",
"strict": true,
"strictMode": true,
"lazy": false,
"noInterop": false
}
"minify": true,
"exclude": [
"node_modules",
"jest.config.ts",
".*.spec.tsx?$",
".*.test.tsx?$",
"./src/jest-setup.ts$",
"./**/jest-setup.ts$",
".*.js$"
],
"jsc": {
"target": "es2018",
"keepClassNames": true,
"loose": false,
"parser": {
"syntax": "typescript",
"tsx": false,
"decorators": true,
"dynamicImport": true
},
"transform": {
"legacyDecorator": true,
"decoratorMetadata": true
}
},
"module": {
"type": "commonjs",
"strict": true,
"strictMode": true,
"lazy": false,
"noInterop": false
}
}
Loading

0 comments on commit d31fb14

Please sign in to comment.