Skip to content

Commit

Permalink
Merge branch 'dev' into jwrigh/1671/exporter-integration
Browse files Browse the repository at this point in the history
  • Loading branch information
HunterBarclay committed Jul 9, 2024
2 parents 64412df + 6020db0 commit 0fb2136
Show file tree
Hide file tree
Showing 50 changed files with 2,279 additions and 929 deletions.
14 changes: 13 additions & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,4 +1,16 @@
# This file is used to auto request reviews for a pull request
# https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners

* @autodesk/synthesis-devs
/exporter/ @autodesk/fusion [email protected]

/fission/src/aps/ @autodesk/fusion [email protected]
/fission/src/mirabuf/ @autodesk/fusion [email protected]
/fission/src/proto/ @autodesk/fusion [email protected]

/fission/src/ui/components/ [email protected] [email protected] [email protected]
/fission/**/*.css [email protected] [email protected] [email protected]

/fission/ @autodesk/fission [email protected]
/installer/ @autodesk/fusion [email protected]

* @autodesk/synthesis-devs [email protected]
17 changes: 13 additions & 4 deletions .github/workflows/FissionESLintFormat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,26 @@ jobs:
cd fission
npm run lint
continue-on-error: true
- name: Check EsLint
run: |
if [ ${{ steps.linter-validation.outcome }} == "success" ]; then
echo "EsLint Validation Passed"
else
echo "EsLint Validation Failed"
exit 1
fi
- name: Prettier
id: prettier-validation
run: |
cd fission
npx prettier --version
npm run prettier
continue-on-error: true
- name: Check Success
- name: Check Prettier
run: |
if [ ${{ steps.linter-validation.outcome }} == "success" ]; then
echo "Format Validation Passed"
if [ ${{ steps.prettier-validation.outcome }} == "success" ]; then
echo "Prettier Validation Passed"
else
echo "Format Validation Failed"
echo "Prettier Validation Failed"
exit 1
fi
15 changes: 12 additions & 3 deletions .github/workflows/FissionPackage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ jobs:
- name: Install Dependencies
run: |
cd fission
rm package-lock.json
npm install
- name: Get package info
Expand All @@ -37,11 +38,19 @@ jobs:
id: build
run: |
cd fission
npm run build
npm run build:prod
npm run build:dev
- name: Upload Artifact
uses: actions/upload-artifact@v4
id: upload-artifact
id: upload-artifact-prod
with:
name: "${{ steps.info.outputs.name }}@${{ steps.info.outputs.version }}[${{ steps.date.outputs.timestamp }}]"
path: fission/dist/
path: fission/dist/prod/

- name: Upload Artifact
uses: actions/upload-artifact@v4
id: upload-artifact-dev
with:
name: "${{ steps.info.outputs.name }}-dev@${{ steps.info.outputs.version }}[${{ steps.date.outputs.timestamp }}]"
path: fission/dist/dev/
94 changes: 64 additions & 30 deletions .github/workflows/FissionUnitTest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,40 +3,74 @@ name: Fission - Unit Test
on:
workflow_dispatch: {}
push:
branches: [ master, dev ]
branches: [master, dev]
pull_request:
branches: [ master, dev ]
branches: [master, dev]

jobs:
runUnitTests:
name: Unit Tests
runs-on: ubuntu-latest
steps:
- name: Checkout Code
uses: actions/checkout@v2
- name: JavaScript Setup
uses: actions/setup-node@v2
with:
node-version: 20
- name: Install Dependencies
run: |
cd fission
rm package-lock.json
npm install
npm install -g run-script-os
npm run assetpack
npm run playwright:install
- name: Unit Tests
id: unit-tests
run: |
cd fission
npm run test
continue-on-error: true
- name: Check Success
run: |
if [ ${{ steps.unit-tests.outcome }} == "success" ]; then
echo "Format Validation Passed"
else
echo "Format Validation Failed"
exit 1
fi
- name: Checkout Code
uses: actions/checkout@v2
- name: JavaScript Setup
uses: actions/setup-node@v2
with:
node-version: 20

