Skip to content

Commit aa46066

Browse files
larryriderlarryrider
authored
Merge branch 'main' into main
2 parents e9e928c + 44f1b0c commit aa46066

95 files changed

Lines changed: 3981 additions & 5346 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.env.template‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
1-
DRIVE_URL=https://drive.internxt.com
2-
DRIVE_API_URL=https://drive.internxt.com/api
1+
DRIVE_WEB_URL=https://drive.internxt.com
32
DRIVE_NEW_API_URL=https://api.internxt.com/drive
4-
PAYMENTS_API_URL=https://api.internxt.com/payments
5-
PHOTOS_API_URL=https://photos.internxt.com/api
63
NETWORK_URL=https://api.internxt.com
74
APP_CRYPTO_SECRET=6KYQBP847D4ATSFA
8-
APP_CRYPTO_SECRET2=8Q8VMUE3BJZV87GT
95
APP_MAGIC_IV=d139cb9a2cd17092e79e1861cf9d7023
10-
APP_MAGIC_SALT=38dce0391b49efba88dbc8c39ebf868f0267eb110bb0012ab27dc52a528d61b1d1ed9d76f400ff58e3240028442b1eab9bb84e111d9dadd997982dbde9dbd25e
11-
RUDDERSTACK_WRITE_KEY=
12-
RUDDERSTACK_DATAPLANE_URL=
6+
APP_MAGIC_SALT=38dce0391b49efba88dbc8c39ebf868f0267eb110bb0012ab27dc52a528d61b1d1ed9d76f400ff58e3240028442b1eab9bb84e111d9dadd997982dbde9dbd25e

‎.github/workflows/commands-unit-tests.yml‎

Lines changed: 28 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,40 @@ on:
33
push:
44
workflow_dispatch:
55

6+
permissions:
7+
contents: read
8+
pull-requests: read
9+
610
jobs:
7-
811
commands-unit-tests:
912
strategy:
1013
matrix:
1114
os: ["ubuntu-latest", "windows-latest", "macos-latest"]
1215
runs-on: ${{ matrix.os }}
1316
steps:
14-
- uses: actions/checkout@v4
15-
- uses: actions/setup-node@v4
17+
- name: Set core.autocrlf to false
18+
run: git config --global core.autocrlf false
19+
20+
- name: Checkout
21+
uses: actions/checkout@v4
22+
23+
- name: Setup Node
24+
uses: actions/setup-node@v4
1625
with:
17-
node-version: 20.11.0
26+
node-version: '22.x'
1827
cache: yarn
19-
# Generate a .npmrc file with the NPM_TOKEN
20-
- run: echo "registry=https://registry.yarnpkg.com/" > .npmrc
21-
- run: echo "@internxt:registry=https://npm.pkg.github.com" >> .npmrc
22-
- run: echo //npm.pkg.github.com/:_authToken=${{ secrets.NPM_TOKEN }} >> .npmrc
23-
- run: echo "always-auth=true" >> .npmrc
24-
# Create env file
25-
- run: echo "${{ secrets.TEST_ENV}}" >> .env
26-
# Install dependencies, build and run tests
27-
- run: yarn install --network-timeout 600000
28-
- run: yarn build
29-
- run: yarn test:unit
28+
29+
- name: Add .env
30+
run: cp .env.template .env
31+
32+
- name: Add .npmrc
33+
run: cp .npmrc.template .npmrc
34+
35+
- name: Install dependencies
36+
run: yarn
37+
38+
- name: Build
39+
run: yarn run build
40+
41+
- name: Run tests
42+
run: yarn test

‎.github/workflows/publish.yml‎

Lines changed: 14 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -13,35 +13,25 @@ jobs:
1313
- uses: actions/checkout@v4
1414
- uses: actions/setup-node@v4
1515
with:
16-
node-version: '20.x'
16+
node-version: '22.x'
17+
cache: yarn
1718

18-
- run: |
19-
echo "@internxt:registry=https://npm.pkg.github.com/" > .npmrc
20-
echo "//npm.pkg.github.com/:_authToken=${{ secrets.GITHUB_TOKEN }}" >> .npmrc
19+
- name: Add .env
20+
run: cp .env.template .env
2121

22-
- run: yarn
22+
- name: Add .npmrc
23+
run: cp .npmrc.template .npmrc
2324

