Chore: Separately version third-party assets

.gitignore

@@ -5,6 +5,6 @@ node_modules
 .DS_Store
 npm-debug.log
 reports
-dist/dev
+dist
 src/i18n/json
 jsconfig.json

build/karma.conf.js

@@ -1,5 +1,7 @@
 const webpackConfig = require('./webpack.karma.config');
 
+const MODEL3D_STATIC_ASSETS_VERSION = '0.112.0';
+
 const getTestFile = (src) => {
     if (!src) {
         return [
@@ -81,7 +83,7 @@ module.exports = (config) => config.set({
     ],
 
     files: [
-        'src/third-party/model3d/three.min.js',
+        `src/third-party/model3d/${MODEL3D_STATIC_ASSETS_VERSION}/three.min.js`,
         'node_modules/babel-polyfill/dist/polyfill.js',
         'src/third-party/**/*.js'
     ].concat(getTestFile(config.src)),

build/minify_pdfjs.sh

@@ -1,13 +1,18 @@
+DOC_STATIC_ASSETS_VERSION=$(./build/current_version.sh)
+
 # Minify using Google Closure Compiler, options:
 # Output to ECMASCRIPT5 / ES5 (Box supports Chrome, IE11, Firefox, Safari, and newer versions of iOS, Android)
 # Skip rewriting polyfills since pdf.js includes its own WeakMap polyfill
 echo "-----------------------------------------------------------------------------------"
 echo "Minifying pdf.js files with Google Closure... Warnings are okay!"
 echo "-----------------------------------------------------------------------------------"
-java -jar build/closure-compiler-v20161201.jar --rewrite_polyfills false --language_out ECMASCRIPT5 --js src/third-party/doc/pdf.js --js_output_file src/third-party/doc/pdf.min.js
-java -jar build/closure-compiler-v20161201.jar --rewrite_polyfills false --language_out ECMASCRIPT5 --js src/third-party/doc/pdf.worker.js --js_output_file src/third-party/doc/pdf.worker.min.js
-java -jar build/closure-compiler-v20161201.jar --rewrite_polyfills false --language_out ECMASCRIPT5 --js src/third-party/doc/pdf_viewer.js --js_output_file src/third-party/doc/pdf_viewer.min.js
-java -jar build/closure-compiler-v20161201.jar --rewrite_polyfills false --language_out ECMASCRIPT5 --js src/third-party/doc/compatibility.js --js_output_file src/third-party/doc/compatibility.min.js
+java -jar build/closure-compiler-v20161201.jar --rewrite_polyfills false --language_out ECMASCRIPT5 --js src/third-party/doc/$DOC_STATIC_ASSETS_VERSION/pdf.js --js_output_file src/third-party/doc/$DOC_STATIC_ASSETS_VERSION/pdf.min.js
+
+java -jar build/closure-compiler-v20161201.jar --rewrite_polyfills false --language_out ECMASCRIPT5 --js src/third-party/doc/$DOC_STATIC_ASSETS_VERSION/pdf.worker.js --js_output_file src/third-party/doc/$DOC_STATIC_ASSETS_VERSION/pdf.worker.min.js
+
+java -jar build/closure-compiler-v20161201.jar --rewrite_polyfills false --language_out ECMASCRIPT5 --js src/third-party/doc/$DOC_STATIC_ASSETS_VERSION/pdf_viewer.js --js_output_file src/third-party/doc/$DOC_STATIC_ASSETS_VERSION/pdf_viewer.min.js
+
+java -jar build/closure-compiler-v20161201.jar --rewrite_polyfills false --language_out ECMASCRIPT5 --js src/third-party/doc/$DOC_STATIC_ASSETS_VERSION/compatibility.js --js_output_file src/third-party/doc/$DOC_STATIC_ASSETS_VERSION/compatibility.min.js
 echo "-----------------------------------------------------------------------------------"
 echo "Successfully updated and minified pdf.js files!"
 echo "-----------------------------------------------------------------------------------"

build/upgrade_pdfjs.sh

@@ -1,3 +1,5 @@
+DOC_STATIC_ASSETS_VERSION=$(./build/current_version.sh)
+
 echo "-----------------------------------------------------------------------------------"
 echo "Fetching latest pdf.js files from pdfjs-dist repo..."
 echo "-----------------------------------------------------------------------------------"
@@ -8,15 +10,15 @@ echo "--------------------------------------------------------------------------
 echo "Copying relevant files to Preview third-party dir..."
 echo "Note that we are NOT copying compatibility.js - that needs to be manually updated"
 echo "-----------------------------------------------------------------------------------"
-cp pdfjs-dist/build/pdf.js src/third-party/doc/
-cp pdfjs-dist/build/pdf.worker.js src/third-party/doc/
-cp pdfjs-dist/web/pdf_viewer.js src/third-party/doc/
-cp pdfjs-dist/web/pdf_viewer.css src/third-party/doc/
-cp pdfjs-dist/cmaps/* src/third-party/doc/cmaps/
+cp pdfjs-dist/build/pdf.js src/third-party/doc/$DOC_STATIC_ASSETS_VERSION/
+cp pdfjs-dist/build/pdf.worker.js src/third-party/doc/$DOC_STATIC_ASSETS_VERSION/
+cp pdfjs-dist/web/pdf_viewer.js src/third-party/doc/$DOC_STATIC_ASSETS_VERSION/
+cp pdfjs-dist/web/pdf_viewer.css src/third-party/doc/$DOC_STATIC_ASSETS_VERSION/
+cp pdfjs-dist/cmaps/* src/third-party/doc/$DOC_STATIC_ASSETS_VERSION/cmaps/
 rm -rf ./pdfjs-dist/
 
 # Fix Chrome console warning issue by not testing for moz-chunked-arraybuffer support in Chrome
 echo "-----------------------------------------------------------------------------------"
 echo "Tweaking pdf.worker.js for Chrome..."
 echo "-----------------------------------------------------------------------------------"
-sed -e 's/function supportsMozChunkedClosure/!\(\/Chrome\/\.test\(navigator\.userAgent\)\) \&\& function supportsMozChunkedClosure/' -i '' src/third-party/doc/pdf.worker.js
+sed -e 's/function supportsMozChunkedClosure/!\(\/Chrome\/\.test\(navigator\.userAgent\)\) \&\& function supportsMozChunkedClosure/' -i '' src/third-party/doc/$DOC_STATIC_ASSETS_VERSION/pdf.worker.js

build/webpack.config.js

@@ -13,7 +13,7 @@ const version = isRelease ? require('../package.json').version : 'dev';
 
 const lib = path.resolve('src/lib');
 const thirdParty = path.resolve('src/third-party');
-const staticFolder = path.resolve('dist', version);
+const staticFolder = path.resolve('dist');
 
 const languages = isRelease ? [
     'en-AU',