Permalink
Browse files

Merge eyeglass branch 'master' into monorepo

  • Loading branch information...
chriseppstein committed Jan 28, 2019
2 parents e4abb2d + ea89b37 commit c392b1de963938c5aa4a0cf518e284aa057e734a
Showing with 4,881 additions and 7,973 deletions.
  1. +2 −27 .travis.yml
  2. +0 −5,570 package-lock.json
  3. +1 −1 packages/broccoli-eyeglass/LICENSE
  4. +1 −1 packages/broccoli-eyeglass/NOTICE
  5. +2,131 −779 packages/broccoli-eyeglass/package-lock.json
  6. +3 −0 packages/eyeglass/.eslintignore
  7. +14 −0 packages/eyeglass/.eslintrc.js
  8. +1 −0 packages/eyeglass/.node-version
  9. +1 −0 packages/eyeglass/.nyc_output/688fa380-8589-4fa8-9e45-b97618297d0c.json
  10. +1 −0 packages/eyeglass/.nyc_output/7549da25-5947-4b83-a1e3-90da6d928721.json
  11. +18 −0 packages/eyeglass/README.md
  12. +0 −32 packages/eyeglass/build/coverage.js
  13. +0 −13 packages/eyeglass/build/lint.js
  14. +4 −1 packages/eyeglass/build/site.js
  15. +0 −15 packages/eyeglass/build/test.js
  16. +2 −7 packages/eyeglass/gulpfile.js
  17. +2,459 −1,437 packages/eyeglass/package-lock.json
  18. +19 −19 packages/eyeglass/package.json
  19. +5 −1 packages/eyeglass/src/assets/Assets.ts
  20. +1 −1 packages/eyeglass/src/functions/asset-uri.ts
  21. +1 −1 packages/eyeglass/src/importers/AssetImporter.ts
  22. +1 −0 packages/eyeglass/src/importers/FSImporter.ts
  23. +1 −0 packages/eyeglass/src/importers/ImportUtilities.ts
  24. +1 −1 packages/eyeglass/src/importers/ModuleImporter.ts
  25. +7 −1 packages/eyeglass/src/index.js
  26. +63 −53 packages/eyeglass/src/modules/EyeglassModules.ts
  27. +6 −2 packages/eyeglass/src/modules/ModuleFunctions.ts
  28. +6 −2 packages/eyeglass/src/util/Options.ts
  29. +63 −0 packages/eyeglass/src/util/SimpleCache.ts
  30. +1 −0 packages/eyeglass/src/util/deprecator.ts
  31. +2 −0 packages/eyeglass/src/util/semverChecker.ts
  32. +1 −1 packages/eyeglass/src/util/strings.ts
  33. +0 −8 packages/eyeglass/test.sh
  34. 0 packages/eyeglass/test/fixtures/app_assets_odd_names/images/foo\bar.gitignore.png
  35. +65 −0 test/test_SimpleCache.js
@@ -1,33 +1,8 @@
language: node_js
node_js:
- '4'
- '5'
- '6'
#- iojs
- '8'
- '10'
env:
- COVERAGE=true
- COVERAGE=false
matrix:
exclude:
node_js: 'iojs'

before_install:
- if [ $TRAVIS_OS_NAME == "linux" ]; then
export CC="gcc-4.7";
export CXX="g++-4.7";
export LINK="gcc-4.7";
export LINKXX="g++-4.7";
fi
- gcc --version
- g++ --version

addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- gcc-4.7
- g++-4.7
notifications:
slack:
secure: UYwnLYQ+Zt3BGQpYg4uWcbI8cs5+iWh1CWyvrMkYsnJ5vnyuF02kNWhpegawFqy6O0rEbOPcvgw+rsmr2a7x7SIHQ4Ej19rnbIHZEGJDJwd636FnCLzzS9m1fwmAa2cbIa0VufzTyrJwiibC05l31J9/mfSXwo7yZEmPahmlstU=
Oops, something went wrong.

0 comments on commit c392b1d

Please sign in to comment.