diff --git a/packages/viewer-sandbox/src/main.ts b/packages/viewer-sandbox/src/main.ts
index 279641747..504bdc327 100644
--- a/packages/viewer-sandbox/src/main.ts
+++ b/packages/viewer-sandbox/src/main.ts
@@ -1,4 +1,9 @@
import { Viewer, DefaultViewerParams } from '@speckle/viewer'
+
+// TODO: Just examples, delete!
+import Image from '@speckle/viewer/assets/random.png'
+// import ImageHdr from '@speckle/viewer/dist/image.hdr';
+
import './style.css'
import Sandbox from './Sandbox'
@@ -9,9 +14,19 @@ if (!container) {
// Viewer setup
const params = DefaultViewerParams
-params.environmentSrc =
- // 'https://speckle-xyz-assets.ams3.digitaloceanspaces.com/studio010.hdr'
- 'http://localhost:3033/sample-hdri.exr'
+// params.environmentSrc =
+// // 'https://speckle-xyz-assets.ams3.digitaloceanspaces.com/studio010.hdr'
+// 'http://localhost:3033/sample-hdri.exr'
+
+// TODO: Remove this, just a test of image bundling capabilities!
+const testImg = document.createElement('img')
+
+// TODO: TEST, REMOVE
+testImg.src = Image // Image manually imported from speckle/viewer
+// testImg.src = DefaultViewerParams.environmentSrc // Image that always gets bundled due to the import in speckle/viewer (remove it)
+
+document.getElementsByTagName('body')[0].appendChild(testImg)
+
const viewer = new Viewer(container, params)
await viewer.init()
diff --git a/packages/viewer/always-bundled-assets/random.png b/packages/viewer/always-bundled-assets/random.png
new file mode 100644
index 000000000..d1ed99001
Binary files /dev/null and b/packages/viewer/always-bundled-assets/random.png differ
diff --git a/packages/viewer/src/assets/studio010.hdr b/packages/viewer/always-bundled-assets/studio010.hdr
similarity index 100%
rename from packages/viewer/src/assets/studio010.hdr
rename to packages/viewer/always-bundled-assets/studio010.hdr
diff --git a/packages/viewer/package.json b/packages/viewer/package.json
index ab9a3235e..b79d26f6c 100644
--- a/packages/viewer/package.json
+++ b/packages/viewer/package.json
@@ -11,7 +11,9 @@
"main": "dist/speckleviewer.js",
"module": "dist/speckleviewer.esm.js",
"exports": {
- ".": "./dist/speckleviewer.esm.js"
+ ".": "./dist/speckleviewer.esm.js",
+ "./dist/assets/*": "./dist/assets/*",
+ "./assets/*": "./dist/assets/*"
},
"types": "./dist/index.d.ts",
"sourceType": "module",
@@ -59,6 +61,8 @@
"prettier": "^2.5.1",
"rollup": "^2.70.1",
"rollup-plugin-delete": "^2.0.0",
+ "rollup-plugin-rebase": "^4.1.1",
+ "rollup-plugin-copy": "^3.4.0",
"rollup-plugin-terser": "^7.0.2",
"rollup-plugin-typescript2": "^0.31.2",
"typescript": "^4.5.4"
diff --git a/packages/viewer/rollup.config.js b/packages/viewer/rollup.config.js
index 8f2b87394..7c0842b41 100644
--- a/packages/viewer/rollup.config.js
+++ b/packages/viewer/rollup.config.js
@@ -4,6 +4,8 @@ import { terser } from 'rollup-plugin-terser'
import clean from 'rollup-plugin-delete'
import pkg from './package.json'
import typescript2 from 'rollup-plugin-typescript2'
+import rebasePlugin from 'rollup-plugin-rebase'
+import copyPlugin from 'rollup-plugin-copy'
const isProd = process.env.NODE_ENV === 'production'
const isExample = !!process.env.EXAMPLE_BUILD
@@ -36,6 +38,10 @@ function buildConfig(isWebBuild = false) {
])
],
plugins: [
+ rebasePlugin({ keepName: true }),
+ copyPlugin({
+ targets: [{ src: './always-bundled-assets/**/*', dest: 'dist/assets' }]
+ }),
typescript2({
tsconfigOverride: {
sourceMap: sourcemap
diff --git a/packages/viewer/src/IViewer.ts b/packages/viewer/src/IViewer.ts
index 00bf2eb89..99e530876 100644
--- a/packages/viewer/src/IViewer.ts
+++ b/packages/viewer/src/IViewer.ts
@@ -1,3 +1,8 @@
+// TODO: JUST A TEST, REMOVE SO WE DON'T BUNDLE IT! This image is only going to be bundled, if imported, unlike
+// everything in 'always-bundled-assets'. Also unlike those, the filename for these is going
+// to be changed with a hash while assets in 'always-bundled-assets' remain with the same names
+import RandomImportThing from './assets/only-bundled-if-imported.png'
+
export interface ViewerParams {
postprocessing: boolean
reflections: boolean
@@ -9,7 +14,7 @@ export const DefaultViewerParams: ViewerParams = {
postprocessing: false,
reflections: true,
showStats: true,
- environmentSrc: null
+ environmentSrc: RandomImportThing
}
/**
* Carried over from the old Viewer. To be extended/changed
diff --git a/packages/viewer/src/assets/example.html b/packages/viewer/src/assets/example.html
deleted file mode 100644
index 9956d1658..000000000
--- a/packages/viewer/src/assets/example.html
+++ /dev/null
@@ -1,97 +0,0 @@
-
-
-
-
- Speckle Viewer
-
-
-
-
-
-
-
-
-
-
-
-
-
Viewer
-
Controls summary:
-
- Click an object to select it. Double click it to focus on it. Press `esc` to
- clear the selection. Press `shift-s` to toggle a section plane. Press `s`
- while the section plane is active to toggle its control mode. Double click
- anywhere outside an object to zoom extents to the entire scene.
-