Skip to content

Commit

Permalink
Update ember-cli-showdown to ^3.2.1 (#124)
Browse files Browse the repository at this point in the history
* Update ember-cli-showdown to ^3.2.1

Eliminates build-time warning of the form "Warning: ignoring input sourcemap for vendor/showdown.js because ENOENT: no such file or directory, open '[snip]/ember-freestyle/tmp/source_map_concat-input_base_path-[random].tmp/vendor/showdown.js.map'

* Lock yarn version on CI to 0.23.4

Avoids a node-sass issue with later 0.23.x versions yarnpkg/yarn#3485
  • Loading branch information
lukemelia authored and chrislopresto committed Jun 21, 2017
1 parent b8d2c94 commit 58b87e9
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ before_install:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- sleep 3
- curl -o- -L https://yarnpkg.com/install.sh | bash
- curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 0.23.4
- export PATH=$HOME/.yarn/bin:$PATH

install:
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"ember-cli-babel": "^6.0.0",
"ember-cli-htmlbars": "^1.3.0",
"ember-cli-sass": "^6.1.3",
"ember-cli-showdown": "^3.1.0",
"ember-cli-showdown": "^3.2.1",
"ember-runtime-enumerable-includes-polyfill": "^2.0.0",
"es6-promise": "^4.1.0",
"glob": "^7.1.1",
Expand Down
45 changes: 38 additions & 7 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1237,6 +1237,18 @@ broccoli-config-replace@^1.1.2:
debug "^2.2.0"
fs-extra "^0.24.0"

broccoli-debug@^0.6.1:
version "0.6.2"
resolved "https://registry.yarnpkg.com/broccoli-debug/-/broccoli-debug-0.6.2.tgz#4c6e89459fc3de7d5d4fc7b77e57f46019f44db1"
dependencies:
broccoli-plugin "^1.2.1"
fs-tree-diff "^0.5.2"
heimdalljs "^0.2.1"
heimdalljs-logger "^0.1.7"
minimatch "^3.0.3"
symlink-or-copy "^1.1.8"
tree-sync "^1.2.2"

broccoli-filter@^1.2.2, broccoli-filter@^1.2.3:
version "1.2.4"
resolved "https://registry.yarnpkg.com/broccoli-filter/-/broccoli-filter-1.2.4.tgz#409afb94b9a3a6da9fac8134e91e205f40cc7330"
Expand Down Expand Up @@ -1430,7 +1442,7 @@ broccoli-sri-hash@^2.1.0:
sri-toolbox "^0.2.0"
symlink-or-copy "^1.0.1"

broccoli-stew@^1.2.0, broccoli-stew@^1.3.3:
broccoli-stew@^1.2.0:
version "1.4.2"
resolved "https://registry.yarnpkg.com/broccoli-stew/-/broccoli-stew-1.4.2.tgz#9ec4062fd7162c6026561a2fbf64558363aff8d6"
dependencies:
Expand All @@ -1449,6 +1461,25 @@ broccoli-stew@^1.2.0, broccoli-stew@^1.3.3:
symlink-or-copy "^1.1.8"
walk-sync "^0.3.0"

broccoli-stew@^1.3.3, broccoli-stew@^1.5.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/broccoli-stew/-/broccoli-stew-1.5.0.tgz#d7af8c18511dce510e49d308a62e5977f461883c"
dependencies:
broccoli-debug "^0.6.1"
broccoli-funnel "^1.0.1"
broccoli-merge-trees "^1.0.0"
broccoli-persistent-filter "^1.1.6"
broccoli-plugin "^1.3.0"
chalk "^1.1.3"
debug "^2.4.0"
ensure-posix-path "^1.0.1"
fs-extra "^2.0.0"
minimatch "^3.0.2"
resolve "^1.1.6"
rsvp "^3.0.16"
symlink-or-copy "^1.1.8"
walk-sync "^0.3.0"

broccoli-uglify-sourcemap@^1.0.0:
version "1.5.2"
resolved "https://registry.yarnpkg.com/broccoli-uglify-sourcemap/-/broccoli-uglify-sourcemap-1.5.2.tgz#04f84ab0db539031fa868ccfa563c9932d50cedb"
Expand Down Expand Up @@ -2379,15 +2410,15 @@ ember-cli-shims@^1.1.0:
ember-cli-version-checker "^1.2.0"
silent-error "^1.0.1"

ember-cli-showdown@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/ember-cli-showdown/-/ember-cli-showdown-3.1.0.tgz#b7954f50a0459aa903e45982f3ad80002b9a04ca"
ember-cli-showdown@^3.2.1:
version "3.2.1"
resolved "https://registry.yarnpkg.com/ember-cli-showdown/-/ember-cli-showdown-3.2.1.tgz#19fc73670ccb60f59db8703ff5666769dd8d7d94"
dependencies:
broccoli-funnel "^1.0.1"
broccoli-merge-trees "^1.1.1"
broccoli-stew "^1.5.0"
ember-cli-babel "^6.0.0"
ember-cli-htmlbars "^1.1.1"
ember-cli-htmlbars-inline-precompile "^0.4.0"
ember-cli-import-polyfill "^0.2.0"
ember-getowner-polyfill "^1.2.2"
showdown "^1.6.4"
Expand Down Expand Up @@ -4725,7 +4756,7 @@ minimatch@1:
lru-cache "2"
sigmund "~1.0.0"

"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@~3.0.2:
"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@~3.0.2:
version "3.0.3"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774"
dependencies:
Expand Down Expand Up @@ -6532,7 +6563,7 @@ tough-cookie@~2.3.0:
dependencies:
punycode "^1.4.1"

tree-sync@^1.2.1:
tree-sync@^1.2.1, tree-sync@^1.2.2:
version "1.2.2"
resolved "https://registry.yarnpkg.com/tree-sync/-/tree-sync-1.2.2.tgz#2cf76b8589f59ffedb58db5a3ac7cb013d0158b7"
dependencies:
Expand Down

0 comments on commit 58b87e9

Please sign in to comment.