freifunk/ffffng
0
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Use yarn instead of npm.

Browse source
This commit is contained in:
baldo 2022-05-19 11:12:07 +02:00
parent 8cccf4d9cd
commit 1967637d98
6 changed files with 9094 additions and 32976 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
README.md
View file

@ -325,15 +325,14 @@ fastd-Key und die MAC-Adresse angeben.
### Abhängigkeiten ### Abhängigkeiten
* node.js + NPM * node.js + yarn
* compass (Installation z. B. via Ruby's `gem`) * compass (Installation z. B. via Ruby's `gem`)
* grunt (Installation z. B. via `npm install grunt-cli`) * ggf. bower (Installation z. B. via `yarn install bower`)
* ggf. bower (Installation z. B. via `npm install bower`)
### Build ### Build
`npm run clean && npm run build` `yarn run clean && yarn run build`
Der Output landet dann unter `dist/`. Der Output landet dann unter `dist/`.
@ -341,14 +340,14 @@ Der Output landet dann unter `dist/`.
### Server starten ### Server starten
1. Zunächst eine `config.json` anlegen wie oben unter "Installation / Konfiguration" beschrieben. 1. Zunächst eine `config.json` anlegen wie oben unter "Installation / Konfiguration" beschrieben.
2. `npm run server:run -- -c config.json` 2. `yarn run server:run -- -c config.json`
Der Server ist dann erreichbar unter [http://localhost:8080](http://localhost:8080). Der Server ist dann erreichbar unter [http://localhost:8080](http://localhost:8080).
### Life-Reload vom Client ### Life-Reload vom Client
`npm client:serve` `yarn client:serve`
Der Client ist dann erreichbar via [http://localhost:9000](http://localhost:9000), erwartet aber, dass der Server für Der Client ist dann erreichbar via [http://localhost:9000](http://localhost:9000), erwartet aber, dass der Server für
die REST-API auch läuft (s. o.) und auf Port `8080` erreichbar ist. die REST-API auch läuft (s. o.) und auf Port `8080` erreichbar ist.

2
REFACTOR.md
View file

@ -10,7 +10,7 @@
* Make admin panel part of new frontend package. * Make admin panel part of new frontend package.
* Get rid of grunt. * Get rid of grunt.
* Bluebird for promises? * Bluebird for promises?
* Yarn instead of NPM? * Use generated type guards.
## Mid term ## Mid term

32963
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

8
package.json
View file

@ -19,14 +19,14 @@
"ffffng": "server/main.js" "ffffng": "server/main.js"
}, },
"scripts": { "scripts": {
"test": "npm run server:test", "test": "yarn run server:test",
"build": "npm run server:build && grunt build && rsync -avzL --exclude='*/__mocks__/' --exclude='*.test.*' server-build/ dist/server/", "build": "yarn run server:build && grunt build && rsync -avzL --exclude='*/__mocks__/' --exclude='*.test.*' server-build/ dist/server/",
"clean": "rm -rf server-build/ && grunt clean", "clean": "rm -rf server-build/ && grunt clean",
"dist": "npm run clean && npm run build && npm run test", "dist": "yarn run clean && yarn run build && yarn run test",
"client:serve": "grunt serve", "client:serve": "grunt serve",
"server:test": "jest --config=jest.server.config.js", "server:test": "jest --config=jest.server.config.js",
"server:build": "tsc -b server && ln -sfv ../../server/db/patches ./server-build/db/ && ln -sfv ../server/templates ./server-build/ && ln -sfv ../server/mailTemplates ./server-build/", "server:build": "tsc -b server && ln -sfv ../../server/db/patches ./server-build/db/ && ln -sfv ../server/templates ./server-build/ && ln -sfv ../server/mailTemplates ./server-build/",
"server:run": "npm run server:build && node server-build/main.js" "server:run": "yarn run server:build && node server-build/main.js"
}, },
"dependencies": { "dependencies": {
"async": "^3.2.3", "async": "^3.2.3",

4
publish.sh
View file

@ -41,8 +41,8 @@ fi
echo echo
if confirm "Continue publishing?"; then if confirm "Continue publishing?"; then
npm run dist yarn run dist
cd dist cd dist
npm publish yarn publish
fi fi

9082
yarn.lock Normal file
View file

File diff suppressed because it is too large Load diff