Merge pull request #164 from chuckdumont/master

Use es5 linting for runtime module

Author: Chuck Dumont

index.js

@@ -13,5 +13,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-if (!Object.entries) require("object.entries").shim(); // for node < 7
-module.exports = require("./lib/DojoAMDPlugin");
+module.exports = require("./lib/DojoAMDPlugin");

lib/DojoAMDMainTemplatePlugin.js

@@ -24,6 +24,7 @@
 const util = require('util');
 const Template = require("webpack/lib/Template");
 const stringify = require("node-stringify");
+const runtime = require("../runtime/DojoAMDMainTemplate.runtime");
 const {getAsString, getIndent, getRequireExtensionsHookName, needChunkLoadingCode, preWebpackV4} = require("./compat");
 const {reg, tap, pluginName, callSyncBail, callSyncWaterfall} = require("./pluginCompat").for("dojo-webpack-plugin");
 
@@ -84,7 +85,7 @@ module.exports = class DojoAMDMainTemplatePlugin {
 
 	dojoRequireExtensions(source, chunk, ...rest) {
 		const {mainTemplate} = this.compilation;
-		const runtimeSource = Template.getFunctionContent(require("./DojoAMDMainTemplate.runtime.js").main)
+		const runtimeSource = Template.getFunctionContent(runtime.main)
 		                           .replace(/__webpack_require__/g, mainTemplate.requireFn);
 		const buf = [];
 		buf.push(runtimeSource);
@@ -142,9 +143,9 @@ but the loader specified at ${this.embeddedLoaderFilename} was built without the
 		buf.push("['baseUrl','has','rawConfig','on','signal'].forEach(function(name) {req[name] = loaderScope.require[name]})");
 		const loaderConfig = callSyncBail(this.compiler, "get dojo config");
 		if (loaderConfig.has && loaderConfig.has['dojo-undef-api']) {
-			buf.push("req.undef = " +  Template.getFunctionContent(require("./DojoAMDMainTemplate.runtime.js").undef));
+			buf.push("req.undef = " +  Template.getFunctionContent(runtime.undef));
 		}
-		const makeDeprecatedReq = Template.getFunctionContent(require("./DojoAMDMainTemplate.runtime.js").makeDeprecatedReq)
+		const makeDeprecatedReq = Template.getFunctionContent(runtime.makeDeprecatedReq)
 		                                .replace(/__webpack_require__\.dj/g, djProp);
 		return this.asString([
 			source,

package-lock.json

@@ -35,6 +35,7 @@
     "dojo": "1.13.0",
     "dojo-util": "1.13.0",
     "eslint": "^4.17.0",
+    "eslint-plugin-es5": "^1.3.1",
     "eslint-plugin-json": "^1.2.0",
     "eslint-plugin-markdown": "^1.0.0-beta.7",
     "fs-extra": "^4.0.2",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dojo-webpack-plugin",
-  "version": "2.6.0",
+  "version": "2.7.2",
   "author": "Chuck Dumont",
   "description": "Supports using webpack with Dojo 1.x applications",
   "scripts": {
@@ -35,6 +35,7 @@
     "dojo": "1.13.0",
     "dojo-util": "1.13.0",
     "eslint": "^4.17.0",
+    "eslint-plugin-es5": "^1.3.1",
     "eslint-plugin-json": "^1.2.0",
     "eslint-plugin-markdown": "^1.0.0-beta.7",
     "fs-extra": "^4.0.2",

package.webpack2.json

@@ -1,6 +1,6 @@
 {
   "name": "dojo-webpack-plugin",
-  "version": "2.6.0",
+  "version": "2.7.2",
   "author": "Chuck Dumont",
   "description": "Supports using webpack with Dojo 1.x applications",
   "scripts": {
@@ -35,6 +35,7 @@
     "dojo": "1.13.0",
     "dojo-util": "1.13.0",
     "eslint": "^4.17.0",
+    "eslint-plugin-es5": "^1.3.1",
     "eslint-plugin-json": "^1.2.0",
     "eslint-plugin-markdown": "^1.0.0-beta.7",
     "fs-extra": "^4.0.2",

package.webpack3.json

@@ -0,0 +1,37 @@
+{
+  "parserOptions": {
+    "sourceType": "module",
+  },
+  "env": {
+    "browser": true,
+    "amd": true,
+    "node": false,
+    "es6": false,
+  },
+  "rules": {
+    # "camelcase": 2,
+    "comma-dangle": 2,
+    "no-dupe-args": 2,
+    "no-dupe-keys": 2,
+    "no-mixed-spaces-and-tabs": [2, "smart-tabs"],
+    "no-shadow": 2,
+    "no-trailing-spaces": 2,
+    "no-undef": 2,
+    "semi": 2,
+    "no-debugger": "error",
+    # Helps ensure we don't require unused modules.
+    "no-unused-vars": [2, {
+       "args": "all",
+       "argsIgnorePattern": "^(e|err|error)$|__$",
+    }],
+    # Prevents usage of things before they're defined (except for hoisted function declarations).
+    "no-use-before-define": [2, "nofunc"]
+  },
+  "plugins": [
+    "es5"
+  ],
+  "extends": [
+    "plugin:es5/no-es2015",
+    "plugin:es5/no-es2016"
+  ]
+}

runtime/.eslintrc

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- /* globals loaderScope __webpack_require__ installedModules globalRequireContext */
+ /* globals module loaderScope __webpack_require__ installedModules globalRequireContext */
 
 module.exports = {
 	main: function() {