Skip to content

Commit

Permalink
fix: [v1] ssr / node fixes (#31)
Browse files Browse the repository at this point in the history
* remove new TextureLoader from top level import

* run prettier

* fix: remove optional chaining using babel plugin

* add meshopt_decoder
  • Loading branch information
joshuaellis authored Mar 9, 2021
1 parent 95fd039 commit c9df308
Show file tree
Hide file tree
Showing 6 changed files with 477 additions and 369 deletions.
23 changes: 12 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,20 +42,20 @@
},
"homepage": "https://github.com/pmndrs/three-stdlib#readme",
"devDependencies": {
"@babel/core": "7.11.1",
"@babel/plugin-proposal-class-properties": "^7.10.4",
"@babel/plugin-transform-modules-commonjs": "7.10.4",
"@babel/plugin-transform-parameters": "7.10.5",
"@babel/plugin-transform-runtime": "7.11.0",
"@babel/plugin-transform-template-literals": "7.10.5",
"@babel/preset-env": "7.11.0",
"@babel/preset-react": "7.10.4",
"@babel/preset-typescript": "^7.10.4",
"@babel/core": "^7.13.10",
"@babel/plugin-proposal-class-properties": "^7.13.0",
"@babel/plugin-proposal-optional-chaining": "^7.13.8",
"@babel/plugin-transform-modules-commonjs": "^7.13.8",
"@babel/plugin-transform-parameters": "^7.13.0",
"@babel/plugin-transform-runtime": "^7.13.10",
"@babel/plugin-transform-template-literals": "^7.13.0",
"@babel/preset-env": "^7.13.10",
"@babel/preset-typescript": "^7.13.0",
"@rollup/plugin-typescript": "^8.2.0",
"@storybook/addons": "^6.1.21",
"@storybook/addon-controls": "^6.1.21",
"@storybook/addon-essentials": "^6.1.21",
"@storybook/addon-storysource": "^6.1.21",
"@storybook/addons": "^6.1.21",
"@storybook/client-api": "^6.1.21",
"@storybook/html": "^6.1.21",
"@storybook/preset-typescript": "^3.0.0",
Expand Down Expand Up @@ -86,9 +86,10 @@
"rollup-plugin-multi-input": "^1.1.1",
"rollup-plugin-node-resolve": "^5.2.0",
"rollup-plugin-size-snapshot": "^0.12.0",
"rollup-plugin-terser": "^7.0.2",
"three": "^0.126.0",
"tslib": "^2.1.0",
"typescript": "<4.2.0"
"typescript": "^4.2.3"
},
"dependencies": {
"@webgpu/glslang": "^0.0.15",
Expand Down
10 changes: 6 additions & 4 deletions rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import babel from 'rollup-plugin-babel'
import resolve from 'rollup-plugin-node-resolve'
import json from 'rollup-plugin-json'
import multiInput from 'rollup-plugin-multi-input'
import typescript from '@rollup/plugin-typescript'
import { terser } from 'rollup-plugin-terser'

const root = process.platform === 'win32' ? path.resolve('/') : '/'
const external = (id) => !id.startsWith('.') && !id.startsWith(root)
Expand All @@ -17,13 +17,14 @@ const getBabelOptions = ({ useESModules }, targets) => ({
presets: [['@babel/preset-env', { loose: true, modules: false, targets }], '@babel/preset-typescript'],
plugins: [
'@babel/plugin-proposal-class-properties',
'@babel/plugin-proposal-optional-chaining',
['@babel/transform-runtime', { regenerator: false, useESModules }],
],
})

export default [
{
input: ['src/**/*.js', 'src/**/*.ts', '!src/index.js'],
input: ['src/**/*.ts', 'src/**/*.js', '!src/index.js'],
output: { dir: `dist`, format: 'esm' },
external,
plugins: [
Expand All @@ -45,7 +46,7 @@ export default [
preserveModules: true,
},
{
input: ['src/**/*.js', 'src/**/*.ts', '!src/index.js'],
input: ['src/**/*.ts', 'src/**/*.js', '!src/index.js'],
output: { dir: `dist`, format: 'cjs' },
external,
plugins: [
Expand All @@ -55,12 +56,13 @@ export default [
json(),
babel(getBabelOptions({ useESModules: false })),
resolve({ extensions }),
terser(),
],
},
{
input: `./src/index.js`,
output: { file: `dist/index.cjs.js`, format: 'cjs' },
external,
plugins: [json(), babel(getBabelOptions({ useESModules: false })), resolve({ extensions })],
plugins: [json(), babel(getBabelOptions({ useESModules: false })), resolve({ extensions }), terser()],
},
]
Loading

0 comments on commit c9df308

Please sign in to comment.