Skip to content

Commit

Permalink
Merge branch 'main' into chore/cientos-playground-structure-alike
Browse files Browse the repository at this point in the history
  • Loading branch information
alvarosabu committed Nov 7, 2023
2 parents 9ec9829 + e15c060 commit cc50e1f
Show file tree
Hide file tree
Showing 11 changed files with 469 additions and 904 deletions.
27 changes: 27 additions & 0 deletions .github/workflows/actions/pnpm/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# From https://github.com/remirror/template/blob/4f8c5f5629a081217672a8cce1df085510f43913/.github/actions/pnpm/action.yml
name: 'pnpm installation'
description: 'Install and audit dependencies for pnpm'
inputs:
cache: # id of input
description: 'The location of the pnpm cache'
required: true
default: '.pnpm-store'
version: # id of input
description: 'The version to use'
required: false
default: 6.10.0

runs:
using: 'composite'
steps:
- name: install pnpm
run: npm install pnpm@${{ inputs.version }} -g
shell: bash

- name: setup pnpm config
run: pnpm config set store-dir ${{ inputs.cache }}
shell: bash

- name: install dependencies
run: pnpm install --shamefully-hoist
shell: bash
17 changes: 17 additions & 0 deletions .github/workflows/lint-pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: 'Lint PR'

on:
pull_request_target:
types:
- opened
- edited
- synchronize

jobs:
main:
name: Validate PR title
runs-on: ubuntu-latest
steps:
- uses: amannn/action-semantic-pull-request@v5
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
30 changes: 30 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Run linters
on: [push]

env:
PNPM_CACHE_FOLDER: .pnpm-store
HUSKY: 0 # Bypass husky commit hook for CI

jobs:
lint:
name: Lint
runs-on: ubuntu-20.04
strategy:
matrix:
node-version: [16]
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Setup Pnpm
uses: pnpm/action-setup@v2
with:
version: 8
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: 'pnpm'
- name: Install dependencies
run: pnpm install
- name: Run Lint
run: pnpm run lint
12 changes: 6 additions & 6 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
"preview": "vitepress preview"
},
"dependencies": {
"@tresjs/cientos": "^3.0.1",
"@tresjs/core": "^3.2.2",
"@tresjs/cientos": "^3.5.1",
"@tresjs/core": "^3.5.0",
"@tresjs/post-processing": "workspace:^",
"gsap": "^3.11.5"
"gsap": "^3.12.2"
},
"devDependencies": {
"unocss": "^0.52.3",
"unplugin-vue-components": "^0.24.1",
"unocss": "^0.57.2",
"unplugin-vue-components": "^0.25.2",
"vite-svg-loader": "^4.0.0",
"vitepress": "1.0.0-beta.1"
"vitepress": "1.0.0-rc.25"
}
}
5 changes: 5 additions & 0 deletions netlify.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[build.environment]
NODE_VERSION = "18"
[build]
publish = "docs/.vitepress/dist"
command = "pnpm run build && pnpm docs:build"
53 changes: 27 additions & 26 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,37 +1,38 @@
{
"name": "@tresjs/post-processing",
"description": "Post-processing library for TresJS",
"version": "0.5.0",
"type": "module",
"version": "0.5.0",
"packageManager": "[email protected]",
"description": "Post-processing library for TresJS",
"author": "Alvaro Saburido <[email protected]> (https://github.com/alvarosabu/)",
"files": [
"dist",
"*.d.ts"
],
"license": "MIT",
"main": "./dist/tres-postprocessing.js",
"module": "./dist/tres-postprocessing.js",
"keywords": [
"vue",
"3d",
"threejs",
"three",
"post-processing",
"effects",
"fx"
],
"exports": {
".": {
"types": "./dist/index.d.ts",
"import": "./dist/tres-postprocessing.js"
},
"./*": "./*"
},
"main": "./dist/tres-postprocessing.js",
"module": "./dist/tres-postprocessing.js",
"files": [
"dist",
"*.d.ts"
],
"publishConfig": {
"access": "public"
},
"keywords": [
"vue",
"3d",
"threejs",
"three",
"post-processing",
"effects",
"fx"
],
"scripts": {
"dev": "vite",
"dev": "cd playground && npm run dev",
"playground": "cd playground && npm run dev",
"build": "vite build",
"preview": "vite preview",
Expand All @@ -47,16 +48,16 @@
"vue": ">=3.3"
},
"dependencies": {
"@tresjs/core": "^3.4.1",
"@unocss/core": "^0.57.1",
"@tresjs/core": "^3.5.0",
"@unocss/core": "^0.57.2",
"@vueuse/core": "^10.5.0",
"postprocessing": "^6.33.2",
"three-stdlib": "^2.28.3"
"postprocessing": "^6.33.3",
"three-stdlib": "^2.28.5"
},
"devDependencies": {
"@release-it/conventional-changelog": "^7.0.2",
"@tresjs/eslint-config-vue": "^0.2.1",
"@types/three": "^0.157.2",
"@types/three": "^0.158.1",
"@vitejs/plugin-vue": "^4.4.0",
"gsap": "^3.12.2",
"kolorist": "^1.8.0",
Expand All @@ -67,12 +68,12 @@
"rollup-plugin-visualizer": "^5.9.2",
"three": "^0.158.0",
"typescript": "^5.2.2",
"unocss": "^0.57.1",
"unocss": "^0.57.2",
"vite": "^4.5.0",
"vite-plugin-banner": "^0.7.1",
"vite-plugin-dts": "3.6.2",
"vite-plugin-dts": "3.6.3",
"vite-svg-loader": "^4.0.0",
"vitepress": "1.0.0-rc.24",
"vitepress": "1.0.0-rc.25",
"vue": "^3.3.7",
"vue-tsc": "^1.8.22"
}
Expand Down
7 changes: 4 additions & 3 deletions playground/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,20 @@
"version": "0.0.0",
"private": true,
"scripts": {
"dev": "vite",
"dev": "vite --host",
"build": "vue-tsc && vite build",
"preview": "vite preview"
},
"dependencies": {
"@tresjs/cientos": "^3.5.1",
"@tresjs/core": "3.4.1",
"@tresjs/core": "3.5.0",
"@tresjs/leches": "^0.13.0",
"vue-router": "^4.2.5"
},
"devDependencies": {
"@types/three": "^0.158.1",
"unplugin-auto-import": "^0.16.7",
"unplugin-vue-components": "^0.25.2"
"unplugin-vue-components": "^0.25.2",
"vite-plugin-qrcode": "^0.2.2"
}
}
2 changes: 2 additions & 0 deletions playground/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import Components from 'unplugin-vue-components/vite'
import { resolve } from 'pathe'
import UnoCSS from 'unocss/vite'
import { templateCompilerOptions } from '@tresjs/core'
import { qrcode } from 'vite-plugin-qrcode'

// https://vitejs.dev/config/
export default defineConfig({
Expand All @@ -28,6 +29,7 @@ export default defineConfig({
UnoCSS({
/* options */
}),
qrcode(),
],
resolve: {
alias: {
Expand Down
Loading

0 comments on commit cc50e1f

Please sign in to comment.