Skip to content

Commit

Permalink
Fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Ib Green committed Apr 29, 2019
1 parent e923187 commit 5107e65
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 27 deletions.
2 changes: 1 addition & 1 deletion modules/ply/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ export {default as PLYLoader} from './ply-loader';
export {default as PLYWorkerLoader} from './ply-worker-loader';

// TODO - PLYStreamLoader should eventually merge with/replace PLYLoader
// export {default as _PLYStreamLoader} from './ply-stream-loader';
export {default as _PLYStreamLoader} from './ply-stream-loader';
1 change: 0 additions & 1 deletion website/ocular/gatsby-node.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ callbacks.onCreateWebpackConfig = function onCreateWebpackConfigOverride(opts) {
const newJSRule = loaders.js();

Object.assign(newJSRule, {

// JS and JSX
test: /\.jsx?$/,

Expand Down
50 changes: 25 additions & 25 deletions website/ocular/ocular-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,24 +65,24 @@ module.exports = {
ADDITIONAL_LINKS: [],

EXAMPLES: [
{
title: 'Point Clouds & Meshes',
image: 'images/example-pointcloud.png',
componentUrl: resolve(__dirname, './examples/pointcloud/app.js'),
path: 'examples/pointcloud'
},
{
title: '3D Tiles',
image: 'images/example-gltf.jpg',
componentUrl: resolve(__dirname, './examples/3d-tiles/app.js'),
path: 'examples/3d-tiles'
},
{
title: 'GLTF',
image: 'images/example-gltf.jpg',
componentUrl: resolve(__dirname, './templates/example-gltf.jsx'),
path: 'examples/gltf'
}
{
title: 'Point Clouds & Meshes',
image: 'images/example-pointcloud.png',
componentUrl: resolve(__dirname, './examples/pointcloud/app.js'),
path: 'examples/pointcloud'
},
{
title: '3D Tiles',
image: 'images/example-gltf.jpg',
componentUrl: resolve(__dirname, './examples/3d-tiles/app.js'),
path: 'examples/3d-tiles'
},
{
title: 'GLTF',
image: 'images/example-gltf.jpg',
componentUrl: resolve(__dirname, './templates/example-gltf.jsx'),
path: 'examples/gltf'
}
],

// Avoids duplicate conflicting inputs when importing from examples folders
Expand All @@ -91,13 +91,13 @@ module.exports = {
resolve: {
// modules: [resolve(__dirname, './node_modules')],
alias: Object.assign({}, ALIASES, dependencyAliases, {
// '@luma.gl/addons': `${__dirname}/node_modules/@luma.gl/addons/src`,
// '@luma.gl/core': `${__dirname}/node_modules/@luma.gl/core/src`,
// '@luma.gl/constants': `${__dirname}/node_modules/@luma.gl/constants/src`,
// '@luma.gl/webgl': `${__dirname}/node_modules/@luma.gl/webgl/src`,
// '@deck.gl/core': `${__dirname}/node_modules/@deck.gl/core/src`,
// '@deck.gl/layers': `${__dirname}/node_modules/@deck.gl/layers/src`,
// '@deck.gl/react': `${__dirname}/node_modules/@deck.gl/react/src`
// '@luma.gl/addons': `${__dirname}/node_modules/@luma.gl/addons/src`,
// '@luma.gl/core': `${__dirname}/node_modules/@luma.gl/core/src`,
// '@luma.gl/constants': `${__dirname}/node_modules/@luma.gl/constants/src`,
// '@luma.gl/webgl': `${__dirname}/node_modules/@luma.gl/webgl/src`,
// '@deck.gl/core': `${__dirname}/node_modules/@deck.gl/core/src`,
// '@deck.gl/layers': `${__dirname}/node_modules/@deck.gl/layers/src`,
// '@deck.gl/react': `${__dirname}/node_modules/@deck.gl/react/src`
})
}
}
Expand Down

0 comments on commit 5107e65

Please sign in to comment.