Skip to content

Commit

Permalink
feat: sync with three@0.112.0
Browse files Browse the repository at this point in the history
Added aliases:

* `@three/helpers` (three/examples/jsm/helpers)

Removed aliases:

* `@three/pmrem` (three/examples/jsm/pmrem)
* `@three/vr` (three/examples/jsm/vr)

BREAKING CHANGE:

https://github.com/mrdoob/three.js/wiki/Migration-Guide#r111--r112

* `PMREMGenerator` moved from examples to core
* `WebVR` support has been removed from core
  • Loading branch information
vxna committed Dec 25, 2019
1 parent 3c7c22c commit 1612f1e
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 23 deletions.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
"posttest": "yarn format"
},
"devDependencies": {
"eslint": "^6.7.2",
"eslint-config-prettier": "^6.7.0",
"eslint": "^6.8.0",
"eslint-config-prettier": "^6.8.0",
"eslint-config-standard": "^14.1.0",
"eslint-plugin-import": "^2.19.1",
"eslint-plugin-node": "^10.0.0",
Expand All @@ -42,7 +42,7 @@
"lint-staged": "^9.5.0",
"memory-fs": "^0.5.0",
"prettier": "^1.19.1",
"three": "^0.111.0",
"three": "^0.112.0",
"webpack": "^4.41.4"
},
"eslintConfig": {
Expand Down
3 changes: 1 addition & 2 deletions src/aliases.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ const modules = {
'@three/effects': 'three/examples/jsm/effects',
'@three/exporters': 'three/examples/jsm/exporters',
'@three/geometries': 'three/examples/jsm/geometries',
'@three/helpers': 'three/examples/jsm/helpers',
'@three/interactive': 'three/examples/jsm/interactive',
'@three/libs': 'three/examples/jsm/libs',
'@three/lights': 'three/examples/jsm/lights',
Expand All @@ -16,12 +17,10 @@ const modules = {
'@three/modifiers': 'three/examples/jsm/modifiers',
'@three/nodes': 'three/examples/jsm/nodes',
'@three/objects': 'three/examples/jsm/objects',
'@three/pmrem': 'three/examples/jsm/pmrem',
'@three/postprocessing': 'three/examples/jsm/postprocessing',
'@three/renderers': 'three/examples/jsm/renderers',
'@three/shaders': 'three/examples/jsm/shaders',
'@three/utils': 'three/examples/jsm/utils',
'@three/vr': 'three/examples/jsm/vr',
'@three/webxr': 'three/examples/jsm/webxr'
}

Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/core.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import { Color } from '@three/core'

new Color()
export const color = new Color()
2 changes: 1 addition & 1 deletion test/fixtures/examples.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import { OrbitControls } from '@three/controls/OrbitControls'

new OrbitControls()
export const orbitControls = new OrbitControls()
9 changes: 5 additions & 4 deletions test/plugin.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@ const getConfig = (config = {}) => {
return { ...defaults, ...config }
}

const CORE_MAX_SIZE = 9279 * 2 // as for three@0.103.0
const EXAMPLES_MAX_SIZE = 30502 * 2 // as for three@0.103.0
// as of three@0.112.0
const CORE_MAX_SIZE = 9292 * 2
const EXAMPLES_MAX_SIZE = 30954 * 2

test('plugin: core imports', async () => {
test('plugin: core', async () => {
const config = getConfig()
const stats = await compiler('core.js', config)

Expand All @@ -27,7 +28,7 @@ test('plugin: core imports', async () => {
expect(emitted).toBeTruthy()
})

test('plugin: examples imports', async () => {
test('plugin: examples', async () => {
const config = getConfig()
const stats = await compiler('examples.js', config)

Expand Down
24 changes: 12 additions & 12 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1824,10 +1824,10 @@ escodegen@^1.9.1:
optionalDependencies:
source-map "~0.6.1"

eslint-config-prettier@^6.7.0:
version "6.7.0"
resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.7.0.tgz#9a876952e12df2b284adbd3440994bf1f39dfbb9"
integrity sha512-FamQVKM3jjUVwhG4hEMnbtsq7xOIDm+SY5iBPfR8gKsJoAB2IQnNF+bk1+8Fy44Nq7PPJaLvkRxILYdJWoguKQ==
eslint-config-prettier@^6.8.0:
version "6.8.0"
resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.8.0.tgz#36bd7559dcef9f97d7596779b38e6a879abb89d3"
integrity sha512-aq4M7mjjVregZ2l45O9qz6Mv6f5zVMl/IqfmUL8hNOoDAzVKYMhYPJytbqE/lPIVO1iMDXIFqjiEE59BfJZpZw==
dependencies:
get-stdin "^6.0.0"

Expand Down Expand Up @@ -1928,10 +1928,10 @@ eslint-visitor-keys@^1.1.0:
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==

eslint@^6.7.2:
version "6.7.2"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.7.2.tgz#c17707ca4ad7b2d8af986a33feba71e18a9fecd1"
integrity sha512-qMlSWJaCSxDFr8fBPvJM9kJwbazrhNcBU3+DszDW1OlEwKBBRWsJc7NJFelvwQpanHCR14cOLD41x8Eqvo3Nng==
eslint@^6.8.0:
version "6.8.0"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz#62262d6729739f9275723824302fb227c8c93ffb"
integrity sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==
dependencies:
"@babel/code-frame" "^7.0.0"
ajv "^6.10.0"
Expand Down Expand Up @@ -5709,10 +5709,10 @@ text-table@^0.2.0:
resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=

three@^0.111.0:
version "0.111.0"
resolved "https://registry.yarnpkg.com/three/-/three-0.111.0.tgz#9cedb73e79b7f6bf2440cb67a273f883faa923b6"
integrity sha512-AcTqyGJ3H75AIusOuADy0LsP958QKQwm/YhABHFMzd6RFXPNVay1rlSbbG6WYv7KM72G2THMMwqbjQd4dVHMkQ==
three@^0.112.0:
version "0.112.0"
resolved "https://registry.yarnpkg.com/three/-/three-0.112.0.tgz#3b392ca32df77a3570c226c1fe184d9f5f86ac66"
integrity sha512-dX2fm4kmpaEq3A8sMGOBZzI5X132Lzoh+Aw/uFF3iGXnjM0jzxo5vugDbydTQbWU2I31XC1Nn7kIPdyhxx1uqg==

throat@^4.0.0:
version "4.1.0"
Expand Down

0 comments on commit 1612f1e

Please sign in to comment.