diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-06-23 09:25:01 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-23 09:25:01 +0200 |
commit | 49e2854d5c15bbce3f24f91da34450e8f209295b (patch) | |
tree | f5aa95445549cc151e86f144b40464eecee28cf7 /composer.json | |
parent | 4eaaa27bb5b9a5725b26471a39548d764fc9cd0a (diff) | |
parent | 496cfdc0172fd55cb555f74b64704c8f50c71b77 (diff) | |
download | wallabag-49e2854d5c15bbce3f24f91da34450e8f209295b.tar.gz wallabag-49e2854d5c15bbce3f24f91da34450e8f209295b.tar.zst wallabag-49e2854d5c15bbce3f24f91da34450e8f209295b.zip |
Merge pull request #2142 from wallabag/v2-use-npm
Manage assets through npm
Diffstat (limited to 'composer.json')
-rw-r--r-- | composer.json | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/composer.json b/composer.json index c4edd3c2..a8ab2a59 100644 --- a/composer.json +++ b/composer.json | |||
@@ -48,7 +48,6 @@ | |||
48 | "doctrine/doctrine-bundle": "^1.6", | 48 | "doctrine/doctrine-bundle": "^1.6", |
49 | "doctrine/doctrine-cache-bundle": "^1.2", | 49 | "doctrine/doctrine-cache-bundle": "^1.2", |
50 | "twig/extensions": "~1.0", | 50 | "twig/extensions": "~1.0", |
51 | "symfony/assetic-bundle": "~2.3", | ||
52 | "symfony/swiftmailer-bundle": "^2.3", | 51 | "symfony/swiftmailer-bundle": "^2.3", |
53 | "symfony/monolog-bundle": "^2.8", | 52 | "symfony/monolog-bundle": "^2.8", |
54 | "sensio/distribution-bundle": "^5.0", | 53 | "sensio/distribution-bundle": "^5.0", |
@@ -81,7 +80,8 @@ | |||
81 | "mnapoli/piwik-twig-extension": "^1.0", | 80 | "mnapoli/piwik-twig-extension": "^1.0", |
82 | "lexik/maintenance-bundle": "~2.1", | 81 | "lexik/maintenance-bundle": "~2.1", |
83 | "ocramius/proxy-manager": "1.*", | 82 | "ocramius/proxy-manager": "1.*", |
84 | "white-october/pagerfanta-bundle": "^1.0" | 83 | "white-october/pagerfanta-bundle": "^1.0", |
84 | "mouf/nodejs-installer": "~1.0" | ||
85 | }, | 85 | }, |
86 | "require-dev": { | 86 | "require-dev": { |
87 | "doctrine/doctrine-fixtures-bundle": "~2.2", | 87 | "doctrine/doctrine-fixtures-bundle": "~2.2", |
@@ -95,7 +95,6 @@ | |||
95 | "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters", | 95 | "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters", |
96 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap", | 96 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap", |
97 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", | 97 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", |
98 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets", | ||
99 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile", | 98 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile", |
100 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::prepareDeploymentTarget" | 99 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::prepareDeploymentTarget" |
101 | ], | 100 | ], |
@@ -112,7 +111,6 @@ | |||
112 | "symfony-var-dir": "var", | 111 | "symfony-var-dir": "var", |
113 | "symfony-web-dir": "web", | 112 | "symfony-web-dir": "web", |
114 | "symfony-tests-dir": "tests", | 113 | "symfony-tests-dir": "tests", |
115 | "symfony-assets-install": "relative", | ||
116 | "incenteev-parameters": { | 114 | "incenteev-parameters": { |
117 | "file": "app/config/parameters.yml" | 115 | "file": "app/config/parameters.yml" |
118 | } | 116 | } |