- name: Cache downloaded assets
id: cache-assets
uses: actions/cache@v2
with:
path: fission/public/
key: ${{ runner.os }}-assets-v1
restore-keys: |
${{ runner.os }}-assets-
- name: Download assets if not cached
if: steps.cache-assets.outputs.cache-hit != 'true'
run: |
cd fission
curl -o public/assetpack.zip https://synthesis.autodesk.com/Downloadables/assetpack.zip && unzip -o public/assetpack.zip -d public/
- name: Get installed Playwright version
id: playwright-version
run: echo "PLAYWRIGHT_VERSION=$(node -e "console.log(require('./package-lock.json').dependencies['@playwright/test'].version)")" >> $GITHUB_ENV

- name: Cache downloaded browsers
id: cache-browsers
uses: actions/cache@v2
with:
path: |
~/.cache/ms-playwright/
key: ${{ runner.os }}-assets-playwright-${{ env.PLAYWRIGHT_VERSION }}

- name: Install Dependencies
run: |
cd fission
rm package-lock.json
npm install
- name: Download playwright if not cached
if: steps.cache-browsers.outputs.cache-hit != 'true'
run: |
cd fission
npx playwright install --with-deps
npx playwright install-deps
- name: Unit Tests
id: unit-tests
run: |
cd fission
npm run test
continue-on-error: true

- name: Check Success
run: |
if [ ${{ steps.unit-tests.outcome }} == "success" ]; then
echo "Format Validation Passed"
else
echo "Format Validation Failed"
exit 1
fi
2 changes: 2 additions & 0 deletions fission/.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
VITE_SYNTHESIS_SERVER_PATH=/
# VITE_SYNTHESIS_SERVER_PATH=https://synthesis.autodesk.com/
Binary file modified fission/bun.lockb
Binary file not shown.
55 changes: 52 additions & 3 deletions fission/package-lock.json

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

18 changes: 9 additions & 9 deletions fission/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,16 @@
"scripts": {
"dev": "vite --open",
"build": "tsc && vite build",
"lint": "eslint . --ext ts,tsx --report-unused-disable-directives",
"build:prod": "tsc && vite build --base=/fission/ --outDir dist/prod",
"build:dev": "tsc && vite build --base=/fission-closed/ --outDir dist/dev",
"preview": "vite preview --base=/fission/",
"test": "vitest",
"lint:fix": "bun run lint --fix || npm run lint --fix",
"lint": "eslint . --ext ts,tsx --report-unused-disable-directives",
"lint:fix": "eslint . --ext ts,tsx --report-unused-disable-directives --fix",
"prettier": "bun x prettier src --check || npx prettier src --check",
"prettier:fix": "bun run prettier --write || npm run prettier --write",
"prettier:fix": "bun x prettier src --write || npx prettier src --write",
"format": "(bun run prettier:fix && bun run lint:fix) || (npm run prettier:fix && npm run lint:fix)",
"build:prod": "tsc && vite build --base=/fission/",
"assetpack": "run-script-os",
"assetpack:nix": "curl -o public/assetpack.zip https://synthesis.autodesk.com/Downloadables/assetpack.zip && unzip -o public/assetpack.zip -d public/",
"assetpack:win32": "curl -o public/assetpack.zip https://synthesis.autodesk.com/Downloadables/assetpack.zip && tar -xf public/assetpack.zip -C public/",
"assetpack": "curl -o public/assetpack.zip https://synthesis.autodesk.com/Downloadables/assetpack.zip && tar -xf public/assetpack.zip -C public/",
"playwright:install": "bun x playwright install || npx playwright install"
},
"dependencies": {
Expand All @@ -32,11 +31,11 @@
"colord": "^2.9.3",
"framer-motion": "^10.13.1",
"playwright": "^1.45.0",
"lygia": "^1.1.3",
"react": "^18.2.0",
"react-colorful": "^5.6.1",
"react-dom": "^18.2.0",
"react-icons": "^4.10.1",
"run-script-os": "^1.1.6",
"three": "^0.159.0",
"typescript-cookie": "^1.0.6"
},
Expand Down Expand Up @@ -68,8 +67,9 @@
"protobufjs-cli": "^1.1.2",
"tailwindcss": "^3.3.3",
"tsconfig-paths": "^4.2.0",
"typescript": "^5.2.2",
"typescript": "^5.4.5",
"vite": "^5.1.4",
"vite-plugin-glsl": "^1.3.0",
"vite-plugin-singlefile": "^0.13.5",
"vitest": "^1.5.3"
}
Expand Down
1 change: 1 addition & 0 deletions fission/prettier.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ const config = {
},
},
],
endOfLine: "lf",
}

export default config
Loading

0 comments on commit 0fb2136

Please sign in to comment.