Skip to content

Commit f09b317

Browse files
authored
Merge pull request #1410 from hackmdio/feature/drop-yarn
Drop yarn
2 parents d22ea95 + ae40a76 commit f09b317

File tree

6 files changed

+19739
-14125
lines changed

6 files changed

+19739
-14125
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
node_modules
2-
package-lock.json
32
composer.phar
43
composer.lock
54
.env.*.php

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ node_js:
77
- "12"
88

99
dist: xenial
10-
cache: yarn
10+
cache: npm
1111

1212
matrix:
1313
fast_finish: true
@@ -19,8 +19,8 @@ matrix:
1919
- node_js: "12"
2020

2121
script:
22-
- yarn test:ci
23-
- yarn build
22+
- npm run test:ci
23+
- npm run build
2424

2525
jobs:
2626
include:

bin/setup

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,11 @@ if [ -d .git ]; then
88
cd "$(git rev-parse --show-toplevel)"
99
fi
1010

11-
if ! type yarn > /dev/null
11+
if ! type npm > /dev/null
1212
then
1313
cat << EOF
14-
yarn is not installed, please install Node.js, npm and yarn.
14+
npm is not installed, please install Node.js and npm.
1515
Read more on Node.js official website: https://nodejs.org
16-
And for yarn package manager at: https://yarnpkg.com/en/
1716
Setup will not be run
1817
EOF
1918
exit 0
@@ -29,14 +28,13 @@ if [ ! -f .sequelizerc ]; then
2928
fi
3029

3130
echo "install packages"
32-
yarn install --pure-lockfile
33-
yarn install --production=false --pure-lockfile
31+
npm install
3432

3533
cat << EOF
3634
3735
3836
Edit the following config file to setup CodiMD server and client.
39-
Read more info at https://github.com/hackmdio/codimd#configuration-files
37+
Read more info at https://hackmd.io/c/codimd-documentation/%2Fs%2Fcodimd-configuration
4038
4139
* config.json -- CodiMD config
4240
* .sequelizerc -- db config

deployments/Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@ COPY --chown=hackmd:hackmd . .
55
RUN set -xe && \
66
git reset --hard && \
77
git clean -fx && \
8-
yarn install && \
9-
yarn build && \
10-
yarn install --production=true && \
8+
npm install && \
9+
npm run build && \
1110
cp ./deployments/docker-entrypoint.sh ./ && \
1211
cp .sequelizerc.example .sequelizerc && \
1312
rm -rf .git .gitignore .travis.yml .dockerignore .editorconfig .babelrc .mailmap .sequelizerc.example \
1413
test docs contribute \
15-
yarn.lock webpack.prod.js webpack.htmlexport.js webpack.dev.js webpack.common.js \
14+
package-lock.json webpack.prod.js webpack.htmlexport.js webpack.dev.js webpack.common.js \
1615
config.json.example README.md CONTRIBUTING.md AUTHORS
1716

1817
FROM hackmdio/runtime:1.0.6

0 commit comments

Comments
 (0)