josdejong · lraycheva · Mar 2, 2020 · Mar 2, 2020 · Mar 2, 2020 · Mar 10, 2020
diff --git a/.prettierignore b/.prettierignore
@@ -0,0 +1,9 @@
+*.json
+e2e
+node_modules
+misc
+docs
+test
+.github
+src/docs
+src/js
diff --git a/HISTORY.md b/HISTORY.md
@@ -2,6 +2,13 @@
 
 https://github.com/josdejong/jsoneditor
 
+## 2020-03-10
+Add prettier for formating js and scss
+- to run ``` npm run lint ```
+
+## 2020-03-02
+Update variables.
+Add prettier for formating.
 
 ## 2020-02-17, version 8.6.1
 

diff --git a/gulpfile.js b/gulpfile.js
@@ -20,219 +20,224 @@ const DOCS = './src/docs/*'
 const DIST = path.join(__dirname, 'dist')
 
 // generate banner with today's date and correct version
-function createBanner () {
-  const today = format.asString('yyyy-MM-dd', new Date()) // today, formatted as yyyy-MM-dd
-  const version = require('./package.json').version // math.js version
+function createBanner() {
+    const today = format.asString('yyyy-MM-dd', new Date()) // today, formatted as yyyy-MM-dd
+    const version = require('./package.json').version // math.js version
 
-  return String(fs.readFileSync(HEADER))
-    .replace('@@date', today)
-    .replace('@@version', version)
+    return String(fs.readFileSync(HEADER))
+        .replace('@@date', today)
+        .replace('@@version', version)
 }
 
 const bannerPlugin = new webpack.BannerPlugin({
-  banner: createBanner(),
-  entryOnly: true,
-  raw: true
+    banner: createBanner(),
+    entryOnly: true,
+    raw: true,
 })
 
 const webpackConfigModule = {
-  rules: [
-    {
-      test: /\.m?js$/,
-      exclude: /node_modules/,
-      use: {
-        loader: 'babel-loader'
-      }
-    }
-  ]
+    rules: [
+        {
+            test: /\.m?js$/,
+            exclude: /node_modules/,
+            use: {
+                loader: 'babel-loader',
+            },
+        },
+    ],
 }
 
 // create a single instance of the compiler to allow caching
 const compiler = webpack({
-  entry: ENTRY,
-  output: {
-    library: 'JSONEditor',
-    libraryTarget: 'umd',
-    path: DIST,
-    filename: NAME + '.js'
-  },
-  plugins: [bannerPlugin],
-  optimization: {
-    // We no not want to minimize our code.
-    minimize: false
-  },
-  module: webpackConfigModule,
-  resolve: {
-    extensions: ['.js'],
-    mainFields: ['main'] // pick ES5 version of vanilla-picker
-  },
-  cache: true
+    entry: ENTRY,
+    output: {
+        library: 'JSONEditor',
+        libraryTarget: 'umd',
+        path: DIST,
+        filename: NAME + '.js',
+    },
+    plugins: [bannerPlugin],
+    optimization: {
+        // We no not want to minimize our code.
+        minimize: false,
+    },
+    module: webpackConfigModule,
+    resolve: {
+        extensions: ['.js'],
+        mainFields: ['main'], // pick ES5 version of vanilla-picker
+    },
+    cache: true,
 })
 
 // create a single instance of the compiler to allow caching
 const compilerMinimalist = webpack({
-  entry: ENTRY,
-  output: {
-    library: 'JSONEditor',
-    libraryTarget: 'umd',
-    path: DIST,
-    filename: NAME_MINIMALIST + '.js'
-  },
-  module: webpackConfigModule,
-  plugins: [
-    bannerPlugin,
-    new webpack.IgnorePlugin(new RegExp('^ace-builds')),
-    new webpack.IgnorePlugin(new RegExp('worker-json-data-url')),
-    new webpack.IgnorePlugin(new RegExp('^ajv')),
-    new webpack.IgnorePlugin(new RegExp('^vanilla-picker'))
-  ],
-  optimization: {
-    // We no not want to minimize our code.
-    minimize: false
-  },
-  cache: true
+    entry: ENTRY,
+    output: {
+        library: 'JSONEditor',
+        libraryTarget: 'umd',
+        path: DIST,
+        filename: NAME_MINIMALIST + '.js',
+    },
+    module: webpackConfigModule,
+    plugins: [
+        bannerPlugin,
+        new webpack.IgnorePlugin(new RegExp('^ace-builds')),
+        new webpack.IgnorePlugin(new RegExp('worker-json-data-url')),
+        new webpack.IgnorePlugin(new RegExp('^ajv')),
+        new webpack.IgnorePlugin(new RegExp('^vanilla-picker')),
+    ],
+    optimization: {
+        // We no not want to minimize our code.
+        minimize: false,
+    },
+    cache: true,
 })
 
-function minify (name) {
-  const code = String(fs.readFileSync(DIST + '/' + name + '.js'))
-  const result = uglify.minify(code, {
-    sourceMap: {
-      url: name + '.map'
-    },
-    output: {
-      comments: /@license/,
-      max_line_len: 64000 // extra large because we have embedded code for workers
+function minify(name) {
+    const code = String(fs.readFileSync(DIST + '/' + name + '.js'))
+    const result = uglify.minify(code, {
+        sourceMap: {
+            url: name + '.map',
+        },
+        output: {
+            comments: /@license/,
+            max_line_len: 64000, // extra large because we have embedded code for workers
+        },
+    })
+
+    if (result.error) {
+        throw result.error
     }
-  })
-
-  if (result.error) {
-    throw result.error
-  }
 
-  const fileMin = DIST + '/' + name + '.min.js'
-  const fileMap = DIST + '/' + name + '.map'
+    const fileMin = DIST + '/' + name + '.min.js'
+    const fileMap = DIST + '/' + name + '.map'
 
-  fs.writeFileSync(fileMin, result.code)
-  fs.writeFileSync(fileMap, result.map)
+    fs.writeFileSync(fileMin, result.code)
+    fs.writeFileSync(fileMap, result.map)
 
-  log('Minified ' + fileMin)
-  log('Mapped ' + fileMap)
+    log('Minified ' + fileMin)
+    log('Mapped ' + fileMap)
 }
 
 // make dist folder structure
-gulp.task('mkdir', function (done) {
-  mkdirp.sync(DIST)
-  mkdirp.sync(DIST + '/img')
+gulp.task('mkdir', function(done) {
+    mkdirp.sync(DIST)
+    mkdirp.sync(DIST + '/img')
 
-  done()
+    done()
 })
 
 // Create an embedded version of the json worker code: a data url
-gulp.task('embed-json-worker', function (done) {
-  const workerBundleFile = './node_modules/ace-builds/src-noconflict/worker-json.js'
-  const workerEmbeddedFile = './src/js/generated/worker-json-data-url.js'
-  const workerScript = String(fs.readFileSync(workerBundleFile))
+gulp.task('embed-json-worker', function(done) {
+    const workerBundleFile = './node_modules/ace-builds/src-noconflict/worker-json.js'
+    const workerEmbeddedFile = './src/js/generated/worker-json-data-url.js'
+    const workerScript = String(fs.readFileSync(workerBundleFile))
 
-  const workerDataUrl = 'data:application/javascript;base64,' + btoa(workerScript)
+    const workerDataUrl = 'data:application/javascript;base64,' + btoa(workerScript)
 
-  fs.writeFileSync(workerEmbeddedFile, 'module.exports = \'' + workerDataUrl + '\'\n')
+    fs.writeFileSync(workerEmbeddedFile, "module.exports = '" + workerDataUrl + "'\n")
 
-  done()
+    done()
 })
 
 // bundle javascript
-gulp.task('bundle', function (done) {
-  // update the banner contents (has a date in it which should stay up to date)
-  bannerPlugin.banner = createBanner()
+gulp.task('bundle', function(done) {
+    // update the banner contents (has a date in it which should stay up to date)
+    bannerPlugin.banner = createBanner()
 
-  compiler.run(function (err, stats) {
-    if (err) {
-      log(err)
-    }
+    compiler.run(function(err, stats) {
+        if (err) {
+            log(err)
+        }
 
-    log('bundled ' + NAME + '.js')
+        log('bundled ' + NAME + '.js')
 
-    done()
-  })
+        done()
+    })
 })
 
 // bundle minimalist version of javascript
-gulp.task('bundle-minimalist', function (done) {
-  // update the banner contents (has a date in it which should stay up to date)
-  bannerPlugin.banner = createBanner()
+gulp.task('bundle-minimalist', function(done) {
+    // update the banner contents (has a date in it which should stay up to date)
+    bannerPlugin.banner = createBanner()
 
-  compilerMinimalist.run(function (err, stats) {
-    if (err) {
-      log(err)
-    }
+    compilerMinimalist.run(function(err, stats) {
+        if (err) {
+            log(err)
+        }
 
-    log('bundled ' + NAME_MINIMALIST + '.js')
+        log('bundled ' + NAME_MINIMALIST + '.js')
 
-    done()
-  })
+        done()
+    })
 })
 
 // bundle css
-gulp.task('bundle-css', function (done) {
-  gulp
-    .src(['src/scss/jsoneditor.scss'])
-    .pipe(
-      sass({
-        // importer: tildeImporter
-      })
-    )
-    .pipe(concatCss(NAME + '.css'))
-    .pipe(gulp.dest(DIST))
-    .pipe(concatCss(NAME + '.min.css'))
-    .pipe(minifyCSS())
-    .pipe(gulp.dest(DIST))
-  done()
+gulp.task('bundle-css', function(done) {
+    gulp.src(['src/scss/jsoneditor.scss'])
+        .pipe(
+            sass({
+                // importer: tildeImporter
+            })
+        )
+        .pipe(concatCss(NAME + '.css'))
+        .pipe(gulp.dest(DIST))
+        .pipe(concatCss(NAME + '.min.css'))
+        .pipe(minifyCSS())
+        .pipe(gulp.dest(DIST))
+    done()
 })
 
 // create a folder img and copy the icons
-gulp.task('copy-img', function (done) {
-  gulp.src(IMAGE).pipe(gulp.dest(DIST + '/img'))
-  log('Copied images')
+gulp.task('copy-img', function(done) {
+    gulp.src(IMAGE).pipe(gulp.dest(DIST + '/img'))
+    log('Copied images')
 
-  done()
+    done()
 })
 
 // create a folder img and copy the icons
-gulp.task('copy-docs', function (done) {
-  gulp.src(DOCS).pipe(gulp.dest(DIST))
-  log('Copied doc')
+gulp.task('copy-docs', function(done) {
+    gulp.src(DOCS).pipe(gulp.dest(DIST))
+    log('Copied doc')
 
-  done()
+    done()
 })
 
-gulp.task('minify', function (done) {
-  minify(NAME)
+gulp.task('minify', function(done) {
+    minify(NAME)
 
-  done()
+    done()
 })
 
-gulp.task('minify-minimalist', function (done) {
-  minify(NAME_MINIMALIST)
+gulp.task('minify-minimalist', function(done) {
+    minify(NAME_MINIMALIST)
 
-  done()
+    done()
 })
 
 // The watch task (to automatically rebuild when the source code changes)
 // Does only generate jsoneditor.js and jsoneditor.css, and copy the image
 // Does NOT minify the code and does NOT generate the minimalist version
-gulp.task('watch', gulp.series('bundle', 'bundle-css', 'copy-img', function () {
-  gulp.watch(['src/**/*'], gulp.series('bundle', 'bundle-css', 'copy-img'))
-}))
+gulp.task(
+    'watch',
+    gulp.series('bundle', 'bundle-css', 'copy-img', function() {
+        gulp.watch(['src/**/*'], gulp.series('bundle', 'bundle-css', 'copy-img'))
+    })
+)
 
 // The default task (called when you run `gulp`)
-gulp.task('default', gulp.series(
-  'mkdir',
-  'embed-json-worker',
-  gulp.parallel(
-    'copy-img',
-    'copy-docs',
-    'bundle-css',
-    gulp.series('bundle', 'minify'),
-    gulp.series('bundle-minimalist', 'minify-minimalist')
-  )
-))
+gulp.task(
+    'default',
+    gulp.series(
+        'mkdir',
+        'embed-json-worker',
+        gulp.parallel(
+            'copy-img',
+            'copy-docs',
+            'bundle-css',
+            gulp.series('bundle', 'minify'),
+            gulp.series('bundle-minimalist', 'minify-minimalist')
+        )
+    )
+)