[pull] master from google:master

.eslintignore

@@ -1,11 +1,11 @@
 **/node_modules
+scripts/**/*.js
 packages/*/dist
 packages/**/*.d.ts
 packages/*/src/*-css.ts
 
-packages/*/karma.*.js
-
 packages/model-viewer/**/*
+packages/model-viewer-effects/**/*
 packages/modelviewer.dev/**/*
 packages/render-fidelity-tools/**/*
 packages/shared-assets/**/*

.github/workflows/deploy-documentation.yml

@@ -5,53 +5,39 @@ on:
     branches:
       - master
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+permissions:
+  contents: write
+
 jobs:
   deploy_github_pages:
     runs-on: ubuntu-latest
     timeout-minutes: 60
 
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-node@v1
+    - uses: actions/checkout@v6
       with:
-        node-version: '12.x'
+        submodules: true
 
-    - 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-
+    - uses: actions/setup-node@v6
 
     - name: NPM install
       run: npm ci
 
     # - name: Lint TypeScript sources
     #   run: npm run lint
 
-    - name: Bootstrap packages
-      run: npm run bootstrap
-
     - name: Build packages
       run: npm run build
 
-    - name: Generate fidelity artifacts 
-      continue-on-error: true
-      uses: GabrielBB/xvfb-action@v1.0
-      with:
-        run: ./node_modules/.bin/lerna run --scope @google/model-viewer-render-fidelity-tools test --stream
-
     - name: Stage documentation artifacts
       run: ./packages/modelviewer.dev/scripts/ci-before-deploy.sh
 
     - name: Deploy to Github Pages
-      uses: peaceiris/actions-gh-pages@v3
+      uses: peaceiris/actions-gh-pages@v4
       with:
         github_token: ${{ secrets.GITHUB_TOKEN }}
         publish_branch: gh-pages

.github/workflows/fidelity-tests.yml

@@ -5,42 +5,26 @@ on: pull_request
 jobs:
   compare_renders:
     runs-on: ubuntu-latest
-    timeout-minutes: 60
+    timeout-minutes: 90
 
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-node@v1
+    - uses: actions/checkout@v6
       with:
-        node-version: '12.x'
+        submodules: true
 
-    - 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-
+    - uses: actions/setup-node@v6
 
     - name: NPM install
       run: npm ci
 
     # - name: Lint TypeScript sources
     #   run: npm run lint
 
-    - name: Bootstrap packages
-      run: npm run bootstrap
-
     - name: Build packages
       run: |
-       ./node_modules/.bin/lerna run --scope @google/model-viewer build --stream
-       ./node_modules/.bin/lerna run --scope @google/model-viewer-render-fidelity-tools build --stream
+       npm run build --workspace=@google/model-viewer --workspace=@google/model-viewer-render-fidelity-tools
 
     - name: Fidelity tests
-      uses: GabrielBB/xvfb-action@v1.0
+      uses: coactions/setup-xvfb@v1
       with:
-        run: ./node_modules/.bin/lerna run --scope @google/model-viewer-render-fidelity-tools test --stream
+        run: npm run test --workspace=@google/model-viewer-render-fidelity-tools -- --quiet

.github/workflows/unit-tests.yml

@@ -1,50 +1,44 @@
 name: Unit tests
 
-on: [push]
+on: pull_request
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   full_test_run:
 
-    env:
-      USE_BROWSER_STACK: true
-
     runs-on: ubuntu-latest
     timeout-minutes: 60
 
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-node@v1
+    - uses: actions/checkout@v6
       with:
-        node-version: '12.x'
+        submodules: true
 
-    - name: Get npm cache directory
-      id: npm-cache
-      run: |
-        echo "::set-output name=dir::$(npm config get cache)"
+    - uses: actions/setup-node@v6
+
+    - name: NPM install
+      run: npm ci
 
-    - name: Cache npm packages
-      uses: actions/cache@v2
+    - name: Cache Playwright browsers
+      uses: actions/cache@v4
+      id: playwright-cache
       with:
-        path: ${{ steps.npm-cache.outputs.dir }}
-        key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
+        path: ~/.cache/ms-playwright
+        key: ${{ runner.os }}-playwright-${{ hashFiles('package-lock.json') }}
         restore-keys: |
-          ${{ runner.os }}-npm-
+          ${{ runner.os }}-playwright-
 
-    - name: NPM install
-      run: npm ci
+    - name: Install playwright browsers
+      run: npx playwright install --with-deps
 
     # - name: Lint TypeScript sources
     #   run: npm run lint
 
-    - name: Bootstrap packages
-      run: npm run bootstrap
-
     - name: Build packages
       run: npm run build
 
     - name: Unit tests
