Merge branch 'maintenance-3.0.x' into fix-WEBUI-1159-update-catalog-v…

…ersion-check-30x

packages/nuxeo-designer-catalog/gulpfile.js

@@ -17,14 +17,14 @@ limitations under the License.
 */
 
 // Include Gulp & tools we'll use
+const path = require('path');
+const { spawn } = require('child_process');
 const gulp = require('gulp');
 const gutil = require('gulp-util');
 const git = require('gulp-git');
 const del = require('del');
-const { spawn } = require('child_process');
 const runSequence = require('gulp4-run-sequence');
 const merge = require('merge-stream');
-const path = require('path');
 const bower = require('gulp-bower');
 const fs = require('fs-extra');
 const stream = require('./src/utils/stream').obj;

packages/nuxeo-designer-catalog/src/elements.js

@@ -15,9 +15,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
+const path = require('path');
 const fs = require('fs-extra');
 const gutil = require('gulp-util');
-const path = require('path');
 
 const _ = require('lodash');
 const async = require('async');

packages/nuxeo-designer-catalog/src/utils/analyze.js

@@ -15,9 +15,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
+const path = require('path');
 const _ = require('lodash');
 const fs = require('fs-extra');
-const path = require('path');
 const { Analyzer, FsUrlLoader, PackageUrlResolver, generateAnalysis, Analysis } = require('polymer-analyzer');
 
 module.exports = (pkg, sourcePaths, libraries, pkgManagement, callback) => {

packages/nuxeo-web-ui-ftest/features/step_definitions/support/screenshots.js

@@ -1,7 +1,6 @@
-import { After, Status } from '@cucumber/cucumber';
-
 import * as path from 'path';
 import * as mkdirp from 'mkdirp';
+import { After, Status } from '@cucumber/cucumber';
 
 After(function(scenario) {
   const { status } = scenario.result;

packages/nuxeo-web-ui-ftest/scripts/test.js

@@ -29,8 +29,8 @@
 const fs = require('fs');
 const path = require('path');
 const { spawn } = require('child_process');
-const chromeLauncher = require('chrome-launcher');
 const { execSync } = require('child_process');
+const chromeLauncher = require('chrome-launcher');
 const fetch = require('node-fetch');
 
 const wdioBin = require.resolve('@wdio/cli/bin/wdio');

packages/nuxeo-web-ui-ftest/wdio.conf.js

@@ -1,5 +1,5 @@
-const chai = require('chai');
 const path = require('path');
+const chai = require('chai');
 const htmlReporter = require('multiple-cucumber-html-reporter');
 
 const CompatService = require('./wdio-compat-plugin');

scripts/merge-messages.js

@@ -1,6 +1,6 @@
-const glob = require('glob');
-const { mkdirSync, existsSync, writeFileSync } = require('fs');
 const path = require('path');
+const { mkdirSync, existsSync, writeFileSync } = require('fs');
+const glob = require('glob');
 
 const DEST = '.tmp/i18n';
 const CWD = process.cwd();