Organize all assets in assets/ dir

.eslintignore

@@ -1,7 +1,7 @@
 _site
 node_modules
-js/dist
-js/vendor
-js/app/eslint.js
-js/app/espree.js
+assets/build
+src/js/vendor
+src/js/eslint.js
+src/js/espree.js
 !.*.js

.eslintrc.js

@@ -8,7 +8,7 @@ module.exports = {
     },
     overrides: [
         {
-            files: ["js/app/{demo,parser}/**/*.{js,jsx}"],
+            files: ["src/js/**/*.{js,jsx}"],
             plugins: ["react", "jsx-a11y"],
             extends: ["plugin:react/recommended", "plugin:jsx-a11y/recommended"],
             parserOptions: {
@@ -27,22 +27,18 @@ module.exports = {
                 // Disable rules that the codebase doesn't currently follow.
                 // It might be a good idea to enable these in the future.
                 "jsx-a11y/no-onchange": "off",
-                "react/prop-types": "off",
-                "require-jsdoc": "off"
+                "react/prop-types": "off"
             }
         },
         {
-            files: ["js/app/image-lazy-loader.js"],
+            files: ["assets/js/*.js"],
             parserOptions: {
                 ecmaVersion: 5,
                 sourceType: "script"
-            },
-            rules: {
-                "require-jsdoc": "off"
             }
         },
         {
-            files: ["js/app/**/*.{js,jsx}"],
+            files: ["assets/js/*.js", "src/js/**/*.{js,jsx}"],
             env: {
                 browser: true,
                 node: false
@@ -71,7 +67,10 @@ module.exports = {
                 "node/shebang": "off",
                 "node/no-extraneous-import": "off",
                 "node/no-missing-import": "off",
-                "node/no-unpublished-import": "off"
+                "node/no-unpublished-import": "off",
+
+                // Disable rules that the codebase doesn't currently follow.
+                "require-jsdoc": "off"
             }
         }
     ]

.gitignore

@@ -1,8 +1,8 @@
 node_modules/
 _site/
+assets/build
 Gemfile.lock
 .jekyll-metadata
 npm-debug.log
 main/*.css.map
 .idea
-js/dist

404.md

@@ -3,7 +3,7 @@ title: 404
 layout: doc
 ---
 
-# 4![0](/img/logo.svg)4
+# 4![0](/assets/img/logo.svg)4
 {:.four-oh-four-header}
 ## Something’s missing
 ### [Go home](/) or [check out the rules](/docs/rules)?

_config.dev.yml

@@ -15,8 +15,7 @@ exclude:
   - Gemfile.lock
   - package.json
   - node_modules
-  - js/app
-  - js/vendor
+  - src
   - sitemap.xml
   - feed.xml
   - docs/0.24.1

_config.yml

@@ -1,7 +1,8 @@
 title: "ESLint - Pluggable JavaScript linter"
 repository: "eslint/eslint.github.io"
 exclude: [
-  'node_modules'
+  'node_modules',
+  'src'
 ]
 description: "A pluggable and configurable linter tool for identifying and reporting on patterns in JavaScript. Maintain your code quality with ease."
 url: https://eslint.org

_includes/footer.html

@@ -36,7 +36,7 @@
   htmlClassList.add("js");
   </script>
   {% if page.homepage %}
-  <script src="{{ site.url }}/js/app/image-lazy-loader.js" defer></script>
+  <script src="{{ site.url }}/assets/js/image-lazy-loader.js" defer></script>
   {% endif %}
   <script>
     document.addEventListener('DOMContentLoaded', function() {
@@ -110,7 +110,7 @@
   </script>
 
   {% if page.demopage %}
-    <script src="/js/dist/demo.js"></script>
+    <script src="{{ site.url }}/assets/build/js/demo.js"></script>
   {% endif %}
 </body>
 </html>

_includes/header.html

@@ -11,14 +11,14 @@
   <meta property="og:site_name" content="{{ site.title }}">
   <meta property="og:title" content="{{ page.title }}">
   <meta property="og:url" content="{{ site.url }}{{ page.url }}">
-  <meta property="og:image" content="{{ site.url }}/img/favicon.512x512.png">
+  <meta property="og:image" content="{{ site.url }}/assets/img/favicon.512x512.png">
 
   <meta name="twitter:site" content="@geteslint">
   <meta name="twitter:title" content="{{ page.title }}">
   <meta name="twitter:description" content="{{ site.description }}">
   <meta name="twitter:url" content="{{ site.url }}{{ page.url }}">
   <meta name="twitter:card" content="summary">
-  <meta name="twitter:image" content="{{ site.url }}/img/favicon.512x512.png">
+  <meta name="twitter:image" content="{{ site.url }}/assets/img/favicon.512x512.png">
 {% if page.title != site.title %}
     {% if page.title != "ESLint" %}
         <title>{{ page.title }} - {{ site.title }}</title>
@@ -30,9 +30,9 @@
 {% endif %}
   <link rel="preconnect" href="https://www.google-analytics.com">
   <link href="{{ site.url }}{{ page.url }}" rel="canonical" />
-  <link rel="stylesheet" href="{{ site.url }}/styles/main.css"/>
+  <link rel="stylesheet" href="{{ site.url }}/assets/build/styles/main.css"/>
   <link rel='manifest' href='{{ site.url }}/manifest.json'>
-  <link rel="icon" href="{{ site.url }}/img/favicon.512x512.png">
+  <link rel="icon" href="{{ site.url }}/assets/img/favicon.512x512.png">
   <link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ site.url }}/feed.xml">
   <!-- at the end of the HEAD -->
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css" />

_includes/menu.html

@@ -2,7 +2,7 @@
 <header class="navbar navbar-default navbar-demo navbar-fixed-top eslint-nav" id="top" role="banner">
   <div class="container">
 
-    <a href="{{ site.url }}/" class="navbar-brand"><img alt="ESLint" src="{{ site.url }}/img/logo.svg" itemprop="image">ESLint</a>
+    <a href="{{ site.url }}/" class="navbar-brand"><img alt="ESLint" src="{{ site.url }}/assets/img/logo.svg" itemprop="image">ESLint</a>
 
     <div class="eslint-navbar-toggles">
       <button class="navbar-toggle collapsed" type="button" data-toggle="collapse" data-target="#eslint-navbar" aria-controls="eslint-navbar" aria-expanded="false">

_layouts/demo.html

@@ -1,6 +1,6 @@
 {% include header.html %}
 {% include menu.html %}
-<link rel="stylesheet" property="stylesheet" type="text/css" href="/styles/vendor/orion-built-editor.css" />
+<link rel="stylesheet" property="stylesheet" type="text/css" href="{{ site.url }}/assets/styles/vendor/orion-built-editor.css" />
 <main class="container">
     {{ content }}
 </main>

demo/index.html

@@ -4,7 +4,7 @@
 demopage: true
 ---
 
-<link rel="stylesheet" property="stylesheet" href="../styles/demo.css"/>
+<link rel="stylesheet" property="stylesheet" href="{{ site.url }}/assets/styles/demo.css"/>
 
 <div id="app">
     <div class="loading-demo-message">

manifest.json

@@ -7,9 +7,9 @@
   "background_color": "#463fd4",
   "icons": [
     {
-      "src": "img/favicon.512x512.png",
+      "src": "assets/img/favicon.512x512.png",
       "sizes": "512x512",
       "type": "image/png"
     }
   ]
-}
+}

package.json

@@ -11,10 +11,13 @@
     "node": ">=8.0.0"
   },
   "scripts": {
-    "less": "lessc styles/less/main.less styles/main.css -x --source-map=styles/main.css.map",
-    "build": "npm run less && webpack -p && bundle exec jekyll build",
-    "serve": "npm run less & webpack -w --mode=development & bundle exec jekyll serve --config _config.yml,_config.dev.yml",
-    "start": "npm run serve",
+    "build:js": "webpack --mode=production",
+    "build:styles": "lessc src/styles/main.less assets/build/styles/main.css -x --source-map=assets/build/styles/main.css.map",
+    "build:jekyll": "bundle exec jekyll build",
+    "build": "npm run build:styles && npm run build:js && npm run build:site",
+    "start:js": "webpack -w --mode=development",
+    "start:jekyll": "bundle exec jekyll serve --config _config.yml,_config.dev.yml",
+    "start": "npm run build:styles && npm run start:jekyll",
     "lint": "eslint --ext=.js,.jsx .",
     "lint:fix": "npm run lint -- --fix",
     "test": "npm run lint"

parser/index.html

@@ -2,7 +2,7 @@
 title: ESLint Parser Demo
 layout: demo
 ---
-<link rel="stylesheet" property="stylesheet" href="../styles/parser.css"/>
+<link rel="stylesheet" property="stylesheet" href="{{ site.url }}/assets/styles/parser.css"/>
 
 <div class="row">
     <div class="col-md-6 parserPanel">
@@ -54,4 +54,4 @@ <h3>Options</h3>
     </div>
 </div>
 
-<script type="text/javascript" src="/js/dist/parser.js"></script>
+<script type="text/javascript" src="{{ site.url }}/assets/build/js/parser.js"></script>

js/app/demo/editor.jsx → src/js/demo/editor.jsx

@@ -1,5 +1,5 @@
 import React from "react";
-import orion from "../../vendor/orion/editor/built-editor";
+import orion from "../vendor/orion/editor/built-editor";
 import events from "./events";
 
 var height = 350;

styles/less/bootstrap.less → src/styles/bootstrap.less

@@ -343,7 +343,7 @@ textarea {
 }
 
 .section-intro {
-    background: url('../img/background.svg') no-repeat scroll 100% 10% @brand-primary-light;
+    background: url('../../img/background.svg') no-repeat scroll 100% 10% @brand-primary-light;
     color: #fff;
     padding: 30px 0 40px;
 

styles/less/bootstrap_variables.less → src/styles/bootstrap_variables.less

@@ -22,7 +22,7 @@
 @brand-primary-dark:    darken(@brand-primary, 11.5%);
 @brand-primary-light:   lighten(@brand-primary, 3%);
 @brand-primary-lighter: lighten(@brand-primary, 40%);
-@brand-success:         #19b062; // old color: #5cb85c 
+@brand-success:         #19b062; // old color: #5cb85c
 @brand-warning:         #eb7316; // old color: #f0ad4e
 @brand-danger:          spin(#eb22a1, +33); // old color: #d9534f
 @brand-info:            #6464e2; // old color: #5bc0de
@@ -72,7 +72,7 @@
 // Iconography
 // -------------------------
 
-@icon-font-path:          "../fonts/";
+@icon-font-path:          "../../fonts/";
 @icon-font-name:          "glyphicons-halflings-regular";
 
 

webpack.config.js

@@ -4,20 +4,20 @@ const path = require("path");
 
 module.exports = {
     entry: {
-        demo: ["core-js/stable", "regenerator-runtime/runtime", path.join(__dirname, "js/app/demo/index.js")],
-        parser: ["core-js/stable", "regenerator-runtime/runtime", path.join(__dirname, "js/app/parser/index.js")]
+        demo: ["core-js/stable", "regenerator-runtime/runtime", path.join(__dirname, "src/js/demo/index.js")],
+        parser: ["core-js/stable", "regenerator-runtime/runtime", path.join(__dirname, "src/js/parser/index.js")]
     },
     output: {
-        path: path.join(__dirname, "js/dist"),
+        path: path.join(__dirname, "assets/build/js"),
         filename: "[name].js"
     },
     module: {
         rules: [
             {
                 test: /\.jsx?$/,
                 loaders: ["babel-loader"],
-                include: path.join(__dirname, "js/app"),
-                exclude: /node_modules|js\/vendor/
+                include: path.join(__dirname, "src/js"),
+                exclude: /node_modules|src\/js\/vendor/
             }
         ]
     },