Skip to content

Commit

Permalink
Merge pull request #83 from posit-dev/npm
Browse files Browse the repository at this point in the history
Switch from yarn to npm
  • Loading branch information
wch authored Nov 30, 2023
2 parents c6fa4dd + fb95aa4 commit 7c08452
Show file tree
Hide file tree
Showing 10 changed files with 10,125 additions and 8,892 deletions.
8 changes: 0 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,6 @@ __pycache__

playwright/static-build/

.pnp.*
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions

/.luarc.json

_shinylive/py
Expand Down
541 changes: 0 additions & 541 deletions .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

This file was deleted.

783 changes: 0 additions & 783 deletions .yarn/releases/yarn-berry.cjs

This file was deleted.

9 changes: 0 additions & 9 deletions .yarnrc.yml

This file was deleted.

6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,9 @@ dist: buildjs
tar -chzvf $(DIST_DIR)/shinylive-$(SHINYLIVE_VERSION).tar.gz shinylive-$(SHINYLIVE_VERSION)
rm shinylive-$(SHINYLIVE_VERSION)

## Install node modules using yarn
## Install node modules
node_modules: package.json
yarn
npm ci

$(BUILD_DIR)/shinylive/style-resets.css: src/style-resets.css
mkdir -p $(BUILD_DIR)/shinylive
Expand Down Expand Up @@ -343,4 +343,4 @@ distclean: clean

## Run tests
test:
yarn playwright test
npm run playwright test
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ Code for deploying Shiny applications that will run completely in the browser, u

## Prerequisites

`Shinylive` uses `yarn` for dependency management. If running `yarn --version` on the machine throws `command not found` error, install `yarn` on the machine by following the yarn installation documentation [here](https://classic.yarnpkg.com/lang/en/docs/install).

Building Shinylive requires NodeJS.

## Build instructions

Expand Down Expand Up @@ -77,7 +76,7 @@ submodules Update git submodules to commits referenced in this repos
submodules-pull Pull latest changes in git submodules
all Build everything _except_ the shinylive.tar.gz distribution file
dist Build shinylive distribution .tar.gz file
node_modules Install node modules using yarn
node_modules Install node modules
pyodide_packages_local Copy local package wheels to the pyodide directory
buildjs Build JS resources from src/ dir
buildjs-prod Build JS resources for production (with minification)
Expand Down
1 change: 0 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@

nativeBuildInputs = with pkgs; [
nodejs_20
nodePackages.yarn
python311
(with python311Packages; [ pip virtualenv ])
curl
Expand Down
Loading

0 comments on commit 7c08452

Please sign in to comment.