Skip to content
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

Upgrade dependent packages to the latest version #378

Merged
merged 3 commits into from
Aug 17, 2021
Merged
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
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ commands:
- v2.3-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "yarn.lock" }}-
- v2.3-dependencies-{{ .Environment.CIRCLE_JOB }}-

- run: yarn install
- run: yarn install --frozen-lockfile
- steps: << parameters.postinstall >>

- save_cache:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/github-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
node-version: ${{ steps.node_version.outputs.nvmrc }}
- name: Install yarn
run: cd $HOME && yarn policies set-version $YARN_VERSION
- run: yarn install
- run: yarn install --frozen-lockfile
- name: Build and create standalone binaries
run: yarn build:standalone
- name: Create package
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
yarn_cache-${{ runner.os }}-

- name: Install dependencies with yarn
run: yarn install
run: yarn install --frozen-lockfile

# Retry tests up to 3 times due to flaky tests on Windows CI
# https://stackoverflow.com/a/59365905
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
### Changed

- Reduce dependencies ([#375](https://github.com/marp-team/marp-cli/pull/375))
- Upgrade Marpit to [v2.1.1](https://github.com/marp-team/marpit/releases/tag/v2.1.1) ([#378](https://github.com/marp-team/marp-cli/pull/378))
- Upgrade Marp Core to [v2.1.1](https://github.com/marp-team/marp-core/releases/tag/v2.1.1) ([#378](https://github.com/marp-team/marp-cli/pull/378))
- Upgrade dependent packages to the latest version ([#378](https://github.com/marp-team/marp-cli/pull/378))

## v1.3.1 - 2021-08-12

Expand Down
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ ENV IS_DOCKER true
WORKDIR /home/marp/.cli
COPY --chown=marp:marp . /home/marp/.cli/
RUN yarn add puppeteer-core@chrome-$(chromium-browser --version | sed -r 's/^Chromium ([0-9]+).+$/\1/') || true
RUN yarn install && yarn build && rm -rf ./src ./node_modules && yarn install --production && yarn cache clean \
RUN yarn install --frozen-lockfile && yarn build && \
rm -rf ./src ./node_modules && yarn install --production --frozen-lockfile && yarn cache clean \
&& node /home/marp/.cli/marp-cli.js --version

USER root
Expand Down
29 changes: 14 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,14 @@
"@tsconfig/node12": "^1.0.9",
"@types/cheerio": "^0.22.30",
"@types/express": "^4.17.13",
"@types/jest": "^27.0.0",
"@types/node": "~14.17.5",
"@types/jest": "^27.0.1",
"@types/node": "~14.17.9",
"@types/pug": "^2.0.5",
"@types/supertest": "^2.0.11",
"@types/ws": "^7.4.7",
"@types/yargs": "^17.0.2",
"@typescript-eslint/eslint-plugin": "^4.29.1",
"@typescript-eslint/parser": "^4.29.1",
"@typescript-eslint/eslint-plugin": "^4.29.2",
"@typescript-eslint/parser": "^4.29.2",
"autoprefixer": "^10.3.1",
"babel-plugin-transform-rename-import": "^2.3.0",
"bespoke": "bespokejs/bespoke",
Expand All @@ -97,11 +97,11 @@
"eslint-plugin-jest": "^24.4.0",
"express": "^4.17.1",
"get-stdin": "^9.0.0",
"globby": "^12.0.0",
"globby": "^12.0.1",
"image-size": "^1.0.0",
"jest": "^27.0.6",
"jest-junit": "^12.2.0",
"nanoid": "^3.1.23",
"nanoid": "^3.1.25",
"npm-run-all": "^4.1.5",
"os-locale": "^6.0.0",
"pdf-lib": "^1.16.0",
Expand All @@ -116,20 +116,20 @@
"rimraf": "^3.0.2",
"rollup": "^2.56.2",
"rollup-plugin-license": "^2.5.0",
"rollup-plugin-postcss": "^4.0.0",
"rollup-plugin-postcss": "^4.0.1",
"rollup-plugin-pug": "^1.1.1",
"rollup-plugin-terser": "^7.0.2",
"sass": "^1.37.5",
"sass": "^1.38.0",
"strip-ansi": "^7.0.0",
"stylelint": "^13.13.1",
"stylelint-config-prettier": "^8.0.2",
"stylelint-config-standard": "^22.0.0",
"stylelint-scss": "^3.20.1",
"supertest": "^6.1.4",
"supertest": "^6.1.5",
"tar-stream": "^2.2.0",
"ts-jest": "^27.0.4",
"ts-jest": "^27.0.5",
"ts-key-enum": "^2.0.7",
"tslib": "^2.3.0",
"tslib": "^2.3.1",
"typed-emitter": "^1.3.1",
"typescript": "^4.3.5",
"vhtml": "^2.2.0",
Expand All @@ -138,8 +138,8 @@
"zip-stream": "^4.1.0"
},
"dependencies": {
"@marp-team/marp-core": "^2.1.0",
"@marp-team/marpit": "^2.1.0",
"@marp-team/marp-core": "^2.1.1",
"@marp-team/marpit": "^2.1.1",
"chokidar": "^3.5.2",
"cosmiconfig": "^7.0.0",
"import-from": "^4.0.0",
Expand All @@ -149,10 +149,9 @@
"tmp": "^0.2.1",
"v8-compile-cache": "^2.3.0",
"ws": "^8.1.0",
"yargs": "^17.1.0"
"yargs": "^17.1.1"
},
"resolutions": {
"cssnano": "^5.0.7",
"pug": "^3.0.2",
"pug-runtime": "^3.0.1"
},
Expand Down
Loading