From 9f499b4b25b5f7a4c0007fb8f0f156cdeaa396a7 Mon Sep 17 00:00:00 2001 From: Christopher Rybicki Date: Sat, 26 Nov 2022 14:22:16 -0500 Subject: [PATCH 1/3] fix(compiler): cannot compile with node >= 19 --- .github/workflows/build.yml | 5 +-- apps/vscode-wing/package-lock.json | 12 +++---- apps/wing-playground/package-lock.json | 45 +++++++++++++++----------- apps/wing/package-lock.json | 45 +++++++++++++++----------- libs/wingsdk/package-lock.json | 11 ++++--- libs/wingsdk/package.json | 2 +- 6 files changed, 69 insertions(+), 51 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d7d28585f8..58da8796ae 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -249,7 +249,8 @@ jobs: matrix: include: # - runner: macos-latest - - runner: ubuntu-latest + - runner: [ubuntu-latest] + - node: [18, 19] runs-on: ${{ matrix.runner }} steps: - name: Checkout @@ -261,7 +262,7 @@ jobs: - name: Setup Node uses: actions/setup-node@v3 with: - node-version: ${{ env.NODEJS_VERSION }} + node-version: ${{ matrix.node }} - name: Install Dependencies uses: bahmutov/npm-install@v1 diff --git a/apps/vscode-wing/package-lock.json b/apps/vscode-wing/package-lock.json index d668bb38a5..0d992546e9 100644 --- a/apps/vscode-wing/package-lock.json +++ b/apps/vscode-wing/package-lock.json @@ -2123,7 +2123,6 @@ "version": "0.1.13", "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", - "dev": true, "optional": true, "dependencies": { "iconv-lite": "^0.6.2" @@ -3704,7 +3703,6 @@ "version": "0.6.3", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "dev": true, "optional": true, "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" @@ -6749,7 +6747,6 @@ "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true, "optional": true }, "node_modules/sax": { @@ -8863,7 +8860,8 @@ "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "dev": true + "dev": true, + "requires": {} }, "acorn-walk": { "version": "8.2.0", @@ -9640,7 +9638,6 @@ "version": "0.1.13", "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", - "dev": true, "optional": true, "requires": { "iconv-lite": "^0.6.2" @@ -9986,7 +9983,8 @@ "version": "8.5.0", "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz", "integrity": "sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==", - "dev": true + "dev": true, + "requires": {} }, "eslint-import-resolver-node": { "version": "0.3.6", @@ -10720,7 +10718,6 @@ "version": "0.6.3", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "dev": true, "optional": true, "requires": { "safer-buffer": ">= 2.1.2 < 3.0.0" @@ -12900,7 +12897,6 @@ "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true, "optional": true }, "sax": { diff --git a/apps/wing-playground/package-lock.json b/apps/wing-playground/package-lock.json index cf649e7efc..2715c83dfe 100644 --- a/apps/wing-playground/package-lock.json +++ b/apps/wing-playground/package-lock.json @@ -23,9 +23,12 @@ "version": "0.0.0", "bundleDependencies": [ "@aws-sdk/client-cloudwatch-logs", + "@aws-sdk/client-dynamodb", "@aws-sdk/client-lambda", "@aws-sdk/client-s3", "@aws-sdk/client-sqs", + "@aws-sdk/types", + "@aws-sdk/util-stream-node", "@aws-sdk/util-utf8-node", "esbuild-wasm", "safe-stable-stringify", @@ -33,16 +36,19 @@ ], "license": "Apache-2.0", "dependencies": { - "@aws-sdk/client-cloudwatch-logs": "^3.171.0", - "@aws-sdk/client-lambda": "^3.171.0", - "@aws-sdk/client-s3": "^3.171.0", - "@aws-sdk/client-sqs": "^3.171.0", - "@aws-sdk/util-utf8-node": "^3.170.0", + "@aws-sdk/client-cloudwatch-logs": "3.215.0", + "@aws-sdk/client-dynamodb": "3.215.0", + "@aws-sdk/client-lambda": "3.215.0", + "@aws-sdk/client-s3": "3.215.0", + "@aws-sdk/client-sqs": "3.215.0", + "@aws-sdk/types": "3.215.0", + "@aws-sdk/util-stream-node": "3.215.0", + "@aws-sdk/util-utf8-node": "3.208.0", "@cdktf/provider-aws": "^10.0.11", - "@winglang/polycons": "^0.0.105", "cdktf": "^0.13.2", "constructs": "~10.0.25", - "esbuild-wasm": "^0.15.9", + "esbuild-wasm": "^0.15.15", + "polycons": "^0.1.1", "safe-stable-stringify": "*", "tar": "^6.1.11" }, @@ -55,6 +61,7 @@ "@types/tar": "^6.1.3", "@typescript-eslint/eslint-plugin": "^5", "@typescript-eslint/parser": "^5", + "@winglang/jsii-docgen": "^7.0.159", "@winglang/wing-api-checker": "file:../../apps/wing-api-checker", "aws-sdk-client-mock": "^2.0.0", "cdktf-cli": "^0.12.2", @@ -69,7 +76,6 @@ "jest-junit": "^13", "jsii": "^1.68.0", "jsii-diff": "^1.68.0", - "jsii-docgen": "^7.0.91", "jsii-pacmak": "^1.68.0", "json-schema": "^0.4.0", "minipass": "3.1.6", @@ -88,9 +94,9 @@ }, "peerDependencies": { "@cdktf/provider-aws": "^10.0.11", - "@winglang/polycons": "^0.0.105", "cdktf": "^0.13.2", - "constructs": "~10.0.25" + "constructs": "~10.0.25", + "polycons": "^0.1.1" } }, "node_modules/@esbuild-plugins/node-globals-polyfill": { @@ -934,11 +940,14 @@ "@winglang/wingsdk": { "version": "file:../../libs/wingsdk", "requires": { - "@aws-sdk/client-cloudwatch-logs": "^3.171.0", - "@aws-sdk/client-lambda": "^3.171.0", - "@aws-sdk/client-s3": "^3.171.0", - "@aws-sdk/client-sqs": "^3.171.0", - "@aws-sdk/util-utf8-node": "^3.170.0", + "@aws-sdk/client-cloudwatch-logs": "3.215.0", + "@aws-sdk/client-dynamodb": "3.215.0", + "@aws-sdk/client-lambda": "3.215.0", + "@aws-sdk/client-s3": "3.215.0", + "@aws-sdk/client-sqs": "3.215.0", + "@aws-sdk/types": "3.215.0", + "@aws-sdk/util-stream-node": "3.215.0", + "@aws-sdk/util-utf8-node": "3.208.0", "@cdktf/provider-aws": "^10.0.11", "@types/aws-lambda": "^8.10.104", "@types/fs-extra": "^9.0.13", @@ -948,13 +957,13 @@ "@types/tar": "^6.1.3", "@typescript-eslint/eslint-plugin": "^5", "@typescript-eslint/parser": "^5", - "@winglang/polycons": "^0.0.105", + "@winglang/jsii-docgen": "^7.0.159", "@winglang/wing-api-checker": "file:../../apps/wing-api-checker", "aws-sdk-client-mock": "^2.0.0", "cdktf": "^0.13.2", "cdktf-cli": "^0.12.2", "constructs": "~10.0.25", - "esbuild-wasm": "^0.15.9", + "esbuild-wasm": "^0.15.15", "eslint": "^8", "eslint-config-prettier": "^8.5.0", "eslint-import-resolver-node": "^0.3.6", @@ -966,12 +975,12 @@ "jest-junit": "^13", "jsii": "^1.68.0", "jsii-diff": "^1.68.0", - "jsii-docgen": "^7.0.91", "jsii-pacmak": "^1.68.0", "json-schema": "^0.4.0", "minipass": "3.1.6", "npm-check-updates": "^15", "patch-package": "^6.4.7", + "polycons": "^0.1.1", "prettier": "^2.7.1", "projen": "^0.62.16", "safe-stable-stringify": "*", diff --git a/apps/wing/package-lock.json b/apps/wing/package-lock.json index 249912dd33..24c6a48f8d 100644 --- a/apps/wing/package-lock.json +++ b/apps/wing/package-lock.json @@ -38,9 +38,12 @@ "version": "0.0.0", "bundleDependencies": [ "@aws-sdk/client-cloudwatch-logs", + "@aws-sdk/client-dynamodb", "@aws-sdk/client-lambda", "@aws-sdk/client-s3", "@aws-sdk/client-sqs", + "@aws-sdk/types", + "@aws-sdk/util-stream-node", "@aws-sdk/util-utf8-node", "esbuild-wasm", "safe-stable-stringify", @@ -48,16 +51,19 @@ ], "license": "Apache-2.0", "dependencies": { - "@aws-sdk/client-cloudwatch-logs": "^3.171.0", - "@aws-sdk/client-lambda": "^3.171.0", - "@aws-sdk/client-s3": "^3.171.0", - "@aws-sdk/client-sqs": "^3.171.0", - "@aws-sdk/util-utf8-node": "^3.170.0", + "@aws-sdk/client-cloudwatch-logs": "3.215.0", + "@aws-sdk/client-dynamodb": "3.215.0", + "@aws-sdk/client-lambda": "3.215.0", + "@aws-sdk/client-s3": "3.215.0", + "@aws-sdk/client-sqs": "3.215.0", + "@aws-sdk/types": "3.215.0", + "@aws-sdk/util-stream-node": "3.215.0", + "@aws-sdk/util-utf8-node": "3.208.0", "@cdktf/provider-aws": "^10.0.11", - "@winglang/polycons": "^0.0.105", "cdktf": "^0.13.2", "constructs": "~10.0.25", - "esbuild-wasm": "^0.15.9", + "esbuild-wasm": "^0.15.15", + "polycons": "^0.1.1", "safe-stable-stringify": "*", "tar": "^6.1.11" }, @@ -70,6 +76,7 @@ "@types/tar": "^6.1.3", "@typescript-eslint/eslint-plugin": "^5", "@typescript-eslint/parser": "^5", + "@winglang/jsii-docgen": "^7.0.159", "@winglang/wing-api-checker": "file:../../apps/wing-api-checker", "aws-sdk-client-mock": "^2.0.0", "cdktf-cli": "^0.12.2", @@ -84,7 +91,6 @@ "jest-junit": "^13", "jsii": "^1.68.0", "jsii-diff": "^1.68.0", - "jsii-docgen": "^7.0.91", "jsii-pacmak": "^1.68.0", "json-schema": "^0.4.0", "minipass": "3.1.6", @@ -103,9 +109,9 @@ }, "peerDependencies": { "@cdktf/provider-aws": "^10.0.11", - "@winglang/polycons": "^0.0.105", "cdktf": "^0.13.2", - "constructs": "~10.0.25" + "constructs": "~10.0.25", + "polycons": "^0.1.1" } }, "node_modules/@ampproject/remapping": { @@ -5521,11 +5527,14 @@ "@winglang/wingsdk": { "version": "file:../../libs/wingsdk", "requires": { - "@aws-sdk/client-cloudwatch-logs": "^3.171.0", - "@aws-sdk/client-lambda": "^3.171.0", - "@aws-sdk/client-s3": "^3.171.0", - "@aws-sdk/client-sqs": "^3.171.0", - "@aws-sdk/util-utf8-node": "^3.170.0", + "@aws-sdk/client-cloudwatch-logs": "3.215.0", + "@aws-sdk/client-dynamodb": "3.215.0", + "@aws-sdk/client-lambda": "3.215.0", + "@aws-sdk/client-s3": "3.215.0", + "@aws-sdk/client-sqs": "3.215.0", + "@aws-sdk/types": "3.215.0", + "@aws-sdk/util-stream-node": "3.215.0", + "@aws-sdk/util-utf8-node": "3.208.0", "@cdktf/provider-aws": "^10.0.11", "@types/aws-lambda": "^8.10.104", "@types/fs-extra": "^9.0.13", @@ -5535,13 +5544,13 @@ "@types/tar": "^6.1.3", "@typescript-eslint/eslint-plugin": "^5", "@typescript-eslint/parser": "^5", - "@winglang/polycons": "^0.0.105", + "@winglang/jsii-docgen": "^7.0.159", "@winglang/wing-api-checker": "file:../../apps/wing-api-checker", "aws-sdk-client-mock": "^2.0.0", "cdktf": "^0.13.2", "cdktf-cli": "^0.12.2", "constructs": "~10.0.25", - "esbuild-wasm": "^0.15.9", + "esbuild-wasm": "^0.15.15", "eslint": "^8", "eslint-config-prettier": "^8.5.0", "eslint-import-resolver-node": "^0.3.6", @@ -5553,12 +5562,12 @@ "jest-junit": "^13", "jsii": "^1.68.0", "jsii-diff": "^1.68.0", - "jsii-docgen": "^7.0.91", "jsii-pacmak": "^1.68.0", "json-schema": "^0.4.0", "minipass": "3.1.6", "npm-check-updates": "^15", "patch-package": "^6.4.7", + "polycons": "^0.1.1", "prettier": "^2.7.1", "projen": "^0.62.16", "safe-stable-stringify": "*", diff --git a/libs/wingsdk/package-lock.json b/libs/wingsdk/package-lock.json index ab2da46f67..d5acf30316 100644 --- a/libs/wingsdk/package-lock.json +++ b/libs/wingsdk/package-lock.json @@ -33,7 +33,7 @@ "@cdktf/provider-aws": "^10.0.11", "cdktf": "^0.13.2", "constructs": "~10.0.25", - "esbuild-wasm": "^0.15.9", + "esbuild-wasm": "^0.15.15", "polycons": "^0.1.1", "safe-stable-stringify": "*", "tar": "^6.1.11" @@ -17516,9 +17516,10 @@ } }, "node_modules/esbuild-wasm": { - "version": "0.15.9", + "version": "0.15.15", + "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.15.15.tgz", + "integrity": "sha512-B8OfZ0cm/zvbznYXbHnLRRp31hBObFiDAKnbTeUMHOZkyAbEClHETxSgZ/0fjm4XdkZGcBI/ZTpCa5JSTZVA7A==", "inBundle": true, - "license": "MIT", "bin": { "esbuild": "bin/esbuild" }, @@ -38823,7 +38824,9 @@ "optional": true }, "esbuild-wasm": { - "version": "0.15.9" + "version": "0.15.15", + "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.15.15.tgz", + "integrity": "sha512-B8OfZ0cm/zvbznYXbHnLRRp31hBObFiDAKnbTeUMHOZkyAbEClHETxSgZ/0fjm4XdkZGcBI/ZTpCa5JSTZVA7A==" }, "escalade": { "version": "3.1.1", diff --git a/libs/wingsdk/package.json b/libs/wingsdk/package.json index e17132b657..d98998d0d5 100644 --- a/libs/wingsdk/package.json +++ b/libs/wingsdk/package.json @@ -94,7 +94,7 @@ "@cdktf/provider-aws": "^10.0.11", "cdktf": "^0.13.2", "constructs": "~10.0.25", - "esbuild-wasm": "^0.15.9", + "esbuild-wasm": "^0.15.15", "polycons": "^0.1.1", "safe-stable-stringify": "*", "tar": "^6.1.11" From 7634158a2decb6f573c304e696f66d0f22d7a6c8 Mon Sep 17 00:00:00 2001 From: Christopher Rybicki Date: Sat, 26 Nov 2022 14:33:04 -0500 Subject: [PATCH 2/3] fix workflow --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 58da8796ae..4c10db4142 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -249,7 +249,7 @@ jobs: matrix: include: # - runner: macos-latest - - runner: [ubuntu-latest] + - runner: ubuntu-latest - node: [18, 19] runs-on: ${{ matrix.runner }} steps: From 6165191bd5720d1303cdd531e3de9f147ce7d48d Mon Sep 17 00:00:00 2001 From: Christopher Rybicki Date: Sat, 26 Nov 2022 14:42:54 -0500 Subject: [PATCH 3/3] try another variation --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4c10db4142..51067f48ff 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -247,10 +247,10 @@ jobs: strategy: fail-fast: true matrix: - include: - # - runner: macos-latest - - runner: ubuntu-latest - - node: [18, 19] + runner: + - ubuntu-latest + # - macos-latest + node: [18, 19] runs-on: ${{ matrix.runner }} steps: - name: Checkout