Merge pull request #127 from marp-team/upgrade-dependencies

Upgrade development Node and dependent packages to the latest version
marp-team · Feb 23, 2020 · bdb9b67 · bdb9b67
2 parents 11a4897 + a5bb263
commit bdb9b67
Show file tree

Hide file tree

Showing 7 changed files with 1,178 additions and 1,140 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -18,7 +18,7 @@ commands:
         default: []
       yarn:
         type: string
-        default: 1.21.1
+        default: 1.22.0
     steps:
       # https://github.com/nodejs/docker-node/blob/master/docs/BestPractices.md#upgradingdowngrading-yarn
       - run:
@@ -34,17 +34,16 @@ commands:
 
       - restore_cache:
           keys:
-            - v2.1-dependencies-{{ .Environment.CI_CACHE_KEY }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "yarn.lock" }}-{{ .Branch }}
-            - v2.1-dependencies-{{ .Environment.CI_CACHE_KEY }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "yarn.lock" }}-
-            - v2.1-dependencies-{{ .Environment.CI_CACHE_KEY }}-{{ .Environment.CIRCLE_JOB }}-
+            - v2.2-dependencies-{{ .Environment.CI_CACHE_KEY }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "yarn.lock" }}-{{ .Branch }}
+            - v2.2-dependencies-{{ .Environment.CI_CACHE_KEY }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "yarn.lock" }}-
+            - v2.2-dependencies-{{ .Environment.CI_CACHE_KEY }}-{{ .Environment.CIRCLE_JOB }}-
 
       - run: yarn install
       - steps: << parameters.postinstall >>
 
       - save_cache:
-          key: v2.1-dependencies-{{ .Environment.CI_CACHE_KEY }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "yarn.lock" }}-{{ .Branch }}
+          key: v2.2-dependencies-{{ .Environment.CI_CACHE_KEY }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "yarn.lock" }}-{{ .Branch }}
           paths:
-            - node_modules
             - ~/.cache/yarn
 
   audit:
@@ -101,7 +100,10 @@ jobs:
   unit-electron4:
     executor:
       name: node
-      version: '10.11.0'
+
+      # Electron 4 is using Node 10.11.0, but we have to run test with Node
+      # >= 10.14.2 due to https://github.com/facebook/jest/issues/9453.
+      version: '10.14.2'
     steps:
       - test
 

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-12.14.1
+12.16.1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 ## [Unreleased]
 
+### Fixed
+
+- Fix failing PDF/PPTX/image export with [Snapd Chromium](https://snapcraft.io/install/chromium/ubuntu), by bumped [Marp CLI v0.17.1](https://github.com/marp-team/marp-cli/releases/tag/v0.17.1) ([#94](https://github.com/marp-team/marp-vscode/issues/94), [#127](https://github.com/marp-team/marp-vscode/pull/127))
+
+### Changed
+
+- Upgrade Marp CLI to [v0.17.1](https://github.com/marp-team/marp-cli/releases/v0.17.1) ([#127](https://github.com/marp-team/marp-vscode/pull/127))
+- Upgrade development Node and dependent packages to the latest version ([#127](https://github.com/marp-team/marp-vscode/pull/127))
+
 ## v0.12.0 - 2020-01-21
 
 ### Added

diff --git a/package.json b/package.json
@@ -207,13 +207,13 @@
     "watch": "rollup -w -c ./rollup.config.js"
   },
   "devDependencies": {
-    "@rollup/plugin-alias": "^3.0.0",
-    "@rollup/plugin-commonjs": "^11.0.1",
-    "@rollup/plugin-json": "^4.0.1",
-    "@rollup/plugin-node-resolve": "^7.0.0",
-    "@rollup/plugin-typescript": "^2.1.0",
-    "@types/cheerio": "^0.22.15",
-    "@types/jest": "^24.9.0",
+    "@rollup/plugin-alias": "^3.0.1",
+    "@rollup/plugin-commonjs": "^11.0.2",
+    "@rollup/plugin-json": "^4.0.2",
+    "@rollup/plugin-node-resolve": "^7.1.1",
+    "@rollup/plugin-typescript": "^3.0.0",
+    "@types/cheerio": "^0.22.16",
+    "@types/jest": "^25.1.3",
     "@types/lodash.debounce": "^4.0.6",
     "@types/markdown-it": "^0.0.9",
     "@types/vscode": "~1.36.0",
@@ -222,34 +222,34 @@
     "cheerio": "^1.0.0-rc.3",
     "codecov": "^3.6.5",
     "dedent": "^0.7.0",
-    "jest": "^24.9.0",
+    "jest": "^25.1.0",
     "jest-junit": "^10.0.0",
     "lodash.debounce": "^4.0.8",
     "markdown-it": "^10.0.0",
-    "nanoid": "^2.1.9",
+    "nanoid": "^2.1.11",
     "npm-run-all": "^4.1.5",
     "prettier": "^1.19.1",
     "rehype-parse": "^6.0.2",
     "remark": "^11.0.2",
     "remark-parse": "^7.0.2",
-    "rimraf": "^3.0.0",
-    "rollup": "^1.29.1",
+    "rimraf": "^3.0.2",
+    "rollup": "^1.31.1",
     "rollup-plugin-terser": "^5.2.0",
-    "stylelint": "^13.0.0",
+    "stylelint": "^13.2.0",
     "stylelint-config-prettier": "^8.0.1",
-    "stylelint-config-standard": "^19.0.0",
-    "ts-jest": "^24.3.0",
-    "tslint": "^5.20.1",
+    "stylelint-config-standard": "^20.0.0",
+    "ts-jest": "^25.2.1",
+    "tslint": "^6.0.0",
     "tslint-config-airbnb": "^5.11.2",
     "tslint-config-prettier": "^1.18.0",
-    "typescript": "^3.7.5",
+    "typescript": "^3.8.2",
     "unified": "^8.4.2",
-    "unist-util-visit": "^2.0.1",
+    "unist-util-visit": "^2.0.2",
     "yaml": "^1.7.2"
   },
   "dependencies": {
-    "@marp-team/marp-cli": "^0.17.0",
+    "@marp-team/marp-cli": "^0.17.1",
     "@marp-team/marp-core": "^1.0.1",
-    "axios": "^0.19.1"
+    "axios": "^0.19.2"
   }
 }
diff --git a/rollup.config.js b/rollup.config.js
@@ -21,7 +21,7 @@ const plugins = [
   json({ preferConst: true }),
   nodeResolve({ mainFields: ['module', 'jsnext:main', 'main'] }),
   commonjs(),
-  typescript({ resolveJsonModule: false }),
+  typescript({ module: 'esnext' }),
   !process.env.ROLLUP_WATCH && terser(),
 ]
 

diff --git a/tsconfig.json b/tsconfig.json
@@ -3,6 +3,7 @@
     "esModuleInterop": true,
     "lib": ["es6", "dom"],
     "module": "commonjs",
+    "moduleResolution": "node",
     "noImplicitAny": false,
     "outDir": "lib",
     "resolveJsonModule": true,