-      env:
-        BROWSER_STACK_USERNAME: ${{ secrets.BROWSER_STACK_USERNAME }}
-        BROWSER_STACK_ACCESS_KEY: ${{ secrets.BROWSER_STACK_ACCESS_KEY }}
-        BROWSER_STACK_BUILD_NAME: ${{ format('{0} / {1}', github.ref, github.run_id) }}
       run: npm run test:ci

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "packages/shared-assets/models/glTF-Sample-Assets"]
+	path = packages/shared-assets/models/glTF-Sample-Assets
+	url = https://github.com/KhronosGroup/glTF-Sample-Assets.git

.nvmrc

@@ -1 +1 @@
-12
+24

README.md

@@ -1,6 +1,6 @@
 # The `<model-viewer>` project
 
-This is the main Github repository for the `<model-viewer>` web component and
+This is the main GitHub repository for the `<model-viewer>` web component and
 all of its related projects.
 
 **Getting started?** Check out the [`<model-viewer>`](packages/model-viewer) project!
@@ -10,12 +10,16 @@ Check out the README.md files for specific projects to get more details:
 
 👩‍🚀 **[`<model-viewer>`](packages/model-viewer)** • The `<model-viewer>` web component (probably what you are looking for)
 
+✨ **[`<model-viewer-effects>`](packages/model-viewer-effects)** • The PostProcessing plugin for `<model-viewer>`
+
 🌐 **[modelviewer.dev](packages/modelviewer.dev)** • The source for the `<model-viewer>` documentation website
 
 🖼 **[render-fidelity-tools](packages/render-fidelity-tools)** • Tools for testing how well `<model-viewer>` renders models
 
 🎨 **[shared-assets](packages/shared-assets)** • 3D models, environment maps and other assets shared across many sub-projects
 
+🚀 **[space-opera](packages/space-opera/)** • The source of the `<model-viewer>` [editor](https://modelviewer.dev/editor/)
+
 ## Development
 
 When developing across all the projects in this repository, first install git,
@@ -27,7 +31,6 @@ Then, perform the following steps to get set up for development:
 git clone --depth=1 git@github.com:google/model-viewer.git
 cd model-viewer
 npm install
-npm run bootstrap
 ```
 
 Note: depth=1 keeps you from downloading our ~3Gb of history, which is dominated by all the versions of our golden render fidelity images.
@@ -36,7 +39,7 @@ The following global commands are available:
 
 Command                        | Description
 ------------------------------ | -----------
-`npm run bootstrap`            | Bootstraps the project for development and cross-links sub-projects
+`npm ci`                       | Install dependencies and cross-links sub-projects
 `npm run build`                | Runs the build step for all sub-projects
 `npm run serve`                | Runs a web server and opens a new browser tab pointed to the local copy of modelviewer.dev (don't forget to build!)
 `npm run test`                 | Runs tests in all sub-projects that have them
@@ -57,7 +60,6 @@ To clone via HTTPS in WSL (there are known file permissions issues with SSH keys
 git clone --depth=1 https://github.com/google/model-viewer.git
 cd model-viewer
 npm install
-npm run bootstrap
 ```
 
 To run tests in WSL, you need to bind `CHROME_BIN`:
@@ -66,7 +68,7 @@ export CHROME_BIN="/mnt/c/Program Files/Google/Chrome/Application/chrome.exe"
 npm run test
 ```
 
-Note that you should be able to run the `packages/model-viewer` tests with that setup, but running fidelity tests requires GUI support which is only available in WSL on Windows 11.  
+Note that you should be able to run the `packages/model-viewer` and `packages/model-viewer-effects` tests with that setup, but running fidelity tests requires GUI support which is only available in WSL on Windows 11.  
 
 <details>
  <summary>Additional WSL Troubleshooting – provided for reference only</summary>
@@ -81,7 +83,7 @@ export CHROME_BIN="/mnt/c/Program Files/Google/Chrome/Application/chrome.exe"
 npm run test
 ```
 
-Tests in `packages/model-viewer` should now run properly; fidelity tests might still fail (see errors and potential workarounds below).
+Tests in `packages/model-viewer` and `packages/model-viewer-effects` should now run properly; fidelity tests might still fail (see errors and potential workarounds below).
 
 ### Error: `/bin/bash^M: bad interpreter: No such file or directory`
 **Symptom**
@@ -122,4 +124,4 @@ Running `npm run dev` in `packages/model-viewer` on Windows throws error `ERROR:
 **Solution**
 (if you have one please make a PR!)
 
-</details>
+</details>