Merge pull request #76 from chuckdumont/work

Upgrade to dojo-webpack-plugin 2.8.5
OpenNTF · Mar 29, 2019 · 5b00281 · 5b00281
2 parents 88f73ed + 5892dbc
commit 5b00281
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/js/loaderConfig.js b/js/loaderConfig.js
@@ -72,5 +72,5 @@ if (typeof module !== 'undefined' && module) {
 	module.exports = getConfig;
 } else {
 	// No webpack.  This script was loaded by page via script tag, so load Dojo from CDN
-	getConfig({dojoRoot: '//ajax.googleapis.com/ajax/libs/dojo/1.13.0'});
+	getConfig({dojoRoot: '//ajax.googleapis.com/ajax/libs/dojo/1.14.0'});
 }
diff --git a/package.json b/package.json
@@ -1,13 +1,13 @@
 {
   "name": "dojo-webpack-plugin-sample",
-  "version": "2.8.3",
+  "version": "2.8.5",
   "devDependencies": {
     "copy-webpack-plugin": "4.5.1",
     "css-loader": "0.28.10",
     "dijit": "1.14.0",
     "dojo": "1.14.0",
     "dojo-util": "1.14.0",
-    "dojo-webpack-plugin": "2.8.3",
+    "dojo-webpack-plugin": "2.8.5",
     "dojox": "1.14.0",
     "less": "2.7.1",
     "less-loader": "4.1.0",
@@ -16,7 +16,7 @@
     "url-loader": "1.0.1",
     "webpack": "4.29.5",
     "webpack-cli": "3.1.0",
-    "webpack-dev-server": "^3.1.14"
+    "webpack-dev-server": "^3.2.1"
   },
   "license": "Apache-2.0",
   "repository": {

diff --git a/test.html b/test.html
@@ -26,7 +26,7 @@
 <script type="text/javascript">
   if (/[?&]nopack=(1|true)/i.test(location.search)) {
 		document.write("<script type=\"text/javascript\" src=\"js/loaderConfig.js\" charset=\"utf-8\"><" + "/script>");
-		document.write("<script type=\"text/javascript\" src=\"//ajax.googleapis.com/ajax/libs/dojo/1.13.0/dojo/dojo.js.uncompressed.js\" charset=\"utf-8\"><" + "/script>");
+		document.write("<script type=\"text/javascript\" src=\"//ajax.googleapis.com/ajax/libs/dojo/1.14.0/dojo/dojo.js.uncompressed.js\" charset=\"utf-8\"><" + "/script>");
 	} else {
 	  document.write("<script type=\"text/javascript\" src=\"release/bundle.js\" charset=\"utf-8\"><" + "/script>");
   }