Mercurial > kallithea
changeset 7099:1969f7dfb6b0
move package.json to root directory
In the future we'll probably use it to manage more then just less/css stuff.
So the less directory is the wrong place.
The most common place is the root directory, so lets put it there.
Also, this way the --prefix parameter for npm is no longer required.
| author | domruf <dominikruf@gmail.com> |
|---|---|
| date | Mon, 18 Dec 2017 22:20:10 +0100 |
| parents | 7f571544a0ea |
| children | 8de1837484e6 |
| files | MANIFEST.in docs/contributing.rst docs/setup.rst docs/upgrade.rst kallithea/public/less/main.less kallithea/public/less/package.json package.json |
| diffstat | 7 files changed, 23 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/MANIFEST.in Wed Oct 19 20:02:33 2016 +0200 +++ b/MANIFEST.in Mon Dec 18 22:20:10 2017 +0100 @@ -19,8 +19,7 @@ include kallithea/lib/paster_commands/template.ini.mako recursive-include kallithea/i18n * recursive-include kallithea/public * -prune kallithea/public/less/node_modules -recursive-include kallithea/public/less/node_modules/bootstrap * +recursive-include node_modules/bootstrap * recursive-include kallithea/templates * recursive-include kallithea/tests/fixtures * recursive-include kallithea/tests/scripts *
--- a/docs/contributing.rst Wed Oct 19 20:02:33 2016 +0200 +++ b/docs/contributing.rst Mon Dec 18 22:20:10 2017 +0100 @@ -37,8 +37,8 @@ pip install --upgrade pip setuptools pip install --upgrade -e . pip install --upgrade -r dev_requirements.txt - npm --prefix kallithea/public/less install # install dependencies - both tools and data - npm --prefix kallithea/public/less run less # for generating css from less + npm install # install dependencies - both tools and data + npm run less # for generating css from less gearbox make-config my.ini gearbox setup-db -c my.ini --user=user --email=user@example.com --password=password --repos=/tmp gearbox serve -c my.ini --reload &
--- a/docs/setup.rst Wed Oct 19 20:02:33 2016 +0200 +++ b/docs/setup.rst Mon Dec 18 22:20:10 2017 +0100 @@ -17,8 +17,8 @@ Then run:: - npm --prefix kallithea/public/less install - npm --prefix kallithea/public/less run less + npm install + npm run less Setting up Kallithea
--- a/docs/upgrade.rst Wed Oct 19 20:02:33 2016 +0200 +++ b/docs/upgrade.rst Mon Dec 18 22:20:10 2017 +0100 @@ -96,8 +96,8 @@ Then run:: - npm --prefix kallithea/public/less install - npm --prefix kallithea/public/less run less + npm install + npm run less 5. Upgrade your configuration
--- a/kallithea/public/less/main.less Wed Oct 19 20:02:33 2016 +0200 +++ b/kallithea/public/less/main.less Mon Dec 18 22:20:10 2017 +0100 @@ -3,8 +3,8 @@ * * Instead, edit the less file(s) and regenerate the css: * - * npm --prefix kallithea/public/less install - * npm --prefix kallithea/public/less run less + * npm install + * npm run less * */
--- a/kallithea/public/less/package.json Wed Oct 19 20:02:33 2016 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ -{ - "name": "kallithea", - "private": true, - "dependencies": { - "bootstrap": "3.3.7" - }, - "devDependencies": { - "less": "~2.7", - "less-plugin-clean-css": "~1.5" - }, - "scripts": { - "less": "lessc --relative-urls main.less ../css/style.css" - } -}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/package.json Mon Dec 18 22:20:10 2017 +0100 @@ -0,0 +1,14 @@ +{ + "name": "kallithea", + "private": true, + "dependencies": { + "bootstrap": "3.3.7" + }, + "devDependencies": { + "less": "~2.7", + "less-plugin-clean-css": "~1.5" + }, + "scripts": { + "less": "lessc --relative-urls kallithea/public/less/main.less kallithea/public/css/style.css" + } +}