diff --git a/.github/workflows/pxt-buildmain.yml b/.github/workflows/pxt-buildmain.yml index 733bc72db25..896198acd75 100644 --- a/.github/workflows/pxt-buildmain.yml +++ b/.github/workflows/pxt-buildmain.yml @@ -31,7 +31,7 @@ jobs: uses: actions/checkout@v2 with: repository: microsoft/pxt-arcade-sim - ref: v0.11.2 + ref: v0.11.8 token: ${{ secrets.GH_TOKEN }} path: node_modules/pxt-arcade-sim - name: pxt ci diff --git a/.github/workflows/pxt-buildpush.yml b/.github/workflows/pxt-buildpush.yml index 658e3839228..4ec3d164403 100644 --- a/.github/workflows/pxt-buildpush.yml +++ b/.github/workflows/pxt-buildpush.yml @@ -31,7 +31,7 @@ jobs: uses: actions/checkout@v2 with: repository: microsoft/pxt-arcade-sim - ref: v0.11.2 + ref: v0.11.8 token: ${{ secrets.GH_TOKEN }} path: node_modules/pxt-arcade-sim - name: pxt ci diff --git a/editor/tsconfig.json b/editor/tsconfig.json index bb01f3c1e6f..6983bb342f6 100644 --- a/editor/tsconfig.json +++ b/editor/tsconfig.json @@ -4,7 +4,7 @@ "noImplicitAny": true, "noImplicitReturns": true, "declaration": true, - "out": "../built/editor.js", + "outFile": "../built/editor.js", "rootDir": ".", "newLine": "LF", "sourceMap": false diff --git a/libs/shader/pxt.json b/libs/shader/pxt.json new file mode 100644 index 00000000000..c4d9baaca59 --- /dev/null +++ b/libs/shader/pxt.json @@ -0,0 +1,4 @@ +{ + "additionalFilePath": "../../node_modules/pxt-common-packages/libs/shader", + "hidden": true +} diff --git a/libs/shader/shims.d.ts b/libs/shader/shims.d.ts new file mode 100644 index 00000000000..c1814c856ca --- /dev/null +++ b/libs/shader/shims.d.ts @@ -0,0 +1,6 @@ +// Auto-generated. Do not edit. + + +declare interface Shader {} + +// Auto-generated. Do not edit. Really. diff --git a/package.json b/package.json index 66de4490917..4b6c58f8634 100644 --- a/package.json +++ b/package.json @@ -33,11 +33,11 @@ "typescript": "4.8.3" }, "dependencies": { - "pxt-common-packages": "10.3.22", - "pxt-core": "8.5.46" + "pxt-common-packages": "10.3.23", + "pxt-core": "8.5.48" }, "optionalDependencies": { - "pxt-arcade-sim": "microsoft/pxt-arcade-sim.git#v0.11.2" + "pxt-arcade-sim": "microsoft/pxt-arcade-sim.git#v0.11.8" }, "scripts": { "serve": "node node_modules/pxt-core/built/pxt.js serve", diff --git a/pxtarget.json b/pxtarget.json index f18a65aaef4..e68872b159a 100644 --- a/pxtarget.json +++ b/pxtarget.json @@ -108,6 +108,7 @@ "libs/settings", "libs/settings---files", "libs/sevenseg", + "libs/shader", "libs/sprite-scaling", "libs/storyboard", "libs/template", @@ -138,6 +139,7 @@ "libs/servo", "libs/settings", "libs/sevenseg", + "libs/shader", "libs/thermometer" ] },