Merge branch 'master' of github.com:bolt/four

.babelrc

@@ -0,0 +1,12 @@
+{
+    presets: [
+        ['env', {
+            modules: false,
+            targets: {
+                browsers: '> 1%',
+                uglify: true
+            },
+            useBuiltIns: true
+        }]
+    ]
+}

.gitignore

@@ -46,3 +46,8 @@ yarn-error.log
 !.vscode/tasks.json
 !.vscode/launch.json
 !.vscode/extensions.json
+
+
+### Built Assets ###
+/public/assets/
+/public/assets/manifest.json

README.md

@@ -64,6 +64,6 @@ Build assets
 To set up initially, run `npm install` to get the required dependencies /
 `node_modules`. Then:
 
-  - Run `npm run watch`
+  - Run `npm run serve`
 
 See the other options by running `npm run`.

assets/scss/_editor.scss

@@ -1,5 +1,5 @@
 .trumbowyg-editor {
-  background: #fff;
+  background:$white;
 }
 
 .trumbowyg-box {

assets/scss/vendor/bootstrap/_overrides.scss

@@ -28,32 +28,6 @@ label{
   font-weight:                  $font-weight-bold;
 }
 
-#editcontent {
-  input.large {
-      font-size: 140%;
-      height: auto;
-  }
-
-  input[readonly] {
-      background-color: #f2f2f2;
-      color: #888;
-  }
-
-  .input-group-append .btn {
-      font-weight: normal;
-      font-size: 0.9rem;
-  }
-}
-
-.sl-overlay {
-  background: #000;
-  opacity: 0.85;
-}
-
-.sl-close {
-  color: #FFF;
-}
-
 .custom-select{
   -webkit-appearance: none;
 }

assets/scss/vendor/bootstrap/bootstrap.scss

@@ -1,4 +1,32 @@
 //** Bootstrap
 
 @import '_overrides.scss';
-@import "~bootstrap/scss/bootstrap";
+
+@import "~bootstrap/scss/functions";
+@import "~bootstrap/scss/variables";
+@import "~bootstrap/scss/mixins";
+
+@import "~bootstrap/scss/root";
+@import "~bootstrap/scss/reboot";
+
+
+@import "~bootstrap/scss/grid";
+@import "~bootstrap/scss/tables";
+@import "~bootstrap/scss/forms";
+@import "~bootstrap/scss/buttons";
+@import "~bootstrap/scss/transitions";
+@import "~bootstrap/scss/dropdown";
+@import "~bootstrap/scss/button-group";
+@import "~bootstrap/scss/input-group";
+@import "~bootstrap/scss/custom-forms";
+
+
+@import "~bootstrap/scss/card";
+@import "~bootstrap/scss/alert";
+@import "~bootstrap/scss/progress";
+@import "~bootstrap/scss/nav";
+
+
+@import "~bootstrap/scss/tooltip";
+@import "~bootstrap/scss/utilities";
+@import "~bootstrap/scss/print";

package.json

@@ -4,27 +4,30 @@
   "homepage": "https://bolt.cm",
   "author": "Bob den Otter <bob@twokings.nl> (https://bolt.cm)",
   "license": "MIT",
+  "description": "Bolt 4.0.0 prototype",
+  "keywords": [
+    "bolt",
+    "cms",
+    "php",
+    "symfony",
+    "vue",
+    "content",
+    "management",
+    "system"
+  ],
+  "bugs": {
+    "url": "https://github.com/bobdenotter/symfony-skeleton/issues"
+  },
+  "main": "webpack.config.js",
+  "directories": {
+    "test": "tests"
+  },
   "repository": {
     "type": "git",
     "url": "git://github.com/bobdenotter/symfony-skeleton.git"
   },
-  "devDependencies": {
-    "@symfony/webpack-encore": "^0.20.1",
-    "eslint": "5.7.0",
-    "eslint-config-prettier": "3.1.0",
-    "eslint-plugin-prettier": "3.0.0",
-    "eslint-plugin-vue": "4.7.1",
-    "node-sass": "^4.9.4",
-    "register-service-worker": "^1.5.2",
-    "sass-loader": "^7.1.0",
-    "vue-loader": "^14",
-    "vue-router": "^3.0.1",
-    "vue-template-compiler": "^2.5.17",
-    "workbox-webpack-plugin": "^3.6.2"
-  },
   "dependencies": {
     "axios": "^0.18.0",
-    "babel-polyfill": "^6.26.0",
     "baguettebox.js": "^1.11.0",
     "bootstrap": "^4.1.3",
     "codemirror": "^5.40.2",
@@ -41,13 +44,28 @@
     "vue-trumbowyg": "^3.4.0",
     "vuedraggable": "^2.16.0"
   },
+  "devDependencies": {
+    "@babel/preset-env": "^7.1.0",
+    "@symfony/webpack-encore": "^0.20.1",
+    "autoprefixer": "^9.3.1",
+    "eslint": "5.7.0",
+    "eslint-config-prettier": "3.1.0",
+    "eslint-plugin-prettier": "3.0.0",
+    "eslint-plugin-vue": "4.7.1",
+    "node-sass": "^4.9.4",
+    "postcss-loader": "^3.0.0",
+    "register-service-worker": "^1.5.2",
+    "sass-loader": "^7.1.0",
+    "vue-loader": "^14",
+    "vue-router": "^3.0.1",
+    "vue-template-compiler": "^2.5.17",
+    "workbox-webpack-plugin": "^3.6.2"
+  },
   "scripts": {
     "lint": "eslint --ext .js,.vue, assets",
     "lint-fix": "eslint --ext .js,.vue, assets --fix",
-    "dev-server": "encore dev-server",
-    "dev": "encore dev",
-    "watch": "encore dev --watch",
-    "build": "encore production"
+    "serve": "encore dev-server --port=8001 --progress --disable-host-check",
+    "build": "encore production --progress"
   },
   "eslintConfig": {
     "root": true,
@@ -56,22 +74,7 @@
       "eslint:recommended"
     ]
   },
