Skip to content

Commit d8389a1

Browse files
Ayushsunnyalexgibson
authored andcommitted
Removed yarn as a dependencies and updated the docs
1 parent cb86fb6 commit d8389a1

File tree

8 files changed

+7932
-6521
lines changed

8 files changed

+7932
-6521
lines changed

.circleci/config.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ jobs:
2424
- checkout
2525
- restore_cache:
2626
keys:
27-
- v1-node-{{ checksum "yarn.lock" }}
27+
- v1-node-{{ checksum "package-lock.json" }}
2828
- v1-node-
2929
- run:
3030
name: JS Tests
3131
command: |
32-
yarn install --pure-lockfile
32+
npm ci
3333
npm run test
3434
- save_cache:
35-
key: v1-node-{{ checksum "yarn.lock" }}
35+
key: v1-node-{{ checksum "package-lock.json" }}
3636
paths:
3737
- node_modules
3838

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ root_files/*/sitemap.xml
5050
root_files/sitemap.json
5151
root_files/etags.json
5252
node_modules
53-
package-lock.json
5453
.vscode/
5554
static_build
5655
static_final

Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ ENV PATH=/app/node_modules/.bin:$PATH
77
WORKDIR /app
88

99
# copy dependency definitions
10-
COPY package.json yarn.lock ./
10+
COPY package.json package-lock.json ./
1111

1212
# install dependencies
13-
RUN yarn install --pure-lockfile
13+
RUN npm ci
1414

1515
# copy supporting files and media
1616
COPY .eslintrc.js .eslintignore .stylelintrc .stylelintignore .prettierignore .prettierrc.json webpack.config.js webpack.static.config.js ./

docs/coding.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ to optimize images before uploading them to the site.
177177

178178
The script `img.sh` can be used to optimize images locally on the command line:
179179

180-
#. Before you run it for the first time you will need to run `yarn` to install dependencies
180+
#. Before you run it for the first time you will need to run `npm install` to install dependencies
181181
#. Add the image files to git's staging area `git add *`
182182
#. Run the script `./bin/img.sh`
183183
#. The optimized files will not automatically be staged, so be sure to add them before commiting

docs/install.rst

+5-5
Original file line numberDiff line numberDiff line change
@@ -150,16 +150,16 @@ credits, release notes, localizations, legal-docs etc::
150150

151151
$ bin/bootstrap.sh
152152

153-
Next, you need to have `Node.js <https://nodejs.org/>`_ and `Yarn <https://yarnpkg.com/>`_ installed.
154-
The node dependencies for running the site can be installed with ``yarn``::
153+
Next, you need to have `Node.js <https://nodejs.org/>`_ and `npm <https://www.npmjs.com/>`_ installed.
154+
The node dependencies for running the site can be installed with ``npm install``::
155155

156-
$ yarn
156+
$ npm install
157157

158158
.. note::
159159

160-
Bedrock uses yarn to ensure that Node.js
160+
Bedrock uses npm to ensure that Node.js
161161
packages that get installed are the exact ones we meant (similar to pip hash checking mode for python). Refer
162-
to the `yarn documentation <https://yarnpkg.com/en/docs/yarn-workflow>`_
162+
to the `npm documentation <https://docs.npmjs.com/>`_
163163
for adding or upgrading Node.js dependencies.
164164

165165
.. _run-python-tests:

package-lock.json

+7,920
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"karma-webpack": "^5.0.0",
4747
"prettier": "^2.4.1",
4848
"sinon": "11.1.2",
49-
"svgo": "^1.2.2",
49+
"svgo": "^2.7.0",
5050
"tinypng-cli": "^0.0.7"
5151
},
5252
"scripts": {

yarn.lock

-6,508
This file was deleted.

0 commit comments

Comments
 (0)