Skip to content

Commit

Permalink
build: use pnpm monorepo
Browse files Browse the repository at this point in the history
  • Loading branch information
seven332 committed Dec 3, 2023
1 parent 184c680 commit b97ed5f
Show file tree
Hide file tree
Showing 114 changed files with 4,947 additions and 9,413 deletions.
26 changes: 18 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,29 +12,39 @@ jobs:

steps:
- uses: actions/checkout@v4
name: Checkout
with:
submodules: true

- uses: pnpm/action-setup@v2
name: Install pnpm
with:
version: 8
run_install: false

- uses: actions/setup-node@v3
name: Install Node.js
with:
node-version: 'lts/Iron'
cache: 'npm'
node-version: 20
cache: pnpm
cache-dependency-path: pnpm-lock.yaml

- uses: mymindstorm/setup-emsdk@v11
name: Install Emscripten SDK
with:
version: 3.1.48
version: 3.1.50
actions-cache-folder: 'emsdk-cache'

- run: cmake --version
- run: c++ -v
- run: em++ -v

- run: npm ci
- run: npm run build
- run: xvfb-run -a npm run test
- run: npm run package
- run: pnpm install
- run: pnpm build
- run: xvfb-run -a pnpm test
- run: pnpm run package

- uses: actions/upload-artifact@v3
with:
name: sksl.vsix
path: sksl.vsix
path: packages/extension/sksl.vsix
29 changes: 14 additions & 15 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
node_modules
build
build_integration_test
compile_commands.json
.cache
*.log
*.tgz
*.swp
*.vsix
.DS_Store
src/sksl-wasm.js
wasm/download
wasm/build
wasm/build_test
wasm/.clangd
.vscode/settings.json
.vscode-test

node_modules

packages/wasm/c++/.clangd
packages/wasm/c++/build
packages/wasm/c++/build_test
packages/wasm/src/sksl-wasm.js

packages/extension/build
packages/extension/LICENSE
packages/extension/README.md
packages/extension/sksl.vsix

packages/integration-test/build
8 changes: 4 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[submodule "wasm/third_party/externals/skia"]
path = wasm/third_party/externals/skia
[submodule "packages/wasm/c++/third_party/externals/skia"]
path = packages/wasm/c++/third_party/externals/skia
url = https://github.com/google/skia.git
[submodule "wasm/third_party/externals/googletest"]
path = wasm/third_party/externals/googletest
[submodule "packages/wasm/c++/third_party/externals/googletest"]
path = packages/wasm/c++/third_party/externals/googletest
url = https://github.com/google/googletest.git
8 changes: 5 additions & 3 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package-lock.json
node_modules
build
compile_commands.json
wasm/third_party/externals

packages/wasm/c++

package-lock.json
pnpm-lock.yaml
29 changes: 0 additions & 29 deletions .vscode/launch.json

This file was deleted.

8 changes: 2 additions & 6 deletions .vscodeignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
**
!README.md
!CHANGELOG.md
!LICENSE
!package.json
!build
!resources
!packages/extension/build
!packages/extension/resources
8 changes: 4 additions & 4 deletions jest.config.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { Config } from '@jest/types'

export default <Config.InitialOptions>{
roots: ['<rootDir>/src'],
export default {
roots: [''],
transform: { '\\.tsx?$': 'ts-jest' },
testMatch: ['**/packages/*/src/**/*.test.ts'],
testPathIgnorePatterns: ['/node_modules/', '/integration-test/', '/c\\+\\+/'],
}
Loading

0 comments on commit b97ed5f

Please sign in to comment.