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.

Sign up for GitHub

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

Jump to bottom

Update Node environments and dependent packages to latest #46

Merged
merged 6 commits into from
Dec 6, 2018
Merged

Update Node environments and dependent packages to latest #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c920982
Upgrade dependent packages to latest
yhatt Dec 6, 2018
49a6b70
Update CI Node environments and check yarn audit
yhatt Dec 6, 2018
6ba8e91
Upgrade development Node version to v10.14.1
yhatt Dec 6, 2018
22c666e
Check `yarn audit` while publish processes
yhatt Dec 6, 2018
c25c0e2
Update Dockerfile to upgrade base node image to 10.14.1
yhatt Dec 6, 2018
4d46b09
Update CHANGELOG.md
yhatt Dec 6, 2018
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
37 changes: 25 additions & 12 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,18 @@ references:
base: &base
working_directory: ~/marp-cli
steps:
# https://github.com/nodejs/docker-node/blob/master/docs/BestPractices.md#upgradingdowngrading-yarn
- run:
name: Upgrade yarn
command: |
sudo -E sh -c 'curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
&& tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \
&& ln -snf /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
&& ln -snf /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
&& rm yarn-v$YARN_VERSION.tar.gz'
environment:
YARN_VERSION: 1.12.3

- checkout

- restore_cache:
Expand All @@ -11,6 +23,7 @@ references:
- dependencies-{{ .Environment.CI_CACHE_KEY }}-{{ .Environment.CIRCLE_JOB }}-

- run: yarn install
- run: yarn audit

- save_cache:
key: dependencies-{{ .Environment.CI_CACHE_KEY }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "yarn.lock" }}-{{ .Branch }}
Expand Down Expand Up @@ -51,20 +64,20 @@ references:

version: 2
jobs:
'10.13.0':
'10.14.1':
<<: *base
docker:
- image: circleci/node:10.13.0-browsers
- image: circleci/node:10.14.1-browsers

'8.12.0':
'8.14.0':
<<: *base
docker:
- image: circleci/node:8.12.0-browsers
- image: circleci/node:8.14.0-browsers

'6.14.4':
'6.15.1':
<<: *base
docker:
- image: circleci/node:6.14.4-browsers
- image: circleci/node:6.15.1-browsers

docker-image:
docker:
Expand All @@ -88,14 +101,14 @@ workflows:
version: 2
build:
jobs:
- 10.13.0
- 8.12.0
- 6.14.4
- 10.14.1
- 8.14.0
- 6.15.1
- docker-image:
requires:
- 10.13.0
- 8.12.0
- 6.14.4
- 10.14.1
- 8.14.0
- 6.15.1
filters:
branches:
only: master
2 changes: 1 addition & 1 deletion .node-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v10.13.0
v10.14.1
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@

- Ignore `node_modules` in globbing ([#45](https://github.com/marp-team/marp-cli/pull/45))

### Changed

- Include [Marpit v0.4.0](https://github.com/marp-team/marpit/releases/tag/v0.4.0) and [Marp Core v0.3.0](https://github.com/marp-team/marp-core/releases/tag/v0.3.0) ([#46](https://github.com/marp-team/marp-cli/pull/46))
- Update Node environments and dependent packages to latest ([#46](https://github.com/marp-team/marp-cli/pull/46))
- Run `yarn audit` while running CI / publish processes ([#46](https://github.com/marp-team/marp-cli/pull/46))

## v0.0.14 - 2018-11-24

### Security
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:10.13.0-alpine
FROM node:10.14.1-alpine
LABEL maintainer "Marp team"

RUN apk update && apk upgrade && \
Expand Down
37 changes: 19 additions & 18 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,35 +29,36 @@
],
"scripts": {
"build": "yarn --silent clean && rollup -c",
"check-audit": "yarn audit",
"check-ts": "tsc --noEmit",
"clean": "rimraf lib",
"format": "prettier \"**/*.{css,js,json,md,scss,ts,yaml,yml}\"",
"format:check": "yarn --silent format -l",
"format:write": "yarn --silent format --write",
"lint:ts": "tslint \"{src,test}/**/*.ts\"",
"lint:css": "stylelint \"src/**/*.{css,scss}\"",
"prepack": "npm-run-all --npm-path yarn --parallel check-ts format:check lint:* test:coverage --sequential build",
"preversion": "npm-run-all --npm-path yarn --parallel check-ts format:check lint:* test:coverage",
"prepack": "npm-run-all --npm-path yarn --parallel check-audit check-ts format:check lint:* test:coverage --sequential build",
"preversion": "npm-run-all --npm-path yarn --parallel check-audit check-ts format:check lint:* test:coverage",
"test": "jest",
"test:coverage": "jest --coverage",
"version": "node version.js && git add -A CHANGELOG.md",
"watch": "rollup -w -c"
},
"devDependencies": {
"@types/cheerio": "^0.22.9",
"@types/cheerio": "^0.22.10",
"@types/chokidar": "^1.7.5",
"@types/cosmiconfig": "^5.0.3",
"@types/express": "^4.16.0",
"@types/get-stdin": "^5.0.1",
"@types/jest": "^23.3.9",
"@types/jest": "^23.3.10",
"@types/jest-plugin-context": "^2.9.0",
"@types/node": "^10.12.10",
"@types/node": "^10.12.12",
"@types/pug": "^2.0.4",
"@types/puppeteer": "^1.10.0",
"@types/supertest": "^2.0.6",
"@types/puppeteer": "^1.11.1",
"@types/supertest": "^2.0.7",
"@types/ws": "^6.0.1",
"@types/yargs": "^12.0.1",
"autoprefixer": "^9.3.1",
"autoprefixer": "^9.4.2",
"bespoke": "^1.1.0",
"bespoke-keys": "^1.1.0",
"cheerio": "^1.0.0-rc.2",
Expand All @@ -69,10 +70,10 @@
"node-sass": "^4.10.0",
"npm-run-all": "^4.1.5",
"postcss-url": "^8.0.0",
"prettier": "^1.15.2",
"prettier": "^1.15.3",
"pug": "^2.0.3",
"rimraf": "^2.6.2",
"rollup": "^0.67.3",
"rollup": "^0.67.4",
"rollup-plugin-commonjs": "^9.2.0",
"rollup-plugin-json": "^3.1.0",
"rollup-plugin-node-resolve": "^3.4.0",
Expand All @@ -81,22 +82,22 @@
"rollup-plugin-terser": "^3.0.0",
"rollup-plugin-typescript": "^1.0.0",
"strip-ansi": "^5.0.0",
"stylelint": "^9.8.0",
"stylelint": "^9.9.0",
"stylelint-config-prettier": "^4.0.0",
"stylelint-config-standard": "^18.2.0",
"stylelint-scss": "^3.4.0",
"stylelint-scss": "^3.4.1",
"supertest": "^3.3.0",
"ts-jest": "23.10.5",
"ts-keycode-enum": "^1.0.6",
"tslib": "^1.9.3",
"tslint": "^5.11.0",
"tslint-config-airbnb": "^5.11.1",
"tslint-config-prettier": "^1.16.0",
"typescript": "^3.1.6"
"tslint-config-prettier": "^1.17.0",
"typescript": "^3.2.1"
},
"dependencies": {
"@marp-team/marp-core": "^0.2.1",
"@marp-team/marpit": "^0.3.1",
"@marp-team/marp-core": "^0.3.0",
"@marp-team/marpit": "^0.4.0",
"chalk": "^2.4.1",
"chokidar": "^2.0.4",
"chrome-launcher": "^0.10.5",
Expand All @@ -109,8 +110,8 @@
"mkdirp": "^0.5.1",
"os-locale": "^3.0.1",
"pkg-up": "^2.0.0",
"portfinder": "^1.0.19",
"puppeteer-core": "^1.10.0",
"portfinder": "^1.0.20",
"puppeteer-core": "^1.11.0",
"serve-index": "^1.9.1",
"tmp": "^0.0.33",
"util.promisify": "^1.0.0",
Expand Down
Loading