Skip to content

Commit

Permalink
Added .gitattributes and config cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
moay committed Feb 23, 2018
1 parent ebd8406 commit 3e0cb7c
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 9 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
public/build/* linguist-vendored
2 changes: 1 addition & 1 deletion config/bundles.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true],
Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true],
Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true, 'test' => true],
Symfony\Bundle\WebServerBundle\WebServerBundle::class => ['dev' => true],
Symfony\Bundle\WebServerBundle\WebServerBundle::class => ['all' => true],
Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle::class => ['all' => true],
Http\HttplugBundle\HttplugBundle::class => ['all' => true],
];
3 changes: 3 additions & 0 deletions config/packages/framework.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,6 @@ framework:

# APCu (not recommended with heavy random-write workloads as memory fragmentation can cause perf issues)
#app: cache.adapter.apcu

assets:
json_manifest_path: '%kernel.root_dir%/../public/build/manifest.json'
2 changes: 0 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
"vue-template-compiler": "^2.5.13",
"vuetify": "^1.0.1"
},
"license": "MIT",
"private": true,
"scripts": {
"dev-server": "encore dev-server",
"dev": "encore dev",
Expand Down
2 changes: 1 addition & 1 deletion public/build/dashboard.js

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions templates/dashboard.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
<link href='{{ asset('build/dashboard.css') }}' rel="stylesheet">
<link href='https://fonts.googleapis.com/css?family=Roboto:300,400,500,700|Material+Icons' rel="stylesheet">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, minimal-ui">
<style>
body { color:#fff }
body a { color:#fff }
</style>
</head>
<body>
<div id="dashboard">
Expand Down
6 changes: 1 addition & 5 deletions webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
var Encore = require('@symfony/webpack-encore');

Encore
// the project directory where compiled assets will be stored
.setOutputPath('public/build/')
// the public path used by the web server to access the previous directory
.setPublicPath('/build')
.cleanupOutputBeforeBuild()
.enableSourceMaps(!Encore.isProduction())
.enableVersioning(Encore.isProduction())
.enableVueLoader()

// uncomment to define the assets of the project
.addEntry('dashboard', './assets/js/dashboard.js')

.enableVueLoader()
;

module.exports = Encore.getWebpackConfig();

0 comments on commit 3e0cb7c

Please sign in to comment.