Skip to content

Commit 63d3e18

Browse files
committed
chore(customs): Update refs to use libs instead of fxa-shared
Because: - Cleaning up code duplication This Commit: - References @fxa/shared/sentry - References @fxa/shared/otel - References @fxa/shared/monitoring
1 parent 419af1b commit 63d3e18

5 files changed

Lines changed: 13 additions & 4 deletions

File tree

packages/fxa-customs-server/lib/config/config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* License, v. 2.0. If a copy of the MPL was not distributed with this
33
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
44

5-
const { tracingConfig } = require('fxa-shared/tracing/config');
5+
const { tracingConfig } = require('@fxa/shared/otel');
66
const { makeRedisConfig } = require('fxa-shared/db/config');
77

88
module.exports = function (fs, path, url, convict) {

packages/fxa-customs-server/lib/monitoring.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
44

55
const Sentry = require('@sentry/node');
6-
const { initMonitoring } = require('fxa-shared/monitoring');
6+
const { initMonitoring } = require('@fxa/shared/monitoring');
77
const config = require('./config').getProperties();
88
const log = require('./log')(config.log.level, 'configure-sentry');
99
const { version } = require('../package.json');

packages/fxa-customs-server/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"audit": "npm audit --json | audit-filter --nsp-config=.nsprc --audit=-",
2222
"lint": "eslint .",
2323
"test": "scripts/test-local.sh",
24-
"test-unit": "yarn make-artifacts-dir && tap test/local --jobs=1 | tap-xunit > ../../artifacts/tests/$npm_package_name/fxa-customs-server-tap-unit-results.xml",
24+
"test-unit": "yarn make-artifacts-dir && tap test/local --node-arg=-r --node-arg=esbuild-register --jobs=1 | tap-xunit > ../../artifacts/tests/$npm_package_name/fxa-customs-server-tap-unit-results.xml",
2525
"test-integration": "yarn make-artifacts-dir && tap test/remote --jobs=1 | tap-xunit > ../../artifacts/tests/$npm_package_name/fxa-customs-server-tap-integration-results.xml",
2626
"format": "prettier --write --config ../../_dev/.prettierrc '**'",
2727
"make-artifacts-dir": "mkdir -p ../../artifacts/tests/$npm_package_name"

packages/fxa-customs-server/pm2.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module.exports = {
1010
apps: [
1111
{
1212
name: 'customs',
13-
script: 'node bin/customs_server.js',
13+
script: 'node -r esbuild-register bin/customs_server.js',
1414
cwd: __dirname,
1515
max_restarts: '1',
1616
env: {
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"extends": "../../tsconfig.base.json",
3+
"compilerOptions": {
4+
"allowJs": true,
5+
"checkJs": false,
6+
"noEmit": true
7+
},
8+
"include": ["lib/**/*", "test/**/*"]
9+
}

0 commit comments

Comments
 (0)