Skip to content

Commit

Permalink
Update TS (google#3875)
Browse files Browse the repository at this point in the history
* updated TS, which broke babylon

* fixed render-fidelity-tools

* update actions

* remove extraneous caching
  • Loading branch information
elalish authored Oct 13, 2022
1 parent 78e739e commit 9b960f3
Show file tree
Hide file tree
Showing 24 changed files with 608 additions and 643 deletions.
17 changes: 2 additions & 15 deletions .github/workflows/deploy-documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,11 @@ jobs:
timeout-minutes: 60

steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: '16.x'

- name: Get npm cache directory
id: npm-cache
run: |
echo "::set-output name=dir::$(npm config get cache)"
- name: Cache npm packages
uses: actions/cache@v2
with:
path: ${{ steps.npm-cache.outputs.dir }}
key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-npm-
- name: NPM install
run: npm ci

Expand Down
17 changes: 2 additions & 15 deletions .github/workflows/fidelity-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,11 @@ jobs:
timeout-minutes: 60

steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: '16.x'

- name: Get npm cache directory
id: npm-cache
run: |
echo "::set-output name=dir::$(npm config get cache)"
- name: Cache npm packages
uses: actions/cache@v2
with:
path: ${{ steps.npm-cache.outputs.dir }}
key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-npm-
- name: NPM install
run: npm ci

Expand Down
17 changes: 2 additions & 15 deletions .github/workflows/unit-tests-third-party.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,11 @@ jobs:
if: github.event.pull_request.base.repo.id != github.event.pull_request.head.repo.id

steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: '16.x'

- name: Get npm cache directory
id: npm-cache
run: |
echo "::set-output name=dir::$(npm config get cache)"
- name: Cache npm packages
uses: actions/cache@v2
with:
path: ${{ steps.npm-cache.outputs.dir }}
key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-npm-
- name: NPM install
run: npm ci

Expand Down
17 changes: 2 additions & 15 deletions .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,11 @@ jobs:
timeout-minutes: 60

steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: '16.x'

- name: Get npm cache directory
id: npm-cache
run: |
echo "::set-output name=dir::$(npm config get cache)"
- name: Cache npm packages
uses: actions/cache@v2
with:
path: ${{ steps.npm-cache.outputs.dir }}
key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-npm-
- name: NPM install
run: npm ci

Expand Down
14 changes: 7 additions & 7 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,6 @@
"http-server": "^14.1.1",
"husky": "^7.0.1",
"lerna": "^5.6.2",
"typescript": "4.3.5"
"typescript": "4.8.4"
}
}
26 changes: 13 additions & 13 deletions packages/model-viewer/package-lock.json

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

2 changes: 1 addition & 1 deletion packages/model-viewer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
"rollup-plugin-dts": "^4.2.2",
"rollup-plugin-polyfill": "^3.0.0",
"rollup-plugin-terser": "^7.0.2",
"typescript": "4.3.5"
"typescript": "4.8.4"
},
"publishConfig": {
"access": "public"
Expand Down
8 changes: 4 additions & 4 deletions packages/model-viewer/src/features/scene-graph/material.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ const $modelVariants = Symbol('modelVariants');
* Material facade implementation for Three.js materials
*/
export class Material extends ThreeDOMElement implements MaterialInterface {
private[$pbrMetallicRoughness]: PBRMetallicRoughness;
private[$normalTexture]: TextureInfo;
private[$occlusionTexture]: TextureInfo;
private[$emissiveTexture]: TextureInfo;
private[$pbrMetallicRoughness]!: PBRMetallicRoughness;
private[$normalTexture]!: TextureInfo;
private[$occlusionTexture]!: TextureInfo;
private[$emissiveTexture]!: TextureInfo;
private[$lazyLoadGLTFInfo]?: LazyLoader;
private[$gltfIndex]: number;
private[$isActive]: boolean;
Expand Down
3 changes: 3 additions & 0 deletions packages/model-viewer/src/utilities/debug.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ export const saveTarget = (target: WebGLRenderTarget, filename: string) => {
ctx.putImageData(img, 0, 0);

output.toBlob(function(blob) {
if (blob == null) {
return;
}
const url = URL.createObjectURL(blob);

const a = document.createElement('a');
Expand Down
14 changes: 7 additions & 7 deletions packages/modelviewer.dev/package-lock.json

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

2 changes: 1 addition & 1 deletion packages/modelviewer.dev/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@
"rollup": "^2.77.2",
"@rollup/plugin-node-resolve": "^13.3.0",
"@rollup/plugin-replace": "^4.0.0",
"typescript": "4.3.5"
"typescript": "4.8.4"
}
}
Loading

0 comments on commit 9b960f3

Please sign in to comment.