Skip to content

Update a bunch of deps #993

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

Merged
RobbieTheWagner merged 2 commits into from
Jun 25, 2019
Merged

Update a bunch of deps #993

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c46cb2
Update a bunch of deps
RobbieTheWagner Jun 24, 2019
507f315
Keep broccoli-babel-transpiler on 6.x
RobbieTheWagner Jun 24, 2019
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
13 changes: 6 additions & 7 deletions ember-cli-build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ const moduleResolver = require('amd-name-resolver').resolveModules({ throwOnRoot
const Funnel = require('broccoli-funnel');
const packageJson = require('./package.json');
const modulesBabelPlugin = require('babel-plugin-transform-es2015-modules-amd');
const mv = stew.mv;
const map = stew.map;
const { map, mv } = stew;

/*global process */

Expand Down Expand Up @@ -76,7 +75,7 @@ module.exports = function(defaults) {
exclude: [
'vendor/loader.js',
'vendor/source-map.js',
'vendor/startup-wrapper.js',
'vendor/startup-wrapper.js'
]
});

Expand All @@ -95,7 +94,7 @@ module.exports = function(defaults) {

let startupWrapper = new Funnel('ember_debug', {
srcDir: 'vendor',
files: ['startup-wrapper.js'],
files: ['startup-wrapper.js']
});

startupWrapper = replace(startupWrapper, {
Expand All @@ -108,12 +107,12 @@ module.exports = function(defaults) {

let sourceMap = new Funnel('ember_debug', {
srcDir: 'vendor',
files: ['source-map.js'],
files: ['source-map.js']
});

const loader = new Funnel('ember_debug', {
srcDir: 'vendor',
files: ['loader.js'],
files: ['loader.js']
});

sourceMap = map(sourceMap, '**/*.js', function(content) {
Expand Down Expand Up @@ -210,7 +209,7 @@ module.exports = function(defaults) {
chrome
]);
} else {
const file = writeFile('index.html', "This Ember version is not supported in development environment.");
const file = writeFile('index.html', 'This Ember version is not supported in development environment.');
const emberDebugFile = writeFile('ember_debug.js', 'void(0);');
chrome = mergeTrees([mv(file, `panes-${version}`), chrome]);
firefox = mergeTrees([mv(file, `panes-${version}`), firefox]);
Expand Down
24 changes: 12 additions & 12 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,20 +34,20 @@
"@ember/optional-features": "^0.7.0",
"@html-next/vertical-collection": "^1.0.0-beta.13",
"amd-name-resolver": "^1.2.1",
"aws-sdk": "^2.383.0",
"babel-eslint": "^10.0.1",
"aws-sdk": "^2.480.0",
"babel-eslint": "^10.0.2",
"babel-plugin-transform-es2015-modules-amd": "^6.24.0",
"basiccontext": "^3.5.1",
"broccoli-asset-rev": "^3.0.0",
"broccoli-babel-transpiler": "^6.5.0",
"broccoli-babel-transpiler": "^7.2.0",
"broccoli-concat": "^3.7.3",
"broccoli-file-creator": "^1.2.0",
"broccoli-file-creator": "^2.1.1",
"broccoli-funnel": "^2.0.1",
"broccoli-merge-trees": "^3.0.2",
"broccoli-stew": "^2.1.0",
"broccoli-stew": "^3.0.0",
"broccoli-string-replace": "^0.1.1",
"codeclimate-test-reporter": "^0.5.1",
"compare-versions": "^3.4.0",
"compare-versions": "^3.5.0",
"del": "^4.1.1",
"ember-cli": "~3.10.1",
"ember-cli-app-version": "^3.2.0",
Expand All @@ -63,16 +63,16 @@
"ember-cli-sass": "^10.0.0",
"ember-cli-shims": "^1.2.0",
"ember-cli-showdown": "^4.4.4",
"ember-cli-stylelint": "^2.2.0",
"ember-cli-stylelint": "^3.0.1",
"ember-cli-template-lint": "^1.0.0-beta.3",
"ember-cli-uglify": "^2.1.0",
"ember-cli-version-checker": "^3.1.3",
"ember-concurrency": "^0.10.0",
"ember-concurrency": "^1.0.0",
"ember-export-application-global": "^2.0.0",
"ember-fetch": "^6.5.1",
"ember-flatpickr": "^2.14.0",
"ember-load-initializers": "^2.0.0",
"ember-math-helpers": "^2.11.1",
"ember-math-helpers": "^2.11.2",
"ember-maybe-import-regenerator": "^0.1.6",
"ember-qunit": "^4.4.1",
"ember-resolver": "^5.0.1",
Expand All @@ -93,9 +93,9 @@
"mkdirp": "^0.5.1",
"qunit-dom": "^0.8.4",
"rimraf": "^2.5.2",
"sass": "^1.20.1",
"stylelint": "^10.0.1",
"stylelint-config-ship-shape": "^0.5.2",
"sass": "^1.21.0",
"stylelint": "^10.1.0",
"stylelint-config-ship-shape": "^0.6.0",
"yauzl": "^2.10.0"
},
"engines": {
Expand Down
Loading
⚡