Skip to content

[Front-end] Change public folder to web for 3.4 #10356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 17, 2018
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions frontend/encore/simple-example.rst
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ of your project. It already holds the basic config you need:
They *key* part is ``addEntry()``: this tells Encore to load the ``assets/js/app.js``
file and follow *all* of the ``require`` statements. It will then package everything
together and - thanks to the first ``app`` argument - output final ``app.js`` and
``app.css`` files into the ``public/build`` directory.
``app.css`` files into the ``web/build`` directory.

.. _encore-build-assets:

Expand Down Expand Up @@ -158,8 +158,8 @@ To import values, use ``import``:
// assets/js/app.js
- var $ = require('jquery');
+ import $ from 'jquery';
- require('../css/app.css');

- require('../css/app.css');
+ import '../css/app.css';

.. _multiple-javascript-entries:
Expand Down