Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Tresjs/nuxt
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.2.2
Choose a base ref
...
head repository: Tresjs/nuxt
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1.3.0
Choose a head ref
  • 2 commits
  • 7 files changed
  • 1 contributor

Commits on Dec 2, 2023

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    cdcae38 View commit details
  2. chore: release v1.3.0

    alvarosabu committed Dec 2, 2023
    Copy the full SHA
    67932a7 View commit details
Showing with 3,908 additions and 2,789 deletions.
  1. +8 −1 CHANGELOG.md
  2. +16 −16 package.json
  3. +7 −7 playground/app.vue
  4. +5 −5 playground/package.json
  5. +1,205 −1,288 playground/pnpm-lock.yaml
  6. +2,666 −1,471 pnpm-lock.yaml
  7. +1 −1 src/module.ts
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@


## [1.3.0](https://example.com///compare/1.2.2...1.3.0) (2023-12-02)


### Features

* **deps:** update deps ([#63](https://example.com//null/issues/63)) ([cdcae38](https://example.com///commit/cdcae38a3ab1da2d5030064fbc946fdc8fc34e57))

## [1.2.2](https://example.com///compare/1.2.1...1.2.2) (2023-10-19)


@@ -154,4 +161,4 @@

### Bug Fixes

* remove multiple modules warnings ([#2](null//null/issues/2)) 2ddaa3e
* remove multiple modules warnings ([#2](null//null/issues/2)) 2ddaa3e
32 changes: 16 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@tresjs/nuxt",
"type": "module",
"version": "1.2.2",
"version": "1.3.0",
"packageManager": "pnpm@8.6.2",
"description": "TresJS integration for Nuxt.",
"author": "Daniel Roe (https://github.com/danielroe/)",
@@ -36,28 +36,28 @@
"three": ">=0.133"
},
"dependencies": {
"@nuxt/kit": "^3.7.4",
"@tresjs/core": "3.4.1",
"@types/three": "^0.157.2",
"defu": "^6.1.2",
"@nuxt/kit": "^3.8.2",
"@tresjs/core": "3.5.1",
"@types/three": "^0.159.0",
"defu": "^6.1.3",
"mlly": "^1.4.2",
"pkg-types": "^1.0.3",
"typescript": "^5.2.2"
"typescript": "^5.3.2"
},
"devDependencies": {
"@alvarosabu/eslint-config-vue": "^0.4.0",
"@nuxt/eslint-config": "^0.2.0",
"@nuxt/module-builder": "^0.5.2",
"@nuxt/schema": "^3.7.4",
"@nuxt/test-utils": "^3.7.4",
"@release-it/conventional-changelog": "^7.0.2",
"@types/node": "^20.8.7",
"@nuxt/module-builder": "^0.5.4",
"@nuxt/schema": "^3.8.2",
"@nuxt/test-utils": "^3.8.1",
"@release-it/conventional-changelog": "^8.0.1",
"@types/node": "^20.10.2",
"changelogen": "^0.5.5",
"eslint": "^8.51.0",
"nuxt": "^3.7.4",
"playwright": "^1.39.0",
"release-it": "^16.2.1",
"three": "^0.157.0",
"eslint": "^8.55.0",
"nuxt": "^3.8.2",
"playwright": "^1.40.1",
"release-it": "^17.0.0",
"three": "^0.159.0",
"vitest": "^0.34.6"
}
}
14 changes: 7 additions & 7 deletions playground/app.vue
Original file line number Diff line number Diff line change
@@ -10,12 +10,12 @@ const gl = reactive({
toneMapping: NoToneMapping,
})
/* const bloomParams = reactive({
const bloomParams = reactive({
luminanceThreshold: 0.2,
luminanceSmoothing: 0.3,
mipmapBlur: true,
intensity: 0.5,
}) */
})
const showScene = ref(false)
setTimeout(() => {
@@ -31,11 +31,11 @@ setTimeout(() => {
:look-at="[0, 0, 0]"
/>
<OrbitControls />

<!-- <EffectComposer :depth-buffer="true">
<Bloom v-bind="bloomParams" />
</EffectComposer> -->

<Suspense>
<EffectComposer>
<Bloom v-bind="bloomParams" />
</EffectComposer>
</Suspense>
<Suspense>
<NuxtStones />
</Suspense>
10 changes: 5 additions & 5 deletions playground/package.json
Original file line number Diff line number Diff line change
@@ -8,11 +8,11 @@
"generate": "nuxi generate"
},
"devDependencies": {
"@nuxt/devtools": "1.0.0-beta.0",
"@tresjs/cientos": "^3.4.1",
"@tresjs/post-processing": "^0.4.0",
"nuxt": "^3.7.4",
"postprocessing": "^6.33.2",
"@nuxt/devtools": "1.0.4",
"@tresjs/cientos": "^3.6.0",
"@tresjs/post-processing": "^0.7.0",
"nuxt": "^3.8.2",
"postprocessing": "^6.33.3",
"tweakpane": "^4.0.1"
}
}
2,493 changes: 1,205 additions & 1,288 deletions playground/pnpm-lock.yaml

Large diffs are not rendered by default.

4,137 changes: 2,666 additions & 1,471 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/module.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { readFile } from 'fs/promises'
import { resolve } from 'path'
import { defineNuxtModule, addImports, addComponent, createResolver, resolvePath } from '@nuxt/kit'
import * as core from '@tresjs/core'
import { templateCompilerOptions } from '@tresjs/core'
@@ -64,6 +63,7 @@ export default defineNuxtModule<ModuleOptions>({

const pkg = await readPackageJSON(nuxt.options.rootDir)
const coreDeps = Object.keys({ ...pkg.dependencies, ...pkg.devDependencies }).filter(d => d.startsWith('@tresjs/'))

for (const mod of new Set([...options.modules, ...coreDeps])) {
if (mod === '@tresjs/core' || mod === '@tresjs/nuxt') continue