Skip to content

Commit 57ea78e

Browse files
committed
Merge remote-tracking branch 'origin/main' into svg-sprite-plugin
2 parents b56e89a + 320e049 commit 57ea78e

3 files changed

Lines changed: 8 additions & 0 deletions

File tree

buildprocess/configureWebpackForPlugins.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
/* eslint-disable @typescript-eslint/no-require-imports */
2+
13
const path = require("path");
24
const fs = require("fs");
35
/**

buildprocess/webpack.config.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
/* eslint-disable no-undef */
2+
/* eslint-disable @typescript-eslint/no-require-imports */
3+
14
const configureWebpackForTerriaJS = require("terriajs/buildprocess/configureWebpack");
25
const configureWebpackForPlugins = require("./configureWebpackForPlugins");
36
const MiniCssExtractPlugin = require("mini-css-extract-plugin");

gulpfile.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
/*eslint-env node*/
22
/*eslint no-sync: 0*/
33
/*eslint no-process-exit: 0*/
4+
/*eslint no-redeclare: 0*/
5+
/*eslint @typescript-eslint/no-require-imports: 0*/
46

57
"use strict";
68

@@ -203,6 +205,7 @@ gulp.task("sync-terriajs-dependencies", function (done) {
203205

204206
function syncDependencies(dependencies, targetJson, justWarn) {
205207
for (var dependency in dependencies) {
208+
// eslint-disable-next-line no-prototype-builtins
206209
if (dependencies.hasOwnProperty(dependency)) {
207210
var version =
208211
targetJson.dependencies[dependency] ||

0 commit comments

Comments
 (0)