Merge branch '4.4' into 5.1

* 4.4: add a note about npm commands equivalent to yarn's
kaisk23 · Oct 22, 2020 · d33b779 · d33b779
2 parents 04f3eec + f3c629e
commit d33b779
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/frontend/encore/simple-example.rst b/frontend/encore/simple-example.rst
@@ -63,12 +63,18 @@ To build the assets, run:
 
  # compile assets once
  $ yarn encore dev
+ # if you prefer npm, run:
+ $ npm run dev
 
  # or, recompile assets automatically when files change
  $ yarn encore dev --watch
+ # if you prefer npm, run:
+ $ npm run watch
 
  # on deploy, create a production build
  $ yarn encore production
+ # if you prefer npm, run:
+ $ npm run build
 
 .. note::