-  "description": "Bolt 4.0.0 prototype",
-  "bugs": {
-    "url": "https://github.com/bobdenotter/symfony-skeleton/issues"
-  },
-  "main": "webpack.config.js",
-  "directories": {
-    "test": "tests"
-  },
-  "keywords": [
-    "bolt",
-    "cms",
-    "php",
-    "symfony",
-    "vue",
-    "content",
-    "management",
-    "system"
+  "browserslist": [ 
+    "> 1%"
   ]
 }

postcss.config.js

@@ -0,0 +1,5 @@
+module.exports = {
+  plugins: {
+      autoprefixer: {}
+  }
+}

public/assets/brand.svg

@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 121 105">
-  <g fill="#2e2ec2" fill-rule="evenodd">
-    <path d="M29.843 103.857L0 51.812 30.25 0l60.088.23 29.844 52.05-30.245 51.818-60.084-.23-.01-.011zm6.5438-9.9537l.00785.00889 47.0855.18581L107.182 52.23562l-23.3876-42.0498L36.70577 10 13 51.85753 36.3868 93.9033z"/>
-    <path fill-rule="nonzero" d="M42 42h10v20H42z"/>
-    <path fill-rule="nonzero" d="M49.95 47h30v10h-30z"/>
-  </g>
-</svg>

public/assets/manifest.js

@@ -1 +0,0 @@
-!function(r){function n(e){if(t[e])return t[e].exports;var o=t[e]={i:e,l:!1,exports:{}};return r[e].call(o.exports,o,o.exports,n),o.l=!0,o.exports}var e=window.webpackJsonp;window.webpackJsonp=function(t,u,c){for(var f,i,p,a=0,s=[];a<t.length;a++)i=t[a],o[i]&&s.push(o[i][0]),o[i]=0;for(f in u)Object.prototype.hasOwnProperty.call(u,f)&&(r[f]=u[f]);for(e&&e(t,u,c);s.length;)s.shift()();if(c)for(a=0;a<c.length;a++)p=n(n.s=c[a]);return p};var t={},o={2:0};n.m=r,n.c=t,n.d=function(r,e,t){n.o(r,e)||Object.defineProperty(r,e,{configurable:!1,enumerable:!0,get:t})},n.n=function(r){var e=r&&r.__esModule?function(){return r.default}:function(){return r};return n.d(e,"a",e),e},n.o=function(r,n){return Object.prototype.hasOwnProperty.call(r,n)},n.p="/assets/",n.oe=function(r){throw console.error(r),r}}([]);

public/assets/manifest.json

@@ -1,7 +0,0 @@
-{
-  "assets/vendor.js": "/assets/vendor.js",
-  "assets/bolt.js": "/assets/bolt.js",
-  "assets/bolt.css": "/assets/bolt.css",
-  "assets/manifest.js": "/assets/manifest.js",
-  "assets/images/icons.svg": "/assets/images/icons.a61f9085.svg"
-}

webpack.config.js

@@ -1,37 +1,20 @@
 var Encore = require('@symfony/webpack-encore');
-require('babel-polyfill');
-
-const WorkboxPlugin = require('workbox-webpack-plugin');
 
 Encore
-    // the project directory where all compiled assets will be stored
-    .setOutputPath('public/assets/')
-    // the public path used by the web server to access the previous directory
-    .setPublicPath('/assets')
 
-    
-    .addEntry('bolt', './assets/js/bolt.js')
-    .createSharedEntry('vendor', ['babel-polyfill'])
-    // .addEntry('markdown', './assets/js/markdown.js')
+  .setOutputPath('public/assets/')
+  .setPublicPath('/assets')
 
-    .autoProvidejQuery()
-    .enableVueLoader()
-    .enableSassLoader()
+  .cleanupOutputBeforeBuild()
+  .enableSourceMaps(!Encore.isProduction())
+  .enableVersioning(Encore.isProduction())
 
-    // TODO: To keep or be removed if not needed
-    // filenames include a hash that changes whenever the file contents change
-    // .enableVersioning()
+  .setManifestKeyPrefix('assets')
+  .addEntry('bolt', './assets/js/bolt.js')
+
+  .autoProvidejQuery()
+  .enableVueLoader()
+  .enableSassLoader()
 
-    // Workbox should always be the last plugin to add @see: https://developers.google.com/web/tools/workbox/guides/codelabs/webpack#optional-config
-    // .addPlugin(
-    //    new WorkboxPlugin.GenerateSW({
-    //        // these options encourage the ServiceWorkers to get in there fast
-    //        // and not allow any straggling "old" SWs to hang around
-    //        clientsClaim: true,
-    //        skipWaiting: false,
-    //        importsDirectory: 'sw/',
-    // })) 
-;
 
-// export the final configuration
 module.exports = Encore.getWebpackConfig();