diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2019-02-27 16:47:10 +0100 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2019-03-01 16:22:24 +0100 |
| commit | 9d17c19f9bfd4061fb99979cbb4e4362c27e212e (patch) | |
| tree | 88b7810b2ee106d1e138fb4140da75be20d60797 | |
| parent | e139bfcd0cd8b4335df8ef208f3ceee574f5300e (diff) | |
| download | mullvadvpn-9d17c19f9bfd4061fb99979cbb4e4362c27e212e.tar.xz mullvadvpn-9d17c19f9bfd4061fb99979cbb4e4362c27e212e.zip | |
Update any mention of yarn workspaces
| -rw-r--r-- | README.md | 6 | ||||
| -rw-r--r-- | gui/geo-data/README.md | 4 | ||||
| -rw-r--r-- | gui/locales/README.md | 6 | ||||
| -rw-r--r-- | gui/package.json | 2 |
4 files changed, 9 insertions, 9 deletions
@@ -177,7 +177,7 @@ sections. 1. Start the GUI in development mode by running: ```bash - yarn workspace desktop develop + yarn develop ``` If you change any javascript file while the development mode is running it will automatically @@ -242,11 +242,11 @@ this procedure, the `integration-tests.sh` script can be used to run all integra ## Command line tools for Electron GUI app development -- `$ yarn workspace desktop develop` - develop app with live-reload enabled +- `$ yarn develop` - develop app with live-reload enabled - `$ yarn lint` - lint code - `$ yarn pack:<OS>` - prepare app for distribution for your platform. Where `<OS>` can be `linux`, `mac` or `win` -- `$ yarn workspace desktop test` - run tests +- `$ yarn test` - run tests ## Repository structure diff --git a/gui/geo-data/README.md b/gui/geo-data/README.md index 8a102e24fd..121ac5cdc8 100644 --- a/gui/geo-data/README.md +++ b/gui/geo-data/README.md @@ -61,12 +61,12 @@ and finally generate the R-Tree cache: npx babel-node prepare-rtree.js ``` -At this point all of the data should be saved in `gui/packages/desktop/geo-data/out` folder. +At this point all of the data should be saved in `gui/geo-data/out` folder. ## App integration notes Once you've extracted all the geo data, run the integration script that will -copy all files ignoring intermediate ones into the `gui/packages/desktop/src/assets/geo` folder: +copy all files ignoring intermediate ones into the `gui/src/assets/geo` folder: ``` python integrate-into-app.py diff --git a/gui/locales/README.md b/gui/locales/README.md index 0845e981be..06fec35119 100644 --- a/gui/locales/README.md +++ b/gui/locales/README.md @@ -23,7 +23,7 @@ Please follow the downlaod instructions at https://www.gnu.org/software/gettext/ ## Adding new translations -Create a new sub-folder under `gui/packages/desktop/locales`, use the locale identifier for the +Create a new sub-folder under `gui/locales`, use the locale identifier for the folder name. The complete list of supported locale identifiers can be found at: @@ -36,8 +36,8 @@ procedure, described in the section below. ## Updating translations -Run `yarn workspace desktop update-translations` to extract the new translations from the source +Run `yarn update-translations` to extract the new translations from the source code and update all of the existing catalogues. The new translations are automatically added to empty sub-folders using the POT template at -`gui/packages/desktop/locales/messages.pot`. Folders that contain a `.gitkeep` file are ignored. +`gui/locales/messages.pot`. Folders that contain a `.gitkeep` file are ignored. diff --git a/gui/package.json b/gui/package.json index 150adf0605..3db27f97f2 100644 --- a/gui/package.json +++ b/gui/package.json @@ -91,7 +91,7 @@ "pack:mac": "run-s build private:pack:mac private:postbuild:mac", "pack:win": "run-s build private:pack:win", "pack:linux": "run-s build private:pack:linux", - "private:format": "prettier \"packages/**/*.{js,css,ts,tsx}\"", + "private:format": "prettier \"**/*.{js,css,ts,tsx}\"", "private:pack:mac": "yarn run private:pack --mac", "private:postbuild:mac": "rimraf ../dist/mac", "private:pack:win": "yarn run private:pack --win", |