Merge pull request #1085 from girder/slideatlas-by-reference

Stop packaging the slideatlas viewer directly.
girder · Mar 17, 2023 · d4b8b5d · d4b8b5d
2 parents 732b33f + 115f762
commit d4b8b5d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,9 @@
 - Increase size of annotation json that will be parsed ([#1075](../../pull/1075))
 - Quote ETag tags ([#1084](../../pull/1084))
 
+### Changes
+-
+
 ## 1.20.1
 
 ### Bug Fixes

diff --git a/girder/girder_large_image/web_client/package.json b/girder/girder_large_image/web_client/package.json
@@ -23,7 +23,6 @@
         "jsonlint-mod": "^1.7.6",
         "js-yaml": "^4.1.0",
         "sinon": "^2.1.0",
-        "slideatlas-viewer": "^4.4.1",
         "webpack": "^2.7.0",
         "yaml": "^2.1.1"
     },

diff --git a/girder/girder_large_image/web_client/views/imageViewerWidget/slideatlas.js b/girder/girder_large_image/web_client/views/imageViewerWidget/slideatlas.js
@@ -12,25 +12,20 @@ var SlideAtlasImageViewerWidget = ImageViewerWidget.extend({
                 return this.setTransform(1, 0, 0, 1, 0, 0);
             };
         }
-        let root = '/static/built';
-        try {
-            root = __webpack_public_path__ || root; // eslint-disable-line
-        } catch (err) { }
-        root = root.replace(/\/$/, '');
         if (!$('head #large_image-slideatlas-css').length) {
             $('head').prepend(
                 $('<link>', {
                     id: 'large_image-slideatlas-css',
                     rel: 'stylesheet',
-                    href: root + '/plugins/large_image/extra/slideatlas/sa.css'
+                    href: 'https://unpkg.com/slideatlas-viewer@%5e4.4.1/dist/sa.css'
                 })
             );
         }
 
         $.when(
             ImageViewerWidget.prototype.initialize.call(this, settings),
             $.ajax({ // like $.getScript, but allow caching
-                url: root + '/plugins/large_image/extra/slideatlas/sa-all.max.js',
+                url: 'https://unpkg.com/slideatlas-viewer@%5e4.4.1/dist/sa-all.max.js',
                 dataType: 'script',
                 cache: true
             }))

diff --git a/girder/girder_large_image/web_client/webpack.helper.js b/girder/girder_large_image/web_client/webpack.helper.js
@@ -10,9 +10,6 @@ module.exports = function (config) {
             from: require.resolve('geojs'),
             to: path.join(config.output.path, 'extra', 'geojs.js'),
             toType: 'file'
-        }, {
-            from: path.join(path.resolve(__dirname), 'node_modules', 'slideatlas-viewer', 'dist'),
-            to: path.join(config.output.path, 'extra', 'slideatlas')
         }, {
             from: path.join(path.resolve(__dirname), 'node_modules', 'sinon', 'pkg', 'sinon.js'),
             to: path.join(config.output.path, 'extra', 'sinon.js')