Merge branch '4.x'

# Conflicts: # components/bower.json # components/handlebars.js.nuspec # components/package.json # package-lock.json # package.json
2019-09-03 22:24:48 +02:00
parent dce44541db 164c7ceea4
commit 35d3fdb1dd
33 changed files with 552 additions and 391 deletions
@@ -48,7 +48,7 @@
    "grunt-contrib-uglify": "^1",
    "grunt-contrib-watch": "^1.1.0",
    "grunt-eslint": "^20.1.0",
-    "grunt-saucelabs": "9.x",
+    "grunt-saucelabs": "github:nknapp/grunt-saucelabs",
    "grunt-webpack": "^1.0.8",
    "istanbul": "kpdecker/istanbul",
    "jison": "0.4.16",
@@ -63,6 +63,10 @@
  },
  "main": "lib/index.js",
  "types": "types/index.d.ts",
+  "browser": {
+    ".": "./dist/handlebars.min.js",
+    "./runtime": "./dist/handlebars.runtime.min.js"
+  },
  "bin": {
    "handlebars": "bin/handlebars"
  },