Skip to content

Commit

Permalink
Merge branch 'jul/migrate-to-npm' into 'master'
Browse files Browse the repository at this point in the history
Jul/migrate to npm

See merge request TankerHQ/sdk-js!996
  • Loading branch information
JMounier committed Dec 4, 2023
2 parents 934e1d7 + 0fb5b24 commit 3921807
Show file tree
Hide file tree
Showing 22 changed files with 10,489 additions and 5,701 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ jobs:
- Android11Samsung
- Android6Chrome
steps:
- uses: actions/checkout@v1
- uses: actions/setup-node@v2
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
with:
node-version: "18"
- name: install packages
run: yarn install
run: npm install
- name: Tests on ${{ matrix.browser }}
run: yarn karma --browsers ${{ matrix.browser }}
run: npm run karma --browsers ${{ matrix.browser }}
# You can allow a job to pass when this step fails (e.g. temporarily if Browserstack tests
# are too flaky), by uncommenting the following line:
# continue-on-error: true
Expand Down Expand Up @@ -56,16 +56,16 @@ jobs:
fail-fast: false
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/setup-node@v2
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
with:
node-version: "18"
- name: install packages
run: yarn install
run: npm install
- name: build TypeScript
run: yarn build
run: npm run build
- name: Tests on Node 18
run: yarn coverage
run: npm run coverage
env:
BROWSER_STACK_ACCESS_KEY: ${{ secrets.BROWSER_STACK_ACCESS_KEY }}
BROWSER_STACK_USERNAME: ${{ secrets.BROWSER_STACK_USERNAME }}
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ __pycache__
.cache
functional_test_list.json

package-lock.json
yarn.lock
5 changes: 3 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ default:
before_script:
- poetry -V
- node -v
- npm --version
- poetry install --sync
- poetry run python --version

Expand Down Expand Up @@ -254,8 +255,8 @@ audit:
- .rules/nightly
stage: check
script:
- yarn
- yarn audit --groups "dependencies optionalDependencies"
- npm install
- npm audit --omit dev
tags: !reference [.tags/linux, tags]

deploy:
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,11 +116,11 @@ To build the JavaScript SDKs yourself, please follow the steps below.

### Prerequisites

Install [Yarn](https://yarnpkg.com/en/docs/install) version 1.0 or higher.
Install the lastest version of [npm](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm).

Use this command to check the Yarn version installed on your system:
Use this command to check the npm version installed on your system:
```bash
yarn -v
npm --version
```

### Install dependencies
Expand All @@ -132,7 +132,7 @@ git clone https://github.com/TankerHQ/sdk-js.git

Install dependencies:
```bash
cd sdk-js && yarn
cd sdk-js && npm install
```

### Test and lint
Expand All @@ -142,7 +142,7 @@ Our codebase uses the following ES6 features: `async` / `await`, `import` / `exp
To check that the code is correct and to launch the tests in Node.js, use:

```bash
yarn proof
npm run proof
```

### Submit your pull request
Expand Down
Loading

0 comments on commit 3921807

Please sign in to comment.