24-
- name: Add .env
25-
run: |
26-
echo "DRIVE_URL=https://drive.internxt.com" >> .env
27-
echo "DRIVE_API_URL=https://drive.internxt.com/api" >> .env
28-
echo "DRIVE_NEW_API_URL=https://api.internxt.com/drive" >> .env
29-
echo "PAYMENTS_API_URL=https://api.internxt.com/payments" >> .env
30-
echo "PHOTOS_API_URL=https://photos.internxt.com/api" >> .env
31-
echo "NETWORK_URL=https://api.internxt.com" >> .env
32-
echo "APP_CRYPTO_SECRET=6KYQBP847D4ATSFA" >> .env
33-
echo "APP_CRYPTO_SECRET2=8Q8VMUE3BJZV87GT" >> .env
34-
echo "APP_MAGIC_IV=d139cb9a2cd17092e79e1861cf9d7023" >> .env
35-
echo "APP_MAGIC_SALT=38dce0391b49efba88dbc8c39ebf868f0267eb110bb0012ab27dc52a528d61b1d1ed9d76f400ff58e3240028442b1eab9bb84e111d9dadd997982dbde9dbd25e" >> .env
36-
echo "RUDDERSTACK_WRITE_KEY=" >> .env
37-
echo "RUDDERSTACK_DATAPLANE_URL=" >> .env
38-
echo "NODE_ENV=production" >> .env
25+
- name: Install dependencies
26+
run: yarn
3927

40-
- run: yarn run build
28+
- name: Build
29+
run: yarn run build
4130

42-
# Change the registry to npmjs (to publish)
43-
- run: |
31+
- name: Set the NPM registry with token
32+
run: |
4433
echo "registry=https://registry.npmjs.org/" > .npmrc
4534
echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> .npmrc
4635
47-
- run: npm publish --scope=@internxt --access public
36+
- name: Publish on NPM
37+
run: npm publish --scope=@internxt --access public

‎.github/workflows/sonarcloud.yml‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,16 @@ jobs:
1919
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
2020
- uses: actions/setup-node@v4
2121
with:
22-
node-version: 20.11.0
22+
node-version: '22.x'
2323
cache: yarn
24-
# Generate a .npmrc file with the NPM_TOKEN
25-
- run: echo "registry=https://registry.yarnpkg.com/" > .npmrc
26-
- run: echo "@internxt:registry=https://npm.pkg.github.com" >> .npmrc
27-
- run: echo //npm.pkg.github.com/:_authToken=${{ secrets.NPM_TOKEN }} >> .npmrc
28-
- run: echo "always-auth=true" >> .npmrc
29-
# Create env file
30-
- run: echo "${{ secrets.TEST_ENV}}" >> .env
31-
# Install dependencies, build and run tests
32-
- run: yarn install --network-timeout 600000
24+
25+
- name: Add .env
26+
run: cp .env.template .env
27+
28+
- name: Add .npmrc
29+
run: cp .npmrc.template .npmrc
30+
31+
- run: yarn
3332
- run: yarn build
3433
- run: yarn test:unit
3534
# Analyze with SonarCloud

‎.github/workflows/stale.yml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: Mark inactive PRs as stalled
2+
3+
on:
4+
schedule:
5+
- cron: '0 7 * * *'
6+
workflow_dispatch:
7+
8+
permissions:
9+
issues: read
10+
pull-requests: write
11+
12+
jobs:
13+
stale:
14+
runs-on: ubuntu-latest
15+
16+
steps:
17+
- uses: actions/stale@v9
18+
with:
19+
repo-token: ${{ secrets.GITHUB_TOKEN }}
20+
days-before-stale: 30
21+
days-before-close: 15
22+
# Custom messages
23+
stale-pr-message: >
24+
This pull request has been inactive for 30 days. Is it still in progress?
25+
If so, please leave a comment or make an update to keep it open. Otherwise, it will be automatically closed in 15 days.
26+
close-pr-message: >
27+
This pull request was automatically closed due to prolonged inactivity.
28+
# Labels
29+
stale-pr-label: stalled
30+
exempt-pr-labels: 'dependencies,blocked'
31+
exempt-draft-pr: true
32+
ascending: true
33+
# Do not process issues
34+
days-before-issue-stale: -1
35+
days-before-issue-close: -1

‎.npmrc.template‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
registry=https://registry.yarnpkg.com/
2-
3-
@internxt:registry=https://npm.pkg.github.com
4-
//npm.pkg.github.com/:_authToken=${NPM_TOKEN}
5-
always-auth=true
2+
3+
@internxt:registry=https://registry.yarnpkg.com/

‎.sequelizerc‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎CODEOWNERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @larryrider

0 commit comments

Comments
 (0)