Skip to content

WIP - DNM - chore: remove lerna and use npm workspaces instead #3896

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 9 additions & 31 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,15 @@ executors:

commands:
create_concatenated_package_lock:
description: "Concatenate all package-lock.json files recognized by lerna.js into single file. File is used as checksum source for part of caching key."
description: "Concatenate all package-lock.json files from npm workspaces into a single file. File is used as checksum source for part of caching key."
parameters:
filename:
type: string
steps:
- run:
name: Combine package-lock.json files to single file
command: npx lerna la --json | grep '"location":' | awk -F packages '{printf "packages%s\n", $2}' | awk -F '"' '{printf "\"%s/package-lock.json\" ", $1}' | xargs cat > << parameters.filename >>
command: |
npm query '.workspace[]' | jq -r '.[] | "\(.location)/package-lock.json"' | xargs cat > << parameters.filename >>
start_docker_images:
description: Pull docker images for mongo and blockchain nodes
steps:
Expand Down Expand Up @@ -79,44 +80,21 @@ jobs:
- checkout
- use_python2
- use_node
# - run:
# name: Install Chrome
# command: |
# sudo mkdir -p /etc/apt/keyrings
# curl -fsSL https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo gpg --dearmor -o /etc/apt/keyrings/google.gpg
# echo 'deb [arch=amd64 signed-by=/etc/apt/keygrings/google.gpg] http://dl.google.com/linux/chrome/deb/ stable main' | sudo tee /etc/apt/sources.list.d/chrome.list
# set -x && sudo apt-get update && sudo apt-get install -y google-chrome-stable
# export CHROME_BIN=/usr/bin/google-chrome
- run:
name: Print versions
command: |
nvm use default
set -x && node -v && npm -v && google-chrome --version && docker version && python --version
# - restore_dependency_cache
- run: | # TODO figure out how to make this only run on a cache miss in restore_dependency_cache
nvm use default
npm install
- run:
name: Install dependencies
command: |
nvm use default
npm install
- save_cache:
key: node_modules-{{ checksum "package-lock.json" }}-{{ checksum "combined-package-lock.txt" }}
paths:
- node_modules
- packages/bitcore-build/node_modules
- packages/bitcore-client/node_modules
- packages/bitcore-lib/node_modules
- packages/bitcore-lib-cash/node_modules
- packages/bitcore-lib-doge/node_modules
- packages/bitcore-lib-ltc/node_modules
- packages/bitcore-mnemonic/node_modules
- packages/bitcore-node/node_modules
- packages/bitcore-p2p/node_modules
- packages/bitcore-p2p-cash/node_modules
- packages/bitcore-p2p-doge/node_modules
- packages/bitcore-tss/node_modules
- packages/bitcore-wallet/node_modules
- packages/bitcore-wallet-client/node_modules
- packages/bitcore-wallet-service/node_modules
- packages/crypto-wallet-core/node_modules
- packages/insight/node_modules
- packages/*/node_modules
- persist_to_workspace:
root: ~/bitcore
paths:
Expand Down
54 changes: 4 additions & 50 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key
RUN set -x \
&& apt-get update \
&& apt-get install -y \
google-chrome-stable
google-chrome-stable

ENV CHROME_BIN /usr/bin/google-chrome

Expand All @@ -26,56 +26,10 @@ RUN npm i -g [email protected]
WORKDIR /bitcore

# Add source
COPY lerna.json ./
# NOTE(danny): this is really suboptimal, but we will fix as we move to `turbo`
COPY package*.json ./
COPY packages/ ./packages/

COPY ./packages/bitcore-client/package.json ./packages/bitcore-client/package.json
COPY ./packages/bitcore-client/package-lock.json ./packages/bitcore-client/package-lock.json

COPY ./packages/bitcore-build/package.json ./packages/bitcore-build/package.json
COPY ./packages/bitcore-build/package-lock.json ./packages/bitcore-build/package-lock.json

COPY ./packages/bitcore-lib-cash/package.json ./packages/bitcore-lib-cash/package.json
COPY ./packages/bitcore-lib-cash/package-lock.json ./packages/bitcore-lib-cash/package-lock.json

COPY ./packages/bitcore-lib/package.json ./packages/bitcore-lib/package.json
COPY ./packages/bitcore-lib/package-lock.json ./packages/bitcore-lib/package-lock.json

COPY ./packages/bitcore-mnemonic/package.json ./packages/bitcore-mnemonic/package.json
COPY ./packages/bitcore-mnemonic/package-lock.json ./packages/bitcore-mnemonic/package-lock.json

COPY ./packages/bitcore-node/package.json ./packages/bitcore-node/package.json
COPY ./packages/bitcore-node/package-lock.json ./packages/bitcore-node/package-lock.json

COPY ./packages/bitcore-p2p-cash/package.json ./packages/bitcore-p2p-cash/package.json
COPY ./packages/bitcore-p2p-cash/package-lock.json ./packages/bitcore-p2p-cash/package-lock.json

COPY ./packages/bitcore-p2p/package.json ./packages/bitcore-p2p/package.json
COPY ./packages/bitcore-p2p/package-lock.json ./packages/bitcore-p2p/package-lock.json

COPY ./packages/bitcore-wallet-client/package.json ./packages/bitcore-wallet-client/package.json
COPY ./packages/bitcore-wallet-client/package-lock.json ./packages/bitcore-wallet-client/package-lock.json

COPY ./packages/bitcore-wallet-service/package.json ./packages/bitcore-wallet-service/package.json
COPY ./packages/bitcore-wallet-service/package-lock.json ./packages/bitcore-wallet-service/package-lock.json

COPY ./packages/bitcore-wallet/package.json ./packages/bitcore-wallet/package.json
COPY ./packages/bitcore-wallet/package-lock.json ./packages/bitcore-wallet/package-lock.json

COPY ./packages/crypto-wallet-core/package.json ./packages/crypto-wallet-core/package.json
COPY ./packages/crypto-wallet-core/package-lock.json ./packages/crypto-wallet-core/package-lock.json

COPY ./packages/bitcore-lib-ltc/package.json ./packages/bitcore-lib-ltc/package.json
COPY ./packages/bitcore-lib-ltc/package-lock.json ./packages/bitcore-lib-ltc/package-lock.json

COPY ./packages/bitcore-lib-doge/package.json ./packages/bitcore-lib-doge/package.json
COPY ./packages/bitcore-lib-doge/package-lock.json ./packages/bitcore-lib-doge/package-lock.json

COPY ./packages/bitcore-p2p-doge/package.json ./packages/bitcore-p2p-doge/package.json
COPY ./packages/bitcore-p2p-doge/package-lock.json ./packages/bitcore-p2p-doge/package-lock.json


# Install dependencies and build
RUN npm install --ignore-scripts
RUN npm run bootstrap
ADD . .
RUN npm run compile
7 changes: 0 additions & 7 deletions lerna.json

This file was deleted.

Loading