Merge pull request #1410 from hackmdio/feature/drop-yarn

Drop yarn
This commit is contained in:
Raccoon 2020-02-24 16:35:56 +08:00 committed by GitHub
commit f09b317e63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 19739 additions and 14125 deletions

1
.gitignore vendored
View File

@ -1,5 +1,4 @@
node_modules node_modules
package-lock.json
composer.phar composer.phar
composer.lock composer.lock
.env.*.php .env.*.php

View File

@ -7,7 +7,7 @@ node_js:
- "12" - "12"
dist: xenial dist: xenial
cache: yarn cache: npm
matrix: matrix:
fast_finish: true fast_finish: true
@ -19,8 +19,8 @@ matrix:
- node_js: "12" - node_js: "12"
script: script:
- yarn test:ci - npm run test:ci
- yarn build - npm run build
jobs: jobs:
include: include:

View File

@ -8,12 +8,11 @@ if [ -d .git ]; then
cd "$(git rev-parse --show-toplevel)" cd "$(git rev-parse --show-toplevel)"
fi fi
if ! type yarn > /dev/null if ! type npm > /dev/null
then then
cat << EOF cat << EOF
yarn is not installed, please install Node.js, npm and yarn. npm is not installed, please install Node.js and npm.
Read more on Node.js official website: https://nodejs.org Read more on Node.js official website: https://nodejs.org
And for yarn package manager at: https://yarnpkg.com/en/
Setup will not be run Setup will not be run
EOF EOF
exit 0 exit 0
@ -29,14 +28,13 @@ if [ ! -f .sequelizerc ]; then
fi fi
echo "install packages" echo "install packages"
yarn install --pure-lockfile npm install
yarn install --production=false --pure-lockfile
cat << EOF cat << EOF
Edit the following config file to setup CodiMD server and client. Edit the following config file to setup CodiMD server and client.
Read more info at https://github.com/hackmdio/codimd#configuration-files Read more info at https://hackmd.io/c/codimd-documentation/%2Fs%2Fcodimd-configuration
* config.json -- CodiMD config * config.json -- CodiMD config
* .sequelizerc -- db config * .sequelizerc -- db config

View File

@ -5,14 +5,13 @@ COPY --chown=hackmd:hackmd . .
RUN set -xe && \ RUN set -xe && \
git reset --hard && \ git reset --hard && \
git clean -fx && \ git clean -fx && \
yarn install && \ npm install && \
yarn build && \ npm run build && \
yarn install --production=true && \
cp ./deployments/docker-entrypoint.sh ./ && \ cp ./deployments/docker-entrypoint.sh ./ && \
cp .sequelizerc.example .sequelizerc && \ cp .sequelizerc.example .sequelizerc && \
rm -rf .git .gitignore .travis.yml .dockerignore .editorconfig .babelrc .mailmap .sequelizerc.example \ rm -rf .git .gitignore .travis.yml .dockerignore .editorconfig .babelrc .mailmap .sequelizerc.example \
test docs contribute \ test docs contribute \
yarn.lock webpack.prod.js webpack.htmlexport.js webpack.dev.js webpack.common.js \ package-lock.json webpack.prod.js webpack.htmlexport.js webpack.dev.js webpack.common.js \
config.json.example README.md CONTRIBUTING.md AUTHORS config.json.example README.md CONTRIBUTING.md AUTHORS
FROM hackmdio/runtime:1.0.6 FROM hackmdio/runtime:1.0.6

19729
package-lock.json generated Normal file

File diff suppressed because it is too large Load Diff

14111
yarn.lock

File diff suppressed because it is too large Load Diff