]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Merge pull request #2142 from wallabag/v2-use-npm
authorNicolas LÅ“uillet <nicolas@loeuillet.org>
Thu, 23 Jun 2016 07:25:01 +0000 (09:25 +0200)
committerGitHub <noreply@github.com>
Thu, 23 Jun 2016 07:25:01 +0000 (09:25 +0200)
Manage assets through npm

1  2 
composer.json

diff --combined composer.json
index c4edd3c2e9bf2450571eb3770a8a4473d2aaee34,253211a316c59a904a494353dd9b706619729e45..a8ab2a5961c19368dc17cd7f37a4515c22ee3884
@@@ -48,7 -48,6 +48,6 @@@
          "doctrine/doctrine-bundle": "^1.6",
          "doctrine/doctrine-cache-bundle": "^1.2",
          "twig/extensions": "~1.0",
-         "symfony/assetic-bundle": "~2.3",
          "symfony/swiftmailer-bundle": "^2.3",
          "symfony/monolog-bundle": "^2.8",
          "sensio/distribution-bundle": "^5.0",
          "mnapoli/piwik-twig-extension": "^1.0",
          "lexik/maintenance-bundle": "~2.1",
          "ocramius/proxy-manager": "1.*",
-         "white-october/pagerfanta-bundle": "^1.0"
+         "white-october/pagerfanta-bundle": "^1.0",
+         "mouf/nodejs-installer": "~1.0"
      },
      "require-dev": {
          "doctrine/doctrine-fixtures-bundle": "~2.2",
          "sensio/generator-bundle": "^3.0",
          "phpunit/phpunit": "~4.4",
          "symfony/phpunit-bridge": "^2.7",
 -        "fabpot/php-cs-fixer": "~1.9"
 +        "friendsofphp/php-cs-fixer": "~1.9"
      },
      "scripts": {
          "post-cmd": [
              "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
              "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
              "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
-             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
              "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile",
              "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::prepareDeploymentTarget"
          ],
          "symfony-var-dir": "var",
          "symfony-web-dir": "web",
          "symfony-tests-dir": "tests",
-         "symfony-assets-install": "relative",
          "incenteev-parameters": {
              "file": "app/config/parameters.yml"
          }