зеркало из https://github.com/mozilla/fxa.git
chore(deps): update top-level dependencies
start-android is no longer needed so it was removed along with its dependencies and replaced by adb-reverse I removed `adr-log` in favor of running `npx adr-log` to make `npm ci` smaller. `concurrently` is no longer used. The remainder were updated to their latest versions.
This commit is contained in:
Danny Coates
Родитель
4f9d81cb72
Коммит
7f60ef5769
21
README.md
21
README.md
|
|
@ -304,10 +304,16 @@ where `filematcher` is a regex that matches against test file paths. If you omit
|
|||
|
||||
### Android debugging
|
||||
|
||||
The following technique works with any Android application and can also be used for Firefox for Android (making the [Firefox for Android](#firefox-for-android) section optional).
|
||||
The following technique works with any Android application and can also be used for Firefox for Android.
|
||||
|
||||
Simply forward the following ports from the host machine to the Android device:
|
||||
|
||||
```
|
||||
npm run adb-reverse
|
||||
```
|
||||
|
||||
or
|
||||
|
||||
```
|
||||
adb reverse tcp:3030 tcp:3030 # Content server
|
||||
adb reverse tcp:9000 tcp:9000 # Auth server
|
||||
|
|
@ -331,19 +337,6 @@ start making changes to the email service then do the following:
|
|||
1. Build the service: `cd packages/fxa-email-service; cargo build --bin fxa_email_send`
|
||||
1. Run the service: `cd packages/fxa-email-service; ./scripts/run_send.sh`
|
||||
|
||||
### Firefox for Android
|
||||
|
||||
> Skip this if you are not working on Firefox for Android and FxA.
|
||||
|
||||
You can test sync locally in Firefox for Android using an emulator or a device on the same network. These docs were tested with the [Genymotion](https://www.genymotion.com/download) simulator.
|
||||
|
||||
- Install Firefox on the device or emulator.
|
||||
- Run `npm run start-android` this will: stop all local FxA servers, create a local PM2 configuration and rerun the servers.
|
||||
|
||||
The script will tell you which IP to use to work with FxA.
|
||||
|
||||
Follow the instructions of the script to update values in `about:config`.
|
||||
|
||||
---
|
||||
|
||||
### Firefox for iOS
|
||||
|
|
|
|||
|
|
@ -0,0 +1,7 @@
|
|||
#!/bin/bash -ex
|
||||
|
||||
adb reverse tcp:3030 tcp:3030 # Content server
|
||||
adb reverse tcp:9000 tcp:9000 # Auth server
|
||||
adb reverse tcp:9010 tcp:9010 # OAuth server
|
||||
adb reverse tcp:1111 tcp:1111 # Profile server
|
||||
adb reverse tcp:5000 tcp:5000 # Sync server
|
||||
|
|
@ -1,63 +0,0 @@
|
|||
var fs = require('fs');
|
||||
var path = require('path');
|
||||
var execSync = require('child_process').execSync;
|
||||
var chalk = require('chalk');
|
||||
var internalIp = require('internal-ip');
|
||||
var ip = internalIp.v4();
|
||||
|
||||
function createConfig () {
|
||||
var servers = require('../servers.json');
|
||||
|
||||
function findConfig(name) {
|
||||
return servers.apps.findIndex(servers.apps, function(obj) {
|
||||
return obj.name === name;
|
||||
});
|
||||
}
|
||||
|
||||
function setConf(idx, name, value) {
|
||||
servers.apps[idx].env[name] = value;
|
||||
}
|
||||
|
||||
var auth = findConfig('auth-server key server PORT 9000');
|
||||
var content = findConfig('content-server PORT 3030');
|
||||
var oauth = findConfig('oauth-server PORT 9010');
|
||||
|
||||
setConf(auth, 'CONTENT_SERVER_URL', 'http://' + ip + ':3030');
|
||||
setConf(auth, 'PUBLIC_URL', 'http://' + ip + ':9000');
|
||||
setConf(auth, 'MAILER_HOST', ip);
|
||||
setConf(auth, 'SMTP_PORT', '9999');
|
||||
setConf(auth, 'OAUTH_URL', 'http://' + ip + ':9010');
|
||||
|
||||
setConf(content, 'PUBLIC_URL', 'http://' + ip + ':3030');
|
||||
setConf(content, 'FXA_URL', 'http://' + ip + ':9000');
|
||||
setConf(content, 'FXA_OAUTH_URL', 'http://' + ip + ':9010');
|
||||
setConf(content, 'FXA_PROFILE_URL', 'http://' + ip + ':1111');
|
||||
setConf(content, 'FXA_PROFILE_IMAGES_URL', 'http://' + ip + ':1112');
|
||||
|
||||
setConf(oauth, 'PUBLIC_URL', 'http://' + ip + ':9010');
|
||||
setConf(oauth, 'CONTENT_URL', 'http://' + ip + ':3030/oauth');
|
||||
setConf(oauth, 'ISSUER', ip + ':9000');
|
||||
setConf(oauth, 'VERIFICATION_URL', 'http://' + ip + ':5050/v2');
|
||||
|
||||
fs.writeFileSync(path.join(__dirname, '..', 'servers_android.json'), JSON.stringify(servers, null, 2));
|
||||
}
|
||||
|
||||
function run(cmd) {
|
||||
var result = execSync(cmd);
|
||||
console.log(result.toString());
|
||||
}
|
||||
|
||||
run(__dirname + '/../pm2 kill');
|
||||
createConfig(ip);
|
||||
run(__dirname + '/../pm2 start servers_android.json');
|
||||
|
||||
console.log(chalk.green('***********'));
|
||||
console.log(chalk.green('Access the fxa-content-server via:', 'http://' + ip + ':3030'));
|
||||
console.log(chalk.green('***********'));
|
||||
console.log(chalk.green('Make sure your Firefox for Android configuration is the following:'));
|
||||
console.log(chalk.green('identity.fxaccounts.auth.uri', ' http://' + ip + ':9000/v1'));
|
||||
console.log(chalk.green('identity.fxaccounts.remote.oauth.uri', ' http://' + ip + ':9010/v1'));
|
||||
console.log(chalk.green('identity.fxaccounts.remote.profile.uri', ' http://' + ip + ':1111/v1'));
|
||||
console.log(chalk.green('identity.fxaccounts.remote.webchannel.uri', 'http://' + ip + ':3030'));
|
||||
console.log(chalk.green('***********'));
|
||||
console.log(chalk.green('Add http://' + ip + ':3030 to "webchannel.allowObject.urlWhitelist"'));
|
||||
|
|
@ -1,18 +1,19 @@
|
|||
# Architectural Decision Log
|
||||
|
||||
This log lists the architectural decisions for [project name].
|
||||
This log lists the architectural decisions for FxA.
|
||||
|
||||
<!-- adrlog -- Regenerate the content by using "adr-log -i". You can install it via "npm install -g adr-log" -->
|
||||
<!-- adrlog -- Regenerate the content by using "npx adr-log -i" from a shell in this directory. -->
|
||||
|
||||
- [ADR-0000](0000-use-markdown-architectural-decision-records.md) - Use Markdown Architectural Decision Records
|
||||
- [ADR-0001](0001-isolating-payment-content-with-third-party-widgets-from-general-account-management.md) - Isolating payment content with third-party widgets from general account management
|
||||
- [ADR-0002](0002-use-react-redux-and-typescript-for-subscription-management-pages.md) - Use React, Redux, and Typescript for subscription management pages
|
||||
- [ADR-0003](0003-event-broker-for-subscription-platform.md) - Event Broker for Subscription Platform
|
||||
- [ADR-0004](0004-product-capabilities-for-subscription-services.md) - Product Capabilities for Subscription Services
|
||||
- [ADR-0005](0005-minimize-password-entry.md) - Minimizing password entry
|
||||
- [ADR-0006](0006-json-schemas-for-messaging.md) - Utilizing JSON-Schemas, SemVer, and Tooling for JSON Messaging
|
||||
- [ADR-0007](0007-subscription-claim-jwt-access-token.md) - Placing subscription info in the `fxa-subscriptions` claim of JWT access tokens
|
||||
- [ADR-0008](0008-redis-lua-scripts.md) - Using lua for Redis transactions
|
||||
- [ADR-0000](../adr0000-use-markdown-architectural-decision-records.md) - Use Markdown Architectural Decision Records
|
||||
- [ADR-0001](../adr0001-isolating-payment-content-with-third-party-widgets-from-general-account-management.md) - Isolating payment content with third-party widgets from general account management
|
||||
- [ADR-0002](../adr0002-use-react-redux-and-typescript-for-subscription-management-pages.md) - Use React, Redux, and Typescript for subscription management pages
|
||||
- [ADR-0003](../adr0003-event-broker-for-subscription-platform.md) - Event Broker for Subscription Platform
|
||||
- [ADR-0004](../adr0004-product-capabilities-for-subscription-services.md) - Product Capabilities for Subscription Services
|
||||
- [ADR-0005](../adr0005-minimize-password-entry.md) - Minimizing password entry
|
||||
- [ADR-0006](../adr0006-json-schemas-for-messaging.md) - Utilizing JSON-Schemas, SemVer, and Tooling for JSON Messaging
|
||||
- [ADR-0007](../adr0007-subscription-claim-jwt-access-token.md) - Placing subscription info in the `fxa-subscriptions` claim of JWT access tokens
|
||||
- [ADR-0008](../adr0008-redis-lua-scripts.md) - Redis Lua Scripts
|
||||
- [ADR-0009](../adr0009-testing-stacks.md) - Consistency in testing tools
|
||||
|
||||
<!-- adrlogstop -->
|
||||
|
||||
|
|
|
|||
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
38
package.json
38
package.json
|
|
@ -11,7 +11,7 @@
|
|||
"stop": "pm2 kill",
|
||||
"firefox": "./packages/fxa-dev-launcher/bin/fxa-dev-launcher",
|
||||
"start-firefox": "npm run firefox",
|
||||
"start-android": "node _scripts/start-android.js",
|
||||
"adb-reverse": "./_scripts/adb-reverse.sh",
|
||||
"test": "lerna run test",
|
||||
"config-fxios": "node _scripts/config-fxios.js",
|
||||
"format": "lerna run format"
|
||||
|
|
@ -27,19 +27,14 @@
|
|||
"author": "Mozilla (https://mozilla.org/)",
|
||||
"license": "MPL-2.0",
|
||||
"dependencies": {
|
||||
"adr-log": "^2.1.1",
|
||||
"chalk": "1.1.1",
|
||||
"diffparser": "^2.0.1",
|
||||
"hot-shots": "^6.4.1",
|
||||
"husky": "^2.5.0",
|
||||
"internal-ip": "1.2.0",
|
||||
"lerna": "^3.16.4",
|
||||
"lint-staged": "^8.2.1",
|
||||
"madr": "^2.1.2",
|
||||
"node-fetch": "^2.3.0",
|
||||
"pm2": "^3.5.1",
|
||||
"husky": "^4.2.3",
|
||||
"lerna": "^3.20.2",
|
||||
"lint-staged": "^10.0.8",
|
||||
"node-fetch": "^2.6.0",
|
||||
"pm2": "^4.2.3",
|
||||
"prettier": "^1.19.1",
|
||||
"replace-in-file": "0.2.1"
|
||||
"replace-in-file": "^5.0.2"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=12",
|
||||
|
|
@ -79,26 +74,21 @@
|
|||
"lint-staged": {
|
||||
"*.js": [
|
||||
"eslint -c .eslintrc",
|
||||
"prettier --write",
|
||||
"git add"
|
||||
"prettier --write"
|
||||
],
|
||||
"*.{ts,tsx}": [
|
||||
"prettier --write",
|
||||
"git add"
|
||||
"prettier --write"
|
||||
],
|
||||
"*.css": [
|
||||
"prettier --write",
|
||||
"git add"
|
||||
"prettier --write"
|
||||
],
|
||||
"*.md": [
|
||||
"prettier --write",
|
||||
"git add"
|
||||
"prettier --write"
|
||||
]
|
||||
},
|
||||
"devDependencies": {
|
||||
"concurrently": "5.1.0",
|
||||
"eslint": "6.6.0",
|
||||
"eslint-plugin-fxa": "2.0.1",
|
||||
"eslint-plugin-jest": "^23.0.3"
|
||||
"eslint": "^6.8.0",
|
||||
"eslint-plugin-fxa": "^2.0.2",
|
||||
"eslint-plugin-jest": "^23.8.2"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче