Skip to content

Commit

Permalink
Merge branch 'main' into tsuf/sdk-spec-test-gcp
Browse files Browse the repository at this point in the history
  • Loading branch information
tsuf239 committed Jun 30, 2024
2 parents 5d3f769 + 7fe1e21 commit 75d8bd3
Show file tree
Hide file tree
Showing 444 changed files with 10,704 additions and 10,428 deletions.
4 changes: 1 addition & 3 deletions .github/ISSUE_TEMPLATE/feature.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@ body:
id: use-cases
attributes:
label: Use Case
placeholder: |
What problem are you trying to solve? Describe a *concrete* example of something you are trying to do and as many details as possible
about your motivation, the environment, etc.
placeholder: What problem are you trying to solve? Describe a *concrete* example of something you are trying to do and as many details as possible about your motivation, the environment, etc.
validations:
required: true

Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,10 @@ on:
- opened
- synchronize
paths-ignore:
- "docs/**"
- "logo/**"
push:
branches:
- main
- dev
workflow_dispatch: {}

concurrency:
Expand Down
7 changes: 1 addition & 6 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,8 @@ pull_request_rules:
- "#review-threads-unresolved=0"
- -approved-reviews-by~=author
- check-success=Validate PR title
- check-success=Quality Gate
- base=main
- or:
- check-success=Quality Gate
- and:
- -files~=^(?!docs/|logo/)
# These files must be generated via wingsdk build
- -files~=^docs/docs/04-standard-library/[^/]+/[^/]+\.md$

- name: requires manual merge
conditions:
Expand Down
2 changes: 1 addition & 1 deletion apps/jsii-docgen/.projen/deps.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apps/jsii-docgen/.projenrc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const project = new typescript.TypeScriptProject({
devDeps: [
"vitest",
"tsx",
"jsii@~5.3.11",
"jsii@~5.3.39",
"@types/fs-extra",
"@types/semver",
"@types/yargs@^16",
Expand Down
20 changes: 10 additions & 10 deletions apps/jsii-docgen/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@
"@aws-cdk/aws-s3": "1.204.0",
"@aws-cdk/cloud-assembly-schema": "1.204.0",
"@aws-cdk/core": "1.204.0",
"constructs": "3.4.344",
"@types/node": "^20.11.0",
"@types/prettier": "2.6.0",
"jsii": "~5.3.11",
"typescript": "^5.3.3"
"constructs": "3.4.344",
"jsii": "~5.3.39",
"typescript": "^5.5.2"
},
"license": "Apache-2.0",
"version": "0.0.0"
Expand Down
20 changes: 10 additions & 10 deletions apps/vscode-wing/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions apps/wing-api-checker/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions apps/wing-console/console/app/demo/main.w
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
bring cloud;
bring ex;
bring ui;
bring util;
bring sim;

let errorService = new cloud.Service(inflight () => {}) as "ErrorService";

let errorResource = new sim.Resource(inflight () => {
util.sleep(5s);
throw "Oops";
}) as "ErrorResource" in errorService;

// @see https://github.com/winglang/wing/issues/4237 it crashes the Console preview env.
//let secret = new cloud.Secret(name: "my-secret");
Expand Down
36 changes: 18 additions & 18 deletions apps/wing-console/console/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,38 +19,38 @@
"package": "bump-pack -b"
},
"dependencies": {
"@segment/analytics-node": "^1.1.0",
"@segment/analytics-node": "^1.3.0",
"@wingconsole/server": "workspace:^",
"cross-spawn": "^7.0.3",
"express": "^4.19.2",
"open": "^8.4.2",
"picocolors": "^1.0.0"
"picocolors": "^1.0.1"
},
"devDependencies": {
"@ibm/plex": "^6.3.0",
"@playwright/test": "^1.37.1",
"@ibm/plex": "^6.4.1",
"@playwright/test": "^1.44.1",
"@tailwindcss/forms": "^0.5.7",
"@types/cross-spawn": "^6.0.6",
"@types/express": "^4.17.17",
"@types/react": "^18.2.21",
"@types/react-dom": "^18.2.7",
"@vitejs/plugin-react": "^4.2.1",
"@types/express": "^4.17.21",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"@vitejs/plugin-react": "^4.3.1",
"@vitest/coverage-v8": "^1.6.0",
"@wingconsole/eslint-plugin": "workspace:^",
"@wingconsole/tsconfig": "workspace:^",
"@wingconsole/ui": "workspace:^",
"autoprefixer": "^10.4.15",
"autoprefixer": "^10.4.19",
"bump-pack": "workspace:^",
"dotenv": "^16.3.1",
"eslint": "^8.48.0",
"dotenv": "^16.4.5",
"eslint": "^8.57.0",
"nanoid": "^4.0.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"tailwindcss": "^3.4.3",
"tsup": "^8.0.2",
"tsx": "^4.7.0",
"typescript": "^5.2.2",
"vite": "^4.5.2"
"react": "^18.3.1",
"react-dom": "^18.3.1",
"tailwindcss": "^3.4.4",
"tsup": "^8.1.0",
"tsx": "^4.15.7",
"typescript": "^5.5.2",
"vite": "^4.5.3"
},
"volta": {
"extends": "../../../../package.json"
Expand Down
36 changes: 18 additions & 18 deletions apps/wing-console/console/design-system/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,38 +28,38 @@
"package": "bump-pack -b"
},
"dependencies": {
"@headlessui/react": "^1.7.17",
"@heroicons/react": "^2.0.18",
"@headlessui/react": "^1.7.19",
"@heroicons/react": "^2.1.4",
"@popperjs/core": "^2.11.8",
"@tailwindcss/forms": "^0.5.7",
"@tailwindcss/typography": "^0.5.12",
"@tailwindcss/typography": "^0.5.13",
"classnames": "^2.5.1",
"lodash.uniq": "^4.5.0",
"nanoid": "^4.0.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-popper": "^2.3.0",
"tailwindcss": "^3.4.3"
"tailwindcss": "^3.4.4"
},
"devDependencies": {
"@babel/core": "^7.23.9",
"@storybook/react": "^7.4.0",
"@testing-library/react": "^14.0.0",
"@types/lodash.uniq": "^4.5.7",
"@types/react": "^18.2.21",
"@types/react-dom": "^18.2.7",
"@vitejs/plugin-react": "^4.2.1",
"@babel/core": "^7.24.7",
"@storybook/react": "^7.6.19",
"@testing-library/react": "^14.3.1",
"@types/lodash.uniq": "^4.5.9",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"@vitejs/plugin-react": "^4.3.1",
"@vitest/coverage-v8": "^1.6.0",
"@wingconsole/eslint-plugin": "workspace:^",
"@wingconsole/tsconfig": "workspace:^",
"bump-pack": "workspace:^",
"eslint": "^8.48.0",
"eslint": "^8.57.0",
"happy-dom": "^9.20.3",
"tsup": "^8.0.2",
"typescript": "^5.2.2",
"vite": "^4.5.2",
"tsup": "^8.1.0",
"typescript": "^5.5.2",
"vite": "^4.5.3",
"vitest": "^1.6.0",
"webpack": "^5.88.2"
"webpack": "^5.92.1"
},
"volta": {
"extends": "../../../../package.json"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,9 @@ export const TreeItem = ({

useEffect(() => {
if (selected) {
ref.current?.scrollIntoView();
ref.current?.scrollIntoView({
block: "nearest",
});
}
}, [selected, ref]);

Expand Down
32 changes: 16 additions & 16 deletions apps/wing-console/console/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,39 +21,39 @@
"@winglang/compiler": "workspace:^",
"@winglang/sdk": "workspace:^",
"codespan-wasm": "^0.4.0",
"debug": "^4.3.4",
"launch-editor": "^2.6.0",
"debug": "^4.3.5",
"launch-editor": "^2.8.0",
"ms": "^2.1.3"
},
"devDependencies": {
"@trpc/server": "^10.45.2",
"@types/cors": "^2.8.13",
"@types/express": "^4.17.17",
"@types/lodash.uniqby": "^4.7.7",
"@types/ws": "^8.5.5",
"@types/cors": "^2.8.17",
"@types/express": "^4.17.21",
"@types/lodash.uniqby": "^4.7.9",
"@types/ws": "^8.5.10",
"@vitest/coverage-v8": "^1.6.0",
"@wingconsole/error-message": "workspace:^",
"@wingconsole/eslint-plugin": "workspace:^",
"@wingconsole/tsconfig": "workspace:^",
"bump-pack": "workspace:^",
"chokidar": "^3.5.3",
"constructs": "^10.3",
"chokidar": "^3.6.0",
"constructs": "^10.3.0",
"cors": "^2.8.5",
"emittery": "^1.0.1",
"emittery": "^1.0.3",
"env-paths": "^3.0.0",
"esbuild-plugin-raw": "^0.1.7",
"eslint": "^8.48.0",
"esbuild-plugin-raw": "^0.1.8",
"eslint": "^8.57.0",
"express": "^4.19.2",
"get-port": "^6.1.2",
"lodash.uniqby": "^4.7.0",
"nanoid": "^4.0.2",
"node-fetch": "^3.3.2",
"redis": "^4.6.8",
"tsup": "^8.0.2",
"typescript": "^5.2.2",
"redis": "^4.6.14",
"tsup": "^8.1.0",
"typescript": "^5.5.2",
"vitest": "^1.6.0",
"ws": "^8.13.0",
"zod": "^3.22.2"
"ws": "^8.17.1",
"zod": "^3.23.8"
},
"volta": {
"extends": "../../../../package.json"
Expand Down
1 change: 0 additions & 1 deletion apps/wing-console/console/server/src/expressServer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ export const createExpressServer = async ({
"/trpc",
trpcExpress.createExpressMiddleware({
router,
batching: { enabled: false },
createContext,
}),
);
Expand Down
Loading

0 comments on commit 75d8bd3

Please sign in to comment.