language
stringclasses
1 value
owner
stringlengths
2
15
repo
stringlengths
2
21
sha
stringlengths
45
45
message
stringlengths
7
36.3k
path
stringlengths
1
199
patch
stringlengths
15
102k
is_multipart
bool
2 classes
Other
emberjs
ember.js
0a14db2b3ead32f1e2938775629143f183f70200.json
Remove usage of bower.
.travis.yml
@@ -9,22 +9,14 @@ addons: firefox: "latest" cache: - directories: - - $HOME/.yarn - - $HOME/.yarn-cache - - $HOME/.cache # includes bowers cache + yarn: true before_install: - curl -o- -L https://yarnpkg.com/install.sh | bash - "phantomjs --version" - export DISPLAY=:99.0 - sh -e /etc/init.d/xvfb start -install: - - "yarn global add bower" - - "yarn install --prefer-offline" - - "bower install" - after_success: - "./bin/publish_builds"
true
Other
emberjs
ember.js
0a14db2b3ead32f1e2938775629143f183f70200.json
Remove usage of bower.
bower.json
@@ -1,10 +0,0 @@ -{ - "name": "ember", - "repository": { - "type": "git", - "url": "https://github.com/emberjs/ember.js.git" - }, - "devDependencies": { - "ember-dev": "https://github.com/emberjs/ember-dev.git#eace5340485bdb5e4223ab67fecf4aff31c1940c" - } -}
true
Other
emberjs
ember.js
0a14db2b3ead32f1e2938775629143f183f70200.json
Remove usage of bower.
ember-cli-build.js
@@ -288,11 +288,21 @@ function handlebarsFix() { } } -module.exports = function() { +function treeForAddon(project, name) { + var addon = project.findAddonByName(name); + var tree = addon.treeFor('addon'); + + return new Funnel(tree, { + srcDir: 'modules' + }); +} + +module.exports = function(options) { var features = getFeatures(); var version = getVersion(); var vendorPackages = { + 'ember-dev': treeForAddon(options.project, 'ember-dev'), 'external-helpers': vendoredPackage('external-helpers'), 'loader': vendoredPackage('loader'), 'rsvp': rsvp(),
true
Other
emberjs
ember.js
0a14db2b3ead32f1e2938775629143f183f70200.json
Remove usage of bower.
package.json
@@ -66,8 +66,9 @@ "ember-cli-dependency-checker": "^1.2.0", "ember-cli-sauce": "^2.0.0", "ember-cli-yuidoc": "0.8.4", + "ember-dev": "github:emberjs/ember-dev#eace534", "ember-publisher": "0.0.7", - "emberjs-build": "0.19.0", + "emberjs-build": "0.20.0", "express": "^4.5.0", "finalhandler": "^0.4.0", "git-repo-info": "^1.1.4",
true
Other
emberjs
ember.js
0a14db2b3ead32f1e2938775629143f183f70200.json
Remove usage of bower.
yarn.lock
@@ -1679,7 +1679,7 @@ [email protected]: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" -ember-cli-babel@^5.1.3: +ember-cli-babel@^5.0.0, ember-cli-babel@^5.1.3: version "5.2.1" resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-5.2.1.tgz#14a1a7b3ae9e9f1284f7bcdb142eb53bd0b1b5bd" dependencies: @@ -1928,6 +1928,12 @@ [email protected]: walk-sync "^0.3.0" yam "0.0.22" +"ember-dev@github:emberjs/ember-dev#eace534": + version "0.0.0" + resolved "https://codeload.github.com/emberjs/ember-dev/tar.gz/eace534" + dependencies: + ember-cli-babel "^5.0.0" + [email protected]: version "0.0.7" resolved "https://registry.yarnpkg.com/ember-publisher/-/ember-publisher-0.0.7.tgz#865ca69ef47bafb38120a84244aa58b950ca4850" @@ -1969,9 +1975,9 @@ ember-try@^0.2.6: semver "^5.1.0" sync-exec "^0.6.2" [email protected]: - version "0.19.0" - resolved "https://registry.yarnpkg.com/emberjs-build/-/emberjs-build-0.19.0.tgz#ff53601f207df1aecb23359c2ca04d463cab77dd" [email protected]: + version "0.20.0" + resolved "https://registry.yarnpkg.com/emberjs-build/-/emberjs-build-0.20.0.tgz#3f60a570599f5d5544c3419bb55b83a3ccb510b0" dependencies: amd-name-resolver "0.0.4" broccoli "0.16.3"
true
Other
emberjs
ember.js
f6127e356c5e29f44176d2e2d5f566954b5bad2f.json
Add script to link glimmer `npm run link:glimmer`
bin/yarn-link-glimmer.js
@@ -0,0 +1,34 @@ +#!/usr/bin/env node +"use strict"; +const child_process = require("child_process"); +const glimmerDeps = []; + +addGlimmerPackageDeps(require("../package"), true); + +glimmerDeps.forEach(dep => { + console.log(dep); + child_process.execSync(`yarn link "${dep}"`); +}); + +function addGlimmerDep(glimmerDep) { + if (glimmerDeps.indexOf(glimmerDep) === -1) { + glimmerDeps.push(glimmerDep); + addGlimmerPackageDeps(require(`${glimmerDep}/package`), false); + } +} + +function addGlimmerDeps(dependencies) { + if (!dependencies) return; + Object.keys(dependencies).forEach(dep => { + if (dep.lastIndexOf("@glimmer", 0) === 0) { + addGlimmerDep(dep); + } + }); +} + +function addGlimmerPackageDeps(packageJson, dev) { + addGlimmerDeps(packageJson["dependencies"]); + if (dev) { + addGlimmerDeps(packageJson["devDependencies"]); + } +}
true
Other
emberjs
ember.js
f6127e356c5e29f44176d2e2d5f566954b5bad2f.json
Add script to link glimmer `npm run link:glimmer`
package.json
@@ -24,7 +24,8 @@ "test": "node bin/run-tests.js", "test:blueprints": "node node-tests/nodetest-runner.js", "test:sauce": "node bin/run-sauce-tests.js", - "test:testem": "testem -f testem.dist.json" + "test:testem": "testem -f testem.dist.json", + "link:glimmer": "node bin/yarn-link-glimmer.js" }, "dependencies": { "@glimmer/compiler": "^0.21.1",
true
Other
emberjs
ember.js
73734fe2d7173b83d01052626a4b12291dfeb77b.json
Fix issues with auto-publishing script.
bin/publish_npm_and_bower
@@ -65,11 +65,12 @@ fi #### NPM PUBLISHING -if [[ "$TRAVIS_TAG" =~ ^v[0-9.]+$ ]]; then - echo -e "Publishing to npm...\n" - +if [[ "$TRAVIS_TAG" =~ ^v[0-9.]+ ]]; then echo $NPM_AUTH_TOKEN > ~/.npmrc + NPM_USER=`npm whoami` + echo -e "Publishing to npm as $NPM_USER...\n" + if [[ "$CHANNEL" == "release" ]]; then npm publish else @@ -79,11 +80,12 @@ fi #### RUBYGEMS PUBLISHING -if [[ "$TRAVIS_TAG" =~ ^v[0-9.]+$ ]]; then +if [[ "$TRAVIS_TAG" =~ ^v[0-9.]+ ]]; then echo -e "Publishing to RubyGems...\n" mkdir -p ~/.gem echo $RUBYGEMS_AUTH_TOKEN > ~/.gem/credentials + chmod 0600 ~/.gem/credentials gem build ember-source.gemspec gem push ember-source-${TRAVIS_TAG:1}.gem @@ -104,7 +106,7 @@ git remote add origin https://${USER}:${GH_TOKEN}@github.com/${COMPONENTS_EMBER_ git add -A git commit -m "Ember Bower Auto build for https://github.com/emberjs/ember.js/commit/${TRAVIS_COMMIT}." -if [[ "$TRAVIS_TAG" =~ ^v[0-9.]+$ ]]; then +if [[ "$TRAVIS_TAG" =~ ^v[0-9.]+ ]]; then echo -e "Creating tag ${TRAVIS_TAG:1}" git tag ${TRAVIS_TAG:1} PUSH_TARGET=${TRAVIS_TAG:1}
false
Other
emberjs
ember.js
41a7e721dcbe19fd8aebdd73a8c274ef5d8af217.json
Update "handlebars" to v4.0.6
ember-cli-build.js
@@ -274,13 +274,16 @@ function qunit() { } function handlebarsFix() { - var HANDLEBARS_UTIL = /\/utils.js$/; + var HANDLEBARS_PARSER = /\/parser.js$/; return { load: function(id) { - if (HANDLEBARS_UTIL.test(id)) { + if (HANDLEBARS_PARSER.test(id)) { var code = fs.readFileSync(id, 'utf8'); return { - code: code.replace(/export var isFunction/, 'export { isFunction }'), + code: code + .replace('exports.__esModule = true;', '') + .replace('exports[\'default\'] = handlebars;', 'export default handlebars;'), + map: { mappings: null } }; }
true
Other
emberjs
ember.js
41a7e721dcbe19fd8aebdd73a8c274ef5d8af217.json
Update "handlebars" to v4.0.6
package.json
@@ -40,7 +40,7 @@ "ember-cli-test-info": "^1.0.0", "ember-cli-valid-component-name": "^1.0.0", "ember-cli-version-checker": "^1.1.7", - "handlebars": "~3", + "handlebars": "^4.0.6", "jquery": "^3.1.1", "resolve": "^1.1.7", "rsvp": "^3.3.3",
true
Other
emberjs
ember.js
41a7e721dcbe19fd8aebdd73a8c274ef5d8af217.json
Update "handlebars" to v4.0.6
yarn.lock
@@ -2847,7 +2847,7 @@ growly@^1.2.0: version "1.3.0" resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" -handlebars@^3.0.1, handlebars@^3.0.3, handlebars@~3: +handlebars@^3.0.1, handlebars@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-3.0.3.tgz#0e09651a2f0fb3c949160583710d551f92e6d2ad" dependencies: @@ -2856,7 +2856,7 @@ handlebars@^3.0.1, handlebars@^3.0.3, handlebars@~3: optionalDependencies: uglify-js "~2.3" -handlebars@^4.0.4: +handlebars@^4.0.4, handlebars@^4.0.6: version "4.0.6" resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.6.tgz#2ce4484850537f9c97a8026d5399b935c4ed4ed7" dependencies:
true
Other
emberjs
ember.js
630e1e95d3155696d66cb72e5665c566b28cf195.json
Introduce macro backdoor
packages/ember-glimmer/lib/syntax.js
@@ -69,6 +69,15 @@ function refineBlockSyntax(sexp, builder) { return false; } +let experimentalMacros = []; + +// This is a private API to allow for expiremental macros +// to be created in user space. Registering a macro should +// should be done in an initializer. +export function registerMacros(macro) { + experimentalMacros.push(macro); +} + export function populateMacros(blocks, inlines) { inlines.add('outlet', outletMacro); inlines.add('component', inlineComponentMacro); @@ -81,5 +90,10 @@ export function populateMacros(blocks, inlines) { blocks.add('-with-dynamic-vars', _withDynamicVarsMacro); blocks.add('-in-element', _inElementMacro); blocks.addMissing(refineBlockSyntax); + + for (let i = 0; i < experimentalMacros.length; i++) { + let macro = experimentalMacros[i]; + macro(blocks, inlines); + } return { blocks, inlines }; }
false
Other
emberjs
ember.js
85bfc2ea3af21945e12adfc6b528e961a4885383.json
Integrate Glimmer Macros For Binary-based VM This also changes the build to use the individual glimmer packages
ember-cli-build.js
@@ -107,6 +107,46 @@ function routeRecognizer() { }); } +function buildPackage(name, options) { + options = options ? options : {}; + var packageJson = require(name + '/package'); + var packageDir = path.dirname(require.resolve(name + '/package')); + + if (options.entry && !options.srcDir) { + throw new Error('If resolving from a non-package.json entry point, you must supply the srcDirectory.'); + } + + var entryModule = packageJson['module'] || packageJson['js:next'] || packageJson['main'].replace(/dist\//, 'dist/es6/'); + var funnelDir = path.join(packageDir, options.entry ? options.srcDir : path.dirname(entryModule)); + var sourceEntry = options.entry ? options.entry : path.basename(entryModule); + + var es6 = new Funnel(funnelDir, { + include: ['**/*.js' ] + }); + var moduleId = options.moduleId ? options.moduleId : name; + var destination = options.dest ? options.dest + '.js': moduleId + '.js'; + var external = options.external ? options.external : []; + var plugins = options.plugins ? options.plugins : []; + var rolledUp = new Rollup(es6, { + rollup: { + external: external, + entry: sourceEntry, + dest: destination, + plugins: plugins, + format: 'es', + moduleId: moduleId, + exports: 'named' + }, + annotation: destination + }); + + var transpileES6 = require('emberjs-build/lib/utils/transpile-es6'); + + return transpileES6(rolledUp, name, { + stripRuntimeChecks: true + }); +} + function router() { return new Rollup(path.resolve(path.dirname(require.resolve('router_js')), '../lib'), { rollup: { @@ -197,27 +237,6 @@ function babelConfigFor(environment) { }; } -var glimmerEngine = require('glimmer-engine/ember-cli-build')({ - shouldExternalizeHelpers: true, - stripRuntimeChecks: true -}); - -function glimmerPackage(name) { - return replace(new Funnel(glimmerEngine, { - include: [ - 'named-amd/' + name + '.js', - 'named-amd/' + name + '/**/*.js' - ] - }), { - files: ['**/*.js'], - pattern: { - match: /\/\/#\s+sourceMappingURL.*/g, - replacement: '' - }, - annotation: 'strip sourceMappingURL' - }); -} - function getVersion() { var projectPath = process.cwd(); var info = getGitInfo(projectPath); @@ -254,6 +273,21 @@ function qunit() { }); } +function handlebarsFix() { + var HANDLEBARS_UTIL = /\/utils.js$/; + return { + load: function(id) { + if (HANDLEBARS_UTIL.test(id)) { + var code = fs.readFileSync(id, 'utf8'); + return { + code: code.replace(/export var isFunction/, 'export { isFunction }'), + map: { mappings: null } + }; + } + } + } +} + module.exports = function() { var features = getFeatures(); var version = getVersion(); @@ -268,16 +302,26 @@ module.exports = function() { 'route-recognizer': routeRecognizer(), 'simple-html-tokenizer': htmlbarsPackage('simple-html-tokenizer', { libPath: 'node_modules/glimmer-engine/dist/es6' }), - 'glimmer': glimmerPackage('glimmer'), - 'glimmer-compiler': glimmerPackage('glimmer-compiler'), - 'glimmer-reference': glimmerPackage('glimmer-reference'), - 'glimmer-runtime': glimmerPackage('glimmer-runtime'), - 'glimmer-node': glimmerPackage('glimmer-node'), - 'glimmer-syntax': glimmerPackage('glimmer-syntax'), - 'glimmer-test-helpers': glimmerPackage('glimmer-test-helpers'), - 'glimmer-util': glimmerPackage('glimmer-util'), - 'glimmer-wire-format': glimmerPackage('glimmer-wire-format'), - 'handlebars': glimmerPackage('handlebars') // inlined parser + '@glimmer/compiler': buildPackage('@glimmer/compiler', { + external: ['@glimmer/syntax', '@glimmer/wire-format', '@glimmer/util'] + }), + '@glimmer/reference': buildPackage('@glimmer/reference', { external: ['@glimmer/util'] }), + '@glimmer/runtime': buildPackage('@glimmer/runtime', { + external: ['@glimmer/util', + '@glimmer/reference', + '@glimmer/wire-format', + '@glimmer/syntax'] + }), + '@glimmer/node': buildPackage('@glimmer/node', { external: ['@glimmer/runtime'] }), + '@glimmer/syntax': buildPackage('@glimmer/syntax', { external: ['handlebars', 'simple-html-tokenizer'] }), + '@glimmer/test-helpers': buildPackage('@glimmer/test-helpers'), + '@glimmer/util': buildPackage('@glimmer/util', { external: [] }), + '@glimmer/wire-format': buildPackage('@glimmer/wire-format', { external: ['@glimmer/util'] }), + 'handlebars': buildPackage('handlebars', { + srcDir: 'lib', + entry: 'handlebars/compiler/base.js', + plugins: [handlebarsFix()] + }) // inlined parser }; // Replace _getBowerTree with one from npm @@ -349,7 +393,7 @@ module.exports = function() { development: getFeatures('development'), production: getFeatures('production') }, - glimmer: require('glimmer-engine'), + glimmer: require('@glimmer/compiler'), packages: getPackages(features), vendoredPackages: vendorPackages, version: version
true
Other
emberjs
ember.js
85bfc2ea3af21945e12adfc6b528e961a4885383.json
Integrate Glimmer Macros For Binary-based VM This also changes the build to use the individual glimmer packages
lib/packages.js
@@ -17,12 +17,12 @@ module.exports = function(features) { templateCompilerVendor: [ 'simple-html-tokenizer', 'backburner', - 'glimmer-wire-format', - 'glimmer-syntax', - 'glimmer-util', - 'glimmer-compiler', - 'glimmer-reference', - 'glimmer-runtime', + '@glimmer/wire-format', + '@glimmer/syntax', + '@glimmer/util', + '@glimmer/compiler', + '@glimmer/reference', + '@glimmer/runtime', 'handlebars' ] }, @@ -37,12 +37,11 @@ module.exports = function(features) { requirements: ['container', 'ember-metal', 'ember-routing' ], hasTemplates: true, vendorRequirements: [ - 'glimmer', - 'glimmer-runtime', - 'glimmer-reference', - 'glimmer-util', - 'glimmer-wire-format', - 'glimmer-node' + '@glimmer/runtime', + '@glimmer/reference', + '@glimmer/util', + '@glimmer/wire-format', + '@glimmer/node' ], testingVendorRequirements: [] }
true
Other
emberjs
ember.js
85bfc2ea3af21945e12adfc6b528e961a4885383.json
Integrate Glimmer Macros For Binary-based VM This also changes the build to use the individual glimmer packages
package.json
@@ -27,6 +27,11 @@ "test:testem": "testem -f testem.dist.json" }, "dependencies": { + "@glimmer/compiler": "^0.21.1", + "@glimmer/node": "^0.21.1", + "@glimmer/reference": "^0.21.0", + "@glimmer/runtime": "^0.21.1", + "@glimmer/util": "^0.21.0", "broccoli-stew": "^1.2.0", "ember-cli-get-component-path-option": "^1.0.0", "ember-cli-normalize-entity-name": "^1.0.0", @@ -35,12 +40,14 @@ "ember-cli-test-info": "^1.0.0", "ember-cli-valid-component-name": "^1.0.0", "ember-cli-version-checker": "^1.1.7", + "handlebars": "~3", "jquery": "^3.1.1", "resolve": "^1.1.7", "rsvp": "^3.3.3", "simple-dom": "^0.3.0" }, "devDependencies": { + "@glimmer/test-helpers": "^0.21.1", "aws-sdk": "~2.2.43", "babel-plugin-feature-flags": "^0.2.3", "babel-plugin-filter-imports": "~0.2.0", @@ -64,7 +71,7 @@ "git-repo-info": "^1.1.4", "git-repo-version": "^0.3.1", "github": "^0.2.3", - "glimmer-engine": "^0.19.4", + "glimmer-engine": "^0.20.0", "glob": "^5.0.13", "html-differ": "^1.3.4", "mocha": "^2.4.5",
true
Other
emberjs
ember.js
85bfc2ea3af21945e12adfc6b528e961a4885383.json
Integrate Glimmer Macros For Binary-based VM This also changes the build to use the individual glimmer packages
packages/ember-glimmer/lib/component.js
@@ -16,8 +16,8 @@ import { deprecate } from 'ember-metal'; import { UPDATE, RootReference } from './utils/references'; -import { DirtyableTag } from 'glimmer-reference'; -import { readDOMAttr } from 'glimmer-runtime'; +import { DirtyableTag } from '@glimmer/reference'; +import { readDOMAttr } from '@glimmer/runtime'; export const DIRTY_TAG = symbol('DIRTY_TAG'); export const ARGS = symbol('ARGS');
true
Other
emberjs
ember.js
85bfc2ea3af21945e12adfc6b528e961a4885383.json
Integrate Glimmer Macros For Binary-based VM This also changes the build to use the individual glimmer packages
packages/ember-glimmer/lib/dom.js
@@ -1,2 +1,2 @@ -export { DOMChanges, DOMTreeConstruction } from 'glimmer-runtime'; -export { NodeDOMTreeConstruction } from 'glimmer-node'; +export { DOMChanges, DOMTreeConstruction } from '@glimmer/runtime'; +export { NodeDOMTreeConstruction } from '@glimmer/node';
true
Other
emberjs
ember.js
85bfc2ea3af21945e12adfc6b528e961a4885383.json
Integrate Glimmer Macros For Binary-based VM This also changes the build to use the individual glimmer packages
packages/ember-glimmer/lib/environment.js
@@ -12,13 +12,13 @@ import { isSafeString, compileLayout, getDynamicVar -} from 'glimmer-runtime'; +} from '@glimmer/runtime'; import { - CurlyComponentSyntax, CurlyComponentDefinition } from './syntax/curly-component'; -import { findSyntaxBuilder } from './syntax'; -import { DynamicComponentSyntax } from './syntax/dynamic-component'; +import { + populateMacros +} from './syntax'; import createIterable from './utils/iterable'; import { ConditionalReference, @@ -31,12 +31,9 @@ import { inlineIf, inlineUnless } from './helpers/if-unless'; -import { wrapComponentClassAttribute } from './utils/bindings'; - import { default as action } from './helpers/action'; import { default as componentHelper } from './helpers/component'; import { default as concat } from './helpers/concat'; -import { default as debuggerHelper } from './helpers/debugger'; import { default as get } from './helpers/get'; import { default as hash } from './helpers/hash'; import { default as loc } from './helpers/loc'; @@ -54,10 +51,6 @@ import { default as htmlSafeHelper } from './helpers/-html-safe'; import installPlatformSpecificProtocolForURL from './protocol-for-url'; import { FACTORY_FOR } from 'container'; -const builtInComponents = { - textarea: '-text-area' -}; - import { default as ActionModifierManager } from './modifiers/action'; export default class Environment extends GlimmerEnvironment { @@ -117,7 +110,6 @@ export default class Environment extends GlimmerEnvironment { action, component: componentHelper, concat, - debugger: debuggerHelper, get, hash, loc, @@ -138,102 +130,10 @@ export default class Environment extends GlimmerEnvironment { runInDebug(() => this.debugStack = new DebugStack()); } - // Hello future traveler, welcome to the world of syntax refinement. - // The method below is called by Glimmer's runtime compiler to allow - // us to take generic statement syntax and refine it to more meaniful - // syntax for Ember's use case. This on the fly switch-a-roo sounds fine - // and dandy, however Ember has precedence on statement refinement that you - // need to be aware of. The presendence for language constructs is as follows: - // - // ------------------------ - // Native & Built-in Syntax - // ------------------------ - // User-land components - // ------------------------ - // User-land helpers - // ------------------------ - // - // The one caveat here is that Ember also allows for dashed references that are - // not a component or helper: - // - // export default Component.extend({ - // 'foo-bar': 'LAME' - // }); - // - // {{foo-bar}} - // - // The heuristic for the above situation is a dashed "key" in inline form - // that does not resolve to a defintion. In this case refine statement simply - // isn't going to return any syntax and the Glimmer engine knows how to handle - // this case. - - refineStatement(statement, symbolTable) { - // 1. resolve any native syntax – if, unless, with, each, and partial - let nativeSyntax = super.refineStatement(statement, symbolTable); - - if (nativeSyntax) { - return nativeSyntax; - } - - let { - appendType, - isSimple, - isInline, - isBlock, - isModifier, - key, - path, - args - } = statement; - - assert(`You attempted to overwrite the built-in helper "${key}" which is not allowed. Please rename the helper.`, !(this.builtInHelpers[key] && this.owner.hasRegistration(`helper:${key}`))); - - if (isSimple && (isInline || isBlock) && appendType !== 'get') { - // 2. built-in syntax - - let RefinedSyntax = findSyntaxBuilder(key); - if (RefinedSyntax) { - return RefinedSyntax.create(this, args, symbolTable); - } - - let internalKey = builtInComponents[key]; - let definition = null; - - if (internalKey) { - definition = this.getComponentDefinition([internalKey], symbolTable); - } else if (key.indexOf('-') >= 0) { - definition = this.getComponentDefinition(path, symbolTable); - } - - if (definition) { - wrapComponentClassAttribute(args); - - return new CurlyComponentSyntax(args, definition, symbolTable); - } - - assert(`A component or helper named "${key}" could not be found`, !isBlock || this.hasHelper(path, symbolTable)); - } - - if (isInline && !isSimple && appendType !== 'helper') { - return statement.original.deopt(); - } - - if (!isSimple && path) { - return DynamicComponentSyntax.fromPath(this, path, args, symbolTable); - } - - assert(`Helpers may not be used in the block form, for example {{#${key}}}{{/${key}}}. Please use a component, or alternatively use the helper in combination with a built-in Ember helper, for example {{#if (${key})}}{{/if}}.`, !isBlock || !this.hasHelper(path, symbolTable)); - - assert(`Helpers may not be used in the element form.`, (() => { - if (nativeSyntax) { return true; } - if (!key) { return true; } - - if (isModifier && !this.hasModifier(path, symbolTable) && this.hasHelper(path, symbolTable)) { - return false; - } - - return true; - })()); + macros() { + let macros = super.macros(); + populateMacros(macros.blocks, macros.inlines); + return macros; } hasComponentDefinition() {
true
Other
emberjs
ember.js
85bfc2ea3af21945e12adfc6b528e961a4885383.json
Integrate Glimmer Macros For Binary-based VM This also changes the build to use the individual glimmer packages
packages/ember-glimmer/lib/helper.js
@@ -5,7 +5,7 @@ import { symbol } from 'ember-utils'; import { FrameworkObject } from 'ember-runtime'; -import { DirtyableTag } from 'glimmer-reference'; +import { DirtyableTag } from '@glimmer/reference'; export const RECOMPUTE_TAG = symbol('RECOMPUTE_TAG');
true
Other
emberjs
ember.js
85bfc2ea3af21945e12adfc6b528e961a4885383.json
Integrate Glimmer Macros For Binary-based VM This also changes the build to use the individual glimmer packages
packages/ember-glimmer/lib/helpers/action.js
@@ -12,8 +12,8 @@ import { runInDebug } from 'ember-metal'; import { UnboundReference } from '../utils/references'; -import { EvaluatedPositionalArgs } from 'glimmer-runtime'; -import { isConst } from 'glimmer-reference'; +import { EvaluatedPositionalArgs } from '@glimmer/runtime'; +import { isConst } from '@glimmer/reference'; export const INVOKE = symbol('INVOKE'); export const ACTION = symbol('ACTION'); @@ -378,7 +378,7 @@ function makeClosureAction(context, target, action, processArgs, debugKey) { } return function(...args) { - let payload = { target: self, args, label: 'glimmer-closure-action' }; + let payload = { target: self, args, label: '@glimmer/closure-action' }; return flaggedInstrument('interaction.ember-action', payload, () => { return run.join(self, fn, ...processArgs(args)); });
true
Other
emberjs
ember.js
85bfc2ea3af21945e12adfc6b528e961a4885383.json
Integrate Glimmer Macros For Binary-based VM This also changes the build to use the individual glimmer packages
packages/ember-glimmer/lib/helpers/component.js
@@ -9,12 +9,11 @@ import { validatePositionalParameters } from '../syntax/curly-component'; import { - Blocks, EvaluatedArgs, EvaluatedNamedArgs, EvaluatedPositionalArgs, isComponentDefinition -} from 'glimmer-runtime'; +} from '@glimmer/runtime'; import { assert } from 'ember-metal'; /** @@ -206,6 +205,11 @@ function createCurriedDefinition(definition, args) { ); } +const EMPTY_BLOCKS = { + default: null, + inverse: null +}; + function curryArgs(definition, newArgs) { let { args, ComponentClass } = definition; let positionalParams = ComponentClass.class.positionalParams; @@ -258,7 +262,7 @@ function curryArgs(definition, newArgs) { let mergedArgs = EvaluatedArgs.create( EvaluatedPositionalArgs.create(mergedPositional), EvaluatedNamedArgs.create(mergedNamed), - Blocks.empty() + EMPTY_BLOCKS ); return mergedArgs;
true
Other
emberjs
ember.js
85bfc2ea3af21945e12adfc6b528e961a4885383.json
Integrate Glimmer Macros For Binary-based VM This also changes the build to use the individual glimmer packages
packages/ember-glimmer/lib/helpers/concat.js
@@ -1,5 +1,5 @@ import { InternalHelperReference } from '../utils/references'; -import { normalizeTextValue } from 'glimmer-runtime'; +import { normalizeTextValue } from '@glimmer/runtime'; /** @module ember
true
Other
emberjs
ember.js
85bfc2ea3af21945e12adfc6b528e961a4885383.json
Integrate Glimmer Macros For Binary-based VM This also changes the build to use the individual glimmer packages
packages/ember-glimmer/lib/helpers/get.js
@@ -6,7 +6,7 @@ import { combine, isConst, referenceFromParts -} from 'glimmer-reference'; +} from '@glimmer/reference'; /** @module ember
true
Other
emberjs
ember.js
85bfc2ea3af21945e12adfc6b528e961a4885383.json
Integrate Glimmer Macros For Binary-based VM This also changes the build to use the individual glimmer packages
packages/ember-glimmer/lib/helpers/if-unless.js
@@ -14,7 +14,7 @@ import { UpdatableTag, combine, isConst -} from 'glimmer-reference'; +} from '@glimmer/reference'; /**
true
Other
emberjs
ember.js
85bfc2ea3af21945e12adfc6b528e961a4885383.json
Integrate Glimmer Macros For Binary-based VM This also changes the build to use the individual glimmer packages
packages/ember-glimmer/lib/index.js
@@ -200,7 +200,6 @@ export { INVOKE } from './helpers/action'; export { default as RootTemplate } from './templates/root'; -export { registerSyntax } from './syntax'; export { default as template } from './template'; export { default as Checkbox } from './components/checkbox'; export { default as TextField } from './components/text_field';
true
Other
emberjs
ember.js
85bfc2ea3af21945e12adfc6b528e961a4885383.json
Integrate Glimmer Macros For Binary-based VM This also changes the build to use the individual glimmer packages
packages/ember-glimmer/lib/renderer.js
@@ -6,7 +6,7 @@ import { runInTransaction as _runInTransaction, isFeatureEnabled } from 'ember-metal'; -import { CURRENT_TAG, UNDEFINED_REFERENCE } from 'glimmer-reference'; +import { CURRENT_TAG, UNDEFINED_REFERENCE } from '@glimmer/reference'; import { fallbackViewRegistry, getViewElement,
true
Other
emberjs
ember.js
85bfc2ea3af21945e12adfc6b528e961a4885383.json
Integrate Glimmer Macros For Binary-based VM This also changes the build to use the individual glimmer packages
packages/ember-glimmer/lib/syntax.js
@@ -1,44 +1,85 @@ -import { RenderSyntax } from './syntax/render'; -import { OutletSyntax } from './syntax/outlet'; -import { MountSyntax } from './syntax/mount'; -import { DynamicComponentSyntax } from './syntax/dynamic-component'; -import { InputSyntax } from './syntax/input'; +import { renderMacro } from './syntax/render'; +import { outletMacro } from './syntax/outlet'; +import { mountMacro } from './syntax/mount'; import { - WithDynamicVarsSyntax, - InElementSyntax -} from 'glimmer-runtime'; + blockComponentMacro, + inlineComponentMacro, + closureComponentMacro +} from './syntax/dynamic-component'; +import { wrapComponentClassAttribute } from './utils/bindings'; +import { _withDynamicVarsMacro } from './syntax/-with-dynamic-vars'; +import { _inElementMacro } from './syntax/-in-element'; +import { inputMacro } from './syntax/input'; +import { textAreaMacro } from './syntax/-text-area'; +import { assert } from 'ember-metal'; +function refineInlineSyntax(path, params, hash, builder) { + let [ name ] = path; -let syntaxKeys = []; -let syntaxes = []; + assert(`You attempted to overwrite the built-in helper "${name}" which is not allowed. Please rename the helper.`, !(builder.env.builtInHelpers[name] && builder.env.owner.hasRegistration(`helper:${name}`))); -export function registerSyntax(key, syntax) { - syntaxKeys.push(key); - syntaxes.push(syntax); -} + if (path.length > 1) { + return closureComponentMacro(path, params, hash, null, null, builder); + } -export function findSyntaxBuilder(key) { - let index = syntaxKeys.indexOf(key); + let { symbolTable } = builder; + + let definition; + if (name.indexOf('-') > -1) { + definition = builder.env.getComponentDefinition(path, symbolTable); + } - if (index > -1) { - return syntaxes[index]; + if (definition) { + wrapComponentClassAttribute(hash); + builder.component.static(definition, [params, hash, null, null], symbolTable); + return true; } + + return false; } -registerSyntax('render', RenderSyntax); -registerSyntax('outlet', OutletSyntax); -registerSyntax('mount', MountSyntax); -registerSyntax('component', DynamicComponentSyntax); -registerSyntax('input', InputSyntax); +function refineBlockSyntax(sexp, builder) { + let [, path, params, hash, _default, inverse] = sexp; + let [ name ] = path; + + if (path.length > 1) { + return closureComponentMacro(path, params, hash, _default, inverse, builder); + } -registerSyntax('-with-dynamic-vars', class { - static create(environment, args, symbolTable) { - return new WithDynamicVarsSyntax(args); + if (name.indexOf('-') === -1) { + return false; } -}); -registerSyntax('-in-element', class { - static create(environment, args, symbolTable) { - return new InElementSyntax(args); + let { symbolTable } = builder; + let definition; + if (name.indexOf('-') > -1) { + definition = builder.env.getComponentDefinition(path, symbolTable); } -}); + + if (definition) { + wrapComponentClassAttribute(hash); + builder.component.static(definition, [params, hash, _default, inverse], symbolTable); + return true; + } + + assert(`A component or helper named "${name}" could not be found`, builder.env.hasHelper(path, symbolTable)); + + assert(`Helpers may not be used in the block form, for example {{#${name}}}{{/${name}}}. Please use a component, or alternatively use the helper in combination with a built-in Ember helper, for example {{#if (${name})}}{{/if}}.`, !builder.env.hasHelper(path, symbolTable)); + + return false; +} + +export function populateMacros(blocks, inlines) { + inlines.add('outlet', outletMacro); + inlines.add('component', inlineComponentMacro); + inlines.add('render', renderMacro); + inlines.add('mount', mountMacro); + inlines.add('input', inputMacro); + inlines.add('textarea', textAreaMacro); + inlines.addMissing(refineInlineSyntax); + blocks.add('component', blockComponentMacro); + blocks.add('-with-dynamic-vars', _withDynamicVarsMacro); + blocks.add('-in-element', _inElementMacro); + blocks.addMissing(refineBlockSyntax); + return { blocks, inlines }; +}
true
Other
emberjs
ember.js
85bfc2ea3af21945e12adfc6b528e961a4885383.json
Integrate Glimmer Macros For Binary-based VM This also changes the build to use the individual glimmer packages
packages/ember-glimmer/lib/syntax/-in-element.js
@@ -0,0 +1,23 @@ +import { BaselineSyntax, compileArgs } from '@glimmer/runtime'; +import { unwrap } from '@glimmer/util'; + +const { + defaultBlock, + params, + hash +} = BaselineSyntax.NestedBlock; + +export function _inElementMacro(sexp, builder) { + let block = defaultBlock(sexp); + let args = compileArgs(params(sexp), hash(sexp), builder); + + builder.putArgs(args); + builder.test('simple'); + + builder.labelled(null, b => { + b.jumpUnless('END'); + b.pushRemoteElement(); + b.evaluate(unwrap(block)); + b.popRemoteElement(); + }); +}
true
Other
emberjs
ember.js
85bfc2ea3af21945e12adfc6b528e961a4885383.json
Integrate Glimmer Macros For Binary-based VM This also changes the build to use the individual glimmer packages
packages/ember-glimmer/lib/syntax/-text-area.js
@@ -0,0 +1,8 @@ +import { wrapComponentClassAttribute } from '../utils/bindings'; + +export function textAreaMacro(path, params, hash, builder) { + let definition = builder.env.getComponentDefinition(['-text-area'], builder.symbolTable); + wrapComponentClassAttribute(hash); + builder.component.static(definition, [params, hash, null, null], builder.symbolTable); + return true; +}
true
Other
emberjs
ember.js
85bfc2ea3af21945e12adfc6b528e961a4885383.json
Integrate Glimmer Macros For Binary-based VM This also changes the build to use the individual glimmer packages
packages/ember-glimmer/lib/syntax/-with-dynamic-vars.js
@@ -0,0 +1,21 @@ +import { BaselineSyntax, compileArgs } from '@glimmer/runtime'; +import { unwrap } from '@glimmer/util'; + +const { + defaultBlock, + params, + hash +} = BaselineSyntax.NestedBlock; + +export function _withDynamicVarsMacro(sexp, builder) { + let block = defaultBlock(sexp); + let args = compileArgs(params(sexp), hash(sexp), builder); + + builder.unit(b => { + b.putArgs(args); + b.pushDynamicScope(); + b.bindDynamicScope(args.named.keys); + b.evaluate(unwrap(block)); + b.popDynamicScope(); + }); +}
true
Other
emberjs
ember.js
85bfc2ea3af21945e12adfc6b528e961a4885383.json
Integrate Glimmer Macros For Binary-based VM This also changes the build to use the individual glimmer packages
packages/ember-glimmer/lib/syntax/curly-component.js
@@ -1,9 +1,8 @@ import { OWNER } from 'ember-utils'; import { - StatementSyntax, PrimitiveReference, ComponentDefinition -} from 'glimmer-runtime'; +} from '@glimmer/runtime'; import { AttributeBinding, ClassNameBinding, @@ -126,20 +125,6 @@ function applyAttributeBindings(element, attributeBindings, component, operation } } -export class CurlyComponentSyntax extends StatementSyntax { - constructor(args, definition, symbolTable) { - super(); - this.args = args; - this.definition = definition; - this.symbolTable = symbolTable; - this.shadow = null; - } - - compile(builder) { - builder.component.static(this.definition, this.args, this.symbolTable, this.shadow); - } -} - function NOOP() {} class ComponentStateBucket {
true
Other
emberjs
ember.js
85bfc2ea3af21945e12adfc6b528e961a4885383.json
Integrate Glimmer Macros For Binary-based VM This also changes the build to use the individual glimmer packages
packages/ember-glimmer/lib/syntax/dynamic-component.js
@@ -1,11 +1,7 @@ import { - ArgsSyntax, - StatementSyntax, - GetSyntax, - PositionalArgsSyntax, isComponentDefinition -} from 'glimmer-runtime'; -import { UNDEFINED_REFERENCE } from 'glimmer-reference'; +} from '@glimmer/runtime'; +import { UNDEFINED_REFERENCE } from '@glimmer/reference'; import { assert } from 'ember-metal'; function dynamicComponentFor(vm, symbolTable) { @@ -16,37 +12,33 @@ function dynamicComponentFor(vm, symbolTable) { return new DynamicComponentReference({ nameRef, env, symbolTable }); } -export class DynamicComponentSyntax extends StatementSyntax { - // for {{component componentName}} - static create(environment, args, symbolTable) { - let definitionArgs = ArgsSyntax.fromPositionalArgs(args.positional.slice(0, 1)); - let invocationArgs = ArgsSyntax.build(args.positional.slice(1), args.named, args.blocks); - - return new this(definitionArgs, invocationArgs, symbolTable); - } - - // Transforms {{foo.bar with=args}} or {{#foo.bar with=args}}{{/foo.bar}} - // into {{component foo.bar with=args}} or - // {{#component foo.bar with=args}}{{/component}} - // with all of it's arguments - static fromPath(environment, path, args, symbolTable) { - let positional = ArgsSyntax.fromPositionalArgs(PositionalArgsSyntax.build([GetSyntax.build(path.join('.'))])); +export function closureComponentMacro(path, params, hash, _default, inverse, builder) { + let definitionArgs = [[['get', path]], hash, _default, inverse]; + let args = [params, hash, _default, inverse]; + builder.component.dynamic(definitionArgs, dynamicComponentFor, args, builder.symbolTable); + return true; +} - return new this(positional, args, symbolTable); - } +export function dynamicComponentMacro(params, hash, _default, inverse, builder) { + let definitionArgs = [params.slice(0, 1), null, null, null]; + let args = [params.slice(1), hash, null, null]; + builder.component.dynamic(definitionArgs, dynamicComponentFor, args, builder.symbolTable); + return true; +} - constructor(definitionArgs, args, symbolTable) { - super(); - this.definition = dynamicComponentFor; - this.definitionArgs = definitionArgs; - this.args = args; - this.symbolTable = symbolTable; - this.shadow = null; - } +export function blockComponentMacro(sexp, builder) { + let [, , params, hash, _default, inverse] = sexp; + let definitionArgs = [params.slice(0, 1), null, null, null]; + let args = [params.slice(1), hash, _default, inverse]; + builder.component.dynamic(definitionArgs, dynamicComponentFor, args, builder.symbolTable); + return true; +} - compile(builder) { - builder.component.dynamic(this.definitionArgs, this.definition, this.args, this.symbolTable, this.shadow); - } +export function inlineComponentMacro(path, params, hash, builder) { + let definitionArgs = [params.slice(0, 1), null, null, null]; + let args = [params.slice(1), hash, null, null]; + builder.component.dynamic(definitionArgs, dynamicComponentFor, args, builder.symbolTable); + return true; } class DynamicComponentReference {
true
Other
emberjs
ember.js
85bfc2ea3af21945e12adfc6b528e961a4885383.json
Integrate Glimmer Macros For Binary-based VM This also changes the build to use the individual glimmer packages
packages/ember-glimmer/lib/syntax/input.js
@@ -3,14 +3,13 @@ @submodule ember-glimmer */ import { assert } from 'ember-metal'; -import { CurlyComponentSyntax } from './curly-component'; -import { DynamicComponentSyntax } from './dynamic-component'; import { wrapComponentClassAttribute } from '../utils/bindings'; +import { dynamicComponentMacro } from './dynamic-component'; -function buildTextFieldSyntax(args, getDefinition, symbolTable) { - let definition = getDefinition('-text-field'); - wrapComponentClassAttribute(args); - return new CurlyComponentSyntax(args, definition, symbolTable); +function buildTextFieldSyntax(params, hash, builder) { + let definition = builder.env.getComponentDefinition(['-text-field'], builder.symbolTable); + builder.component.static(definition, [params, hash, null, null], builder.symbolTable); + return true; } /** @@ -145,31 +144,47 @@ function buildTextFieldSyntax(args, getDefinition, symbolTable) { @param {Hash} options @public */ -export const InputSyntax = { - create(environment, args, symbolTable) { - let getDefinition = (path) => environment.getComponentDefinition([path], symbolTable); - - if (args.named.has('type')) { - let typeArg = args.named.at('type'); - if (typeArg.type === 'value') { - if (typeArg.value === 'checkbox') { - assert( - '{{input type=\'checkbox\'}} does not support setting `value=someBooleanValue`; ' + - 'you must use `checked=someBooleanValue` instead.', - !args.named.has('value') - ); - - wrapComponentClassAttribute(args); - let definition = getDefinition('-checkbox'); - return new CurlyComponentSyntax(args, definition, symbolTable); - } else { - return buildTextFieldSyntax(args, getDefinition, symbolTable); - } + +export function inputMacro(path, params, hash, builder) { + let keys; + let values; + let typeIndex = -1; + let valueIndex = -1; + + if (hash) { + keys = hash[0]; + values = hash[1]; + typeIndex = keys.indexOf('type'); + valueIndex = keys.indexOf('value'); + } + + if (!params) { + params = []; + } + + if (typeIndex > -1) { + let typeArg = values[typeIndex]; + if (!Array.isArray(typeArg)) { + if (typeArg === 'checkbox') { + assert( + '{{input type=\'checkbox\'}} does not support setting `value=someBooleanValue`; ' + + 'you must use `checked=someBooleanValue` instead.', + valueIndex === -1 + ); + + wrapComponentClassAttribute(hash); + + let definition = builder.env.getComponentDefinition(['-checkbox'], builder.symbolTable); + builder.component.static(definition, [params, hash, null, null], builder.symbolTable); + return true; + } else { + return buildTextFieldSyntax(params, hash, builder); } - } else { - return buildTextFieldSyntax(args, getDefinition, symbolTable); } - - return DynamicComponentSyntax.create(environment, args, symbolTable); + } else { + return buildTextFieldSyntax(params, hash, builder); } -}; + + + return dynamicComponentMacro(params, hash, null, null, builder); +}
true
Other
emberjs
ember.js
85bfc2ea3af21945e12adfc6b528e961a4885383.json
Integrate Glimmer Macros For Binary-based VM This also changes the build to use the individual glimmer packages
packages/ember-glimmer/lib/syntax/mount.js
@@ -3,11 +3,9 @@ @submodule ember-glimmer */ import { - ArgsSyntax, - StatementSyntax, ComponentDefinition -} from 'glimmer-runtime'; -import { UNDEFINED_REFERENCE } from 'glimmer-reference'; +} from '@glimmer/runtime'; +import { UNDEFINED_REFERENCE } from '@glimmer/reference'; import { assert, runInDebug } from 'ember-metal'; import { RootReference } from '../utils/references'; import { generateControllerFactory } from 'ember-routing'; @@ -35,39 +33,26 @@ import AbstractManager from './abstract-manager'; @category ember-application-engines @public */ -export class MountSyntax extends StatementSyntax { - static create(env, args, symbolTable) { - assert( - 'You can only pass a single argument to the {{mount}} helper, e.g. {{mount "chat-engine"}}.', - args.positional.length === 1 && args.named.length === 0 - ); - - assert( - 'The first argument of {{mount}} must be quoted, e.g. {{mount "chat-engine"}}.', - args.positional.at(0).type === 'value' && typeof args.positional.at(0).inner() === 'string' - ); - - let name = args.positional.at(0).inner(); - - assert( - `You used \`{{mount '${name}'}}\`, but the engine '${name}' can not be found.`, - env.owner.hasRegistration(`engine:${name}`) - ); - - let definition = new MountDefinition(name, env); - - return new MountSyntax(definition, symbolTable); - } - - constructor(definition, symbolTable) { - super(); - this.definition = definition; - this.symbolTable = symbolTable; - } - - compile(builder) { - builder.component.static(this.definition, ArgsSyntax.empty(), null, this.symbolTable, null); - } +export function mountMacro(path, params, hash, builder) { + assert( + 'You can only pass a single argument to the {{mount}} helper, e.g. {{mount "chat-engine"}}.', + params.length === 1 && hash === null + ); + + let name = params[0]; + + assert( + 'The first argument of {{mount}} must be quoted, e.g. {{mount "chat-engine"}}.', + typeof name === 'string' + ); + + assert( + `You used \`{{mount '${name}'}}\`, but the engine '${name}' can not be found.`, + builder.env.owner.hasRegistration(`engine:${name}`) + ); + + builder.component.static(new MountDefinition(name, builder.env), [params, hash, null, null], builder.symbolTable); + return true; } class MountManager extends AbstractManager {
true
Other
emberjs
ember.js
85bfc2ea3af21945e12adfc6b528e961a4885383.json
Integrate Glimmer Macros For Binary-based VM This also changes the build to use the individual glimmer packages
packages/ember-glimmer/lib/syntax/outlet.js
@@ -4,18 +4,17 @@ */ import { generateGuid, guidFor } from 'ember-utils'; import { - ArgsSyntax, - StatementSyntax, - ComponentDefinition -} from 'glimmer-runtime'; -import { runInDebug, _instrumentStart } from 'ember-metal'; + ComponentDefinition, + CompiledArgs +} from '@glimmer/runtime'; +import { _instrumentStart, runInDebug } from 'ember-metal'; import { RootReference } from '../utils/references'; +import AbstractManager from './abstract-manager'; import { UpdatableTag, ConstReference, combine -} from 'glimmer-reference'; -import AbstractManager from './abstract-manager'; +} from '@glimmer/reference'; function outletComponentFor(vm) { let { outletState } = vm.dynamicScope(); @@ -31,6 +30,7 @@ function outletComponentFor(vm) { return new OutletComponentReference(outletNameRef, outletState); } + /** The `{{outlet}}` helper lets you specify where a child route will render in your template. An important use of the `{{outlet}}` helper is in your @@ -80,24 +80,13 @@ function outletComponentFor(vm) { @for Ember.Templates.helpers @public */ -export class OutletSyntax extends StatementSyntax { - static create(environment, args, symbolTable) { - let definitionArgs = ArgsSyntax.fromPositionalArgs(args.positional.slice(0, 1)); - return new this(environment, definitionArgs, symbolTable); - } - - constructor(environment, args, symbolTable) { - super(); - this.definitionArgs = args; - this.definition = outletComponentFor; - this.args = ArgsSyntax.empty(); - this.symbolTable = symbolTable; - this.shadow = null; - } - - compile(builder) { - builder.component.dynamic(this.definitionArgs, this.definition, this.args, this.symbolTable, this.shadow); +export function outletMacro(path, params, hash, builder) { + if (!params) { + params = []; } + let definitionArgs = [params.slice(0, 1), null, null, null]; + builder.component.dynamic(definitionArgs, outletComponentFor, CompiledArgs.empty(), builder.symbolTable, null); + return true; } class OutletComponentReference {
true
Other
emberjs
ember.js
85bfc2ea3af21945e12adfc6b528e961a4885383.json
Integrate Glimmer Macros For Binary-based VM This also changes the build to use the individual glimmer packages
packages/ember-glimmer/lib/syntax/render.js
@@ -3,11 +3,9 @@ @submodule ember-glimmer */ import { - ArgsSyntax, - StatementSyntax, ComponentDefinition -} from 'glimmer-runtime'; -import { ConstReference, isConst } from 'glimmer-reference'; +} from '@glimmer/runtime'; +import { ConstReference, isConst } from '@glimmer/reference'; import { assert, runInDebug } from 'ember-metal'; import { RootReference } from '../utils/references'; import { generateController, generateControllerFactory } from 'ember-routing'; @@ -50,6 +48,7 @@ function makeComponentDefinition(vm) { } } + /** Calling ``{{render}}`` from within a template will insert another template that matches the provided name. The inserted template will @@ -119,23 +118,14 @@ function makeComponentDefinition(vm) { @return {String} HTML string @public */ -export class RenderSyntax extends StatementSyntax { - static create(environment, args, symbolTable) { - return new this(environment, args, symbolTable); - } - - constructor(environment, args, symbolTable) { - super(); - this.definitionArgs = args; - this.definition = makeComponentDefinition; - this.args = ArgsSyntax.fromPositionalArgs(args.positional.slice(1, 2)); - this.symbolTable = symbolTable; - this.shadow = null; - } - - compile(builder) { - builder.component.dynamic(this.definitionArgs, this.definition, this.args, this.symbolTable, this.shadow); +export function renderMacro(path, params, hash, builder) { + if (!params) { + params = []; } + let definitionArgs = [params.slice(0), hash, null, null]; + let args = [params.slice(1), hash, null, null]; + builder.component.dynamic(definitionArgs, makeComponentDefinition, args, builder.symbolTable); + return true; } class AbstractRenderManager extends AbstractManager {
true
Other
emberjs
ember.js
85bfc2ea3af21945e12adfc6b528e961a4885383.json
Integrate Glimmer Macros For Binary-based VM This also changes the build to use the individual glimmer packages
packages/ember-glimmer/lib/template.js
@@ -1,5 +1,5 @@ import { OWNER } from 'ember-utils'; -import { templateFactory } from 'glimmer-runtime'; +import { templateFactory } from '@glimmer/runtime'; export default function template(json) { let factory = templateFactory(json);
true
Other
emberjs
ember.js
85bfc2ea3af21945e12adfc6b528e961a4885383.json
Integrate Glimmer Macros For Binary-based VM This also changes the build to use the individual glimmer packages
packages/ember-glimmer/lib/utils/bindings.js
@@ -3,8 +3,7 @@ import { combine, map, referenceFromParts -} from 'glimmer-reference'; -import { HelperSyntax } from 'glimmer-runtime'; +} from '@glimmer/reference'; import { get, assert } from 'ember-metal'; import { String as StringUtils } from 'ember-runtime'; import { ROOT_REF } from '../component'; @@ -30,20 +29,26 @@ function referenceForParts(component, parts) { } // TODO we should probably do this transform at build time -export function wrapComponentClassAttribute(args) { - let { named } = args; - let index = named.keys.indexOf('class'); +export function wrapComponentClassAttribute(hash) { + if (!hash) { + return hash; + } + + let [ keys, values ] = hash; + let index = keys.indexOf('class'); if (index !== -1) { - let { ref, type } = named.values[index]; + let [ type ] = values[index]; if (type === 'get') { - let propName = ref.parts[ref.parts.length - 1]; - named.values[index] = HelperSyntax.fromSpec(['helper', ['-class'], [['get', ref.parts], propName], null]); + let getExp = values[index]; + let path = getExp[1]; + let propName = path[path.length - 1]; + hash[1][index] = ['helper', ['-class'], [getExp, propName]]; } } - return args; + return hash; } export const AttributeBinding = {
true
Other
emberjs
ember.js
85bfc2ea3af21945e12adfc6b528e961a4885383.json
Integrate Glimmer Macros For Binary-based VM This also changes the build to use the individual glimmer packages
packages/ember-glimmer/lib/utils/iterable.js
@@ -13,7 +13,7 @@ import { CONSTANT_TAG, UpdatableTag, combine -} from 'glimmer-reference'; +} from '@glimmer/reference'; const ITERATOR_KEY_GUID = 'be277757-bbbe-4620-9fcb-213ef433cca2';
true
Other
emberjs
ember.js
85bfc2ea3af21945e12adfc6b528e961a4885383.json
Integrate Glimmer Macros For Binary-based VM This also changes the build to use the individual glimmer packages
packages/ember-glimmer/lib/utils/process-args.js
@@ -5,15 +5,15 @@ import { } from 'ember-utils'; import { CONSTANT_TAG -} from 'glimmer-reference'; +} from '@glimmer/reference'; import { ARGS } from '../component'; import { UPDATE } from './references'; import { MUTABLE_CELL } from 'ember-views'; import { ACTION } from '../helpers/action'; import { EvaluatedArgs, EvaluatedPositionalArgs -} from 'glimmer-runtime'; +} from '@glimmer/runtime'; // Maps all variants of positional and dynamically scoped arguments // into the named arguments. Input `args` and return value are both
true
Other
emberjs
ember.js
85bfc2ea3af21945e12adfc6b528e961a4885383.json
Integrate Glimmer Macros For Binary-based VM This also changes the build to use the individual glimmer packages
packages/ember-glimmer/lib/utils/references.js
@@ -21,19 +21,19 @@ import { UpdatableTag, combine, isConst -} from 'glimmer-reference'; +} from '@glimmer/reference'; import { ConditionalReference as GlimmerConditionalReference, PrimitiveReference, NULL_REFERENCE, UNDEFINED_REFERENCE -} from 'glimmer-runtime'; +} from '@glimmer/runtime'; import emberToBool from './to-bool'; import { RECOMPUTE_TAG } from '../helper'; export const UPDATE = symbol('UPDATE'); -export { NULL_REFERENCE, UNDEFINED_REFERENCE } from 'glimmer-runtime'; +export { NULL_REFERENCE, UNDEFINED_REFERENCE } from '@glimmer/runtime'; // @abstract // @implements PathReference
true
Other
emberjs
ember.js
85bfc2ea3af21945e12adfc6b528e961a4885383.json
Integrate Glimmer Macros For Binary-based VM This also changes the build to use the individual glimmer packages
packages/ember-glimmer/lib/views/outlet.js
@@ -3,7 +3,7 @@ @submodule ember-glimmer */ import { assign, EmptyObject } from 'ember-utils'; -import { DirtyableTag } from 'glimmer-reference'; +import { DirtyableTag } from '@glimmer/reference'; import { environment } from 'ember-environment'; import { OWNER } from 'ember-utils'; import { run } from 'ember-metal';
true
Other
emberjs
ember.js
85bfc2ea3af21945e12adfc6b528e961a4885383.json
Integrate Glimmer Macros For Binary-based VM This also changes the build to use the individual glimmer packages
packages/ember-glimmer/tests/integration/helpers/custom-helper-test.js
@@ -417,9 +417,9 @@ moduleFor('Helpers test: custom helpers', class extends RenderingTest { ['@test simple helper not usable within element']() { this.registerHelper('some-helper', () => {}); - expectAssertion(() => { + this.assert.throws(() => { this.render(`<div {{some-helper}}></div>`); - }, /Helpers may not be used in the element form/); + }, /Compile Error some-helper is not a modifier: Helpers may not be used in the element form/); } ['@test class-based helper not usable within element']() { @@ -428,9 +428,9 @@ moduleFor('Helpers test: custom helpers', class extends RenderingTest { } }); - expectAssertion(() => { + this.assert.throws(() => { this.render(`<div {{some-helper}}></div>`); - }, /Helpers may not be used in the element form/); + }, /Compile Error some-helper is not a modifier: Helpers may not be used in the element form/); } ['@test class-based helper is torn down']() {
true
Other
emberjs
ember.js
85bfc2ea3af21945e12adfc6b528e961a4885383.json
Integrate Glimmer Macros For Binary-based VM This also changes the build to use the individual glimmer packages
packages/ember-glimmer/tests/integration/helpers/debugger-test.js
@@ -3,7 +3,7 @@ import { Component } from '../../utils/helpers'; import { setDebuggerCallback, resetDebuggerCallback -} from '../../../helpers/debugger'; +} from '@glimmer/runtime'; import { set } from 'ember-metal'; import { A as emberA } from 'ember-runtime'; @@ -150,7 +150,7 @@ moduleFor('Helpers test: {{debugger}}', class extends RenderingTest { this.zomg = 'zomg'; } }), - template: `{{debugger not.here}}foo-bar` + template: `{{debugger}}foo-bar` }); this.expectDebuggerCallback(
true
Other
emberjs
ember.js
85bfc2ea3af21945e12adfc6b528e961a4885383.json
Integrate Glimmer Macros For Binary-based VM This also changes the build to use the individual glimmer packages
packages/ember-glimmer/tests/unit/layout-cache-test.js
@@ -1,6 +1,6 @@ import { EmptyObject } from 'ember-utils'; import { RenderingTest, moduleFor } from '../utils/test-case'; -import { CompiledBlock } from 'glimmer-runtime'; +import { CompiledBlock } from '@glimmer/runtime'; import { OWNER } from 'ember-utils'; class Counter {
true
Other
emberjs
ember.js
85bfc2ea3af21945e12adfc6b528e961a4885383.json
Integrate Glimmer Macros For Binary-based VM This also changes the build to use the individual glimmer packages
packages/ember-metal/lib/tags.js
@@ -1,4 +1,4 @@ -import { CONSTANT_TAG, DirtyableTag } from 'glimmer-reference'; +import { CONSTANT_TAG, DirtyableTag } from '@glimmer/reference'; import { meta as metaFor } from './meta'; import require from 'require'; import { isProxy } from './is_proxy';
true
Other
emberjs
ember.js
85bfc2ea3af21945e12adfc6b528e961a4885383.json
Integrate Glimmer Macros For Binary-based VM This also changes the build to use the individual glimmer packages
packages/ember-runtime/lib/mixins/-proxy.js
@@ -3,7 +3,7 @@ @submodule ember-runtime */ -import { CachedTag, DirtyableTag, UpdatableTag } from 'glimmer-reference'; +import { CachedTag, DirtyableTag, UpdatableTag } from '@glimmer/reference'; import { assert, deprecate,
true
Other
emberjs
ember.js
85bfc2ea3af21945e12adfc6b528e961a4885383.json
Integrate Glimmer Macros For Binary-based VM This also changes the build to use the individual glimmer packages
packages/ember-template-compiler/lib/system/precompile.js
@@ -19,8 +19,8 @@ let glimmerPrecompile; @param {String} templateString This is the string to be compiled by HTMLBars. */ export default function precompile(templateString, options) { - if (!glimmerPrecompile && has('glimmer-compiler')) { - glimmerPrecompile = require('glimmer-compiler').precompile; + if (!glimmerPrecompile && has('@glimmer/compiler')) { + glimmerPrecompile = require('@glimmer/compiler').precompile; } if (!glimmerPrecompile) {
true
Other
emberjs
ember.js
85bfc2ea3af21945e12adfc6b528e961a4885383.json
Integrate Glimmer Macros For Binary-based VM This also changes the build to use the individual glimmer packages
yarn.lock
@@ -2,9 +2,96 @@ # yarn lockfile v1 -"JSV@>= 4.0.x": - version "4.0.2" - resolved "https://registry.yarnpkg.com/JSV/-/JSV-4.0.2.tgz#d077f6825571f82132f9dffaed587b4029feff57" +"@glimmer/compiler@^0.21.1": + version "0.21.1" + resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.21.1.tgz#0f248c0a39928a0940dbce1129c4e3352534096b" + dependencies: + "@glimmer/syntax" "^0.21.1" + "@glimmer/util" "^0.21.0" + "@glimmer/wire-format" "^0.21.0" + simple-html-tokenizer "^0.3.0" + +"@glimmer/interfaces@^0.21.0": + version "0.21.0" + resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.21.0.tgz#386b2c5bbe5bf6f54eda014937adf2e3927571bf" + dependencies: + "@glimmer/wire-format" "^0.21.0" + +"@glimmer/node@^0.21.1": + version "0.21.1" + resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.21.1.tgz#31690f141542ffca685fad497aaee49c44687763" + dependencies: + "@glimmer/runtime" "^0.21.1" + simple-dom "^0.3.0" + +"@glimmer/object-model@^0.21.0": + version "0.21.0" + resolved "https://registry.yarnpkg.com/@glimmer/object-model/-/object-model-0.21.0.tgz#dba8779bbf7c57179b46e999ec6441d72b013a6a" + dependencies: + "@glimmer/reference" "^0.21.0" + "@glimmer/util" "^0.21.0" + +"@glimmer/object-reference@^0.21.0": + version "0.21.0" + resolved "https://registry.yarnpkg.com/@glimmer/object-reference/-/object-reference-0.21.0.tgz#3feac2c4d700034bb27034a9e973a6113f0c7cfe" + dependencies: + "@glimmer/reference" "^0.21.0" + "@glimmer/util" "^0.21.0" + +"@glimmer/object@^0.21.0": + version "0.21.0" + resolved "https://registry.yarnpkg.com/@glimmer/object/-/object-0.21.0.tgz#2ac659c0611fdd22da60b13e0a8c34665ab9b352" + dependencies: + "@glimmer/object-reference" "^0.21.0" + "@glimmer/util" "^0.21.0" + +"@glimmer/reference@^0.21.0": + version "0.21.0" + resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.21.0.tgz#8719a7a942654a33db7e6b1556fc06fac39e98c8" + dependencies: + "@glimmer/util" "^0.21.0" + +"@glimmer/runtime@^0.21.0", "@glimmer/runtime@^0.21.1": + version "0.21.1" + resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.21.1.tgz#ae7207a9930ce0c26203dbc626d53c2fe78f8204" + dependencies: + "@glimmer/interfaces" "^0.21.0" + "@glimmer/object" "^0.21.0" + "@glimmer/object-reference" "^0.21.0" + "@glimmer/reference" "^0.21.0" + "@glimmer/util" "^0.21.0" + "@glimmer/wire-format" "^0.21.0" + +"@glimmer/syntax@^0.21.1": + version "0.21.1" + resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.21.1.tgz#020c7b5816bbdc0004c663fe3c51856e6d86ed62" + dependencies: + handlebars "^3.0.3" + simple-html-tokenizer "^0.3.0" + +"@glimmer/test-helpers@^0.21.1": + version "0.21.1" + resolved "https://registry.yarnpkg.com/@glimmer/test-helpers/-/test-helpers-0.21.1.tgz#c113e542a6205fd54c6c736c6e50475ea1e1947a" + dependencies: + "@glimmer/compiler" "^0.21.1" + "@glimmer/interfaces" "^0.21.0" + "@glimmer/object" "^0.21.0" + "@glimmer/object-model" "^0.21.0" + "@glimmer/object-reference" "^0.21.0" + "@glimmer/reference" "^0.21.0" + "@glimmer/runtime" "^0.21.1" + "@glimmer/util" "^0.21.0" + "@glimmer/wire-format" "^0.21.0" + +"@glimmer/util@^0.21.0": + version "0.21.0" + resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.21.0.tgz#86c1e972e2f777f5af664b59c5bc037b71e9ef00" + +"@glimmer/wire-format@^0.21.0": + version "0.21.0" + resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.21.0.tgz#ec97adafaf6d1bbd4d1fcf0cbd0a9df2784a22d5" + dependencies: + "@glimmer/util" "^0.21.0" abbrev@1, [email protected], abbrev@~1.0.9: version "1.0.9" @@ -109,10 +196,6 @@ ansi-styles@^2.0.1, ansi-styles@^2.1.0, ansi-styles@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" -ansi-styles@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.0.0.tgz#cb102df1c56f5123eab8b67cd7b98027a0279178" - ansicolors@~0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.2.1.tgz#be089599097b74a5c9c4a84a0cdbcdb62bd87aef" @@ -171,7 +254,7 @@ are-we-there-yet@~1.1.2: delegates "^1.0.0" readable-stream "^2.0.0 || ^1.1.13" -argparse@^1.0.2, argparse@^1.0.7, argparse@~1.0.2: +argparse@^1.0.7, argparse@~1.0.2: version "1.0.9" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86" dependencies: @@ -344,7 +427,7 @@ babel-code-frame@^6.16.0: esutils "^2.0.2" js-tokens "^2.0.0" -babel-core@^5.0.0, babel-core@~5.8.3: +babel-core@^5.0.0: version "5.8.38" resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-5.8.38.tgz#1fcaee79d7e61b750b00b8e54f6dfc9d0af86558" dependencies: @@ -395,13 +478,6 @@ babel-core@^5.0.0, babel-core@~5.8.3: trim-right "^1.0.0" try-resolve "^1.0.0" -babel-jscs@^2.0.0: - version "2.0.5" - resolved "https://registry.yarnpkg.com/babel-jscs/-/babel-jscs-2.0.5.tgz#0a347046b48145acbca56e8c8ed5f736bc54f9d0" - dependencies: - babel-core "~5.8.3" - lodash.assign "^3.2.0" - babel-plugin-constant-folding@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/babel-plugin-constant-folding/-/babel-plugin-constant-folding-1.0.1.tgz#8361d364c98e449c3692bdba51eff0844290aa8e" @@ -776,31 +852,6 @@ broccoli-funnel@^1.0.0, broccoli-funnel@^1.0.1, broccoli-funnel@^1.0.2, broccoli symlink-or-copy "^1.0.0" walk-sync "^0.3.1" -broccoli-jscs@^1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/broccoli-jscs/-/broccoli-jscs-1.4.1.tgz#075bfff902274db8b5ea7b4514b5b78973a76909" - dependencies: - broccoli-funnel "^1.0.1" - broccoli-merge-trees "^1.1.1" - broccoli-persistent-filter "^1.0.0" - ember-cli-version-checker "^1.0.2" - findup-sync "^0.4.0" - js-string-escape "^1.0.0" - jscs "^2.0.0" - json-stable-stringify "^1.0.0" - minimatch "^3.0.0" - -broccoli-jshint@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/broccoli-jshint/-/broccoli-jshint-1.2.0.tgz#8cd565d11a04bfd32cb8f85a0f7ede1e5be7a6a2" - dependencies: - broccoli-persistent-filter "^1.2.0" - chalk "~0.4.0" - findup-sync "^0.3.0" - jshint "^2.7.0" - json-stable-stringify "^1.0.0" - mkdirp "~0.4.0" - broccoli-kitchen-sink-helpers@^0.2.5, broccoli-kitchen-sink-helpers@^0.2.6, broccoli-kitchen-sink-helpers@~0.2.0: version "0.2.9" resolved "https://registry.yarnpkg.com/broccoli-kitchen-sink-helpers/-/broccoli-kitchen-sink-helpers-0.2.9.tgz#a5e0986ed8d76fb5984b68c3f0450d3a96e36ecc" @@ -846,7 +897,7 @@ broccoli-middleware@^0.18.1: handlebars "^4.0.4" mime "^1.2.11" -broccoli-persistent-filter@^1.0.0, broccoli-persistent-filter@^1.0.1, broccoli-persistent-filter@^1.0.8, broccoli-persistent-filter@^1.1.5, broccoli-persistent-filter@^1.1.6, broccoli-persistent-filter@^1.2.0: +broccoli-persistent-filter@^1.0.1, broccoli-persistent-filter@^1.0.8, broccoli-persistent-filter@^1.1.5, broccoli-persistent-filter@^1.1.6, broccoli-persistent-filter@^1.2.0: version "1.2.11" resolved "https://registry.yarnpkg.com/broccoli-persistent-filter/-/broccoli-persistent-filter-1.2.11.tgz#95cc6b0b0eb0dcce5f8e6ae18f6a3cc45a06bf40" dependencies: @@ -932,15 +983,13 @@ [email protected], broccoli-string-replace@^0.1.1: broccoli-persistent-filter "^1.1.5" minimatch "^2.0.8" -broccoli-tslinter@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/broccoli-tslinter/-/broccoli-tslinter-1.0.2.tgz#de4b79e556c57543148b724a9e63dad5a3eadf80" +broccoli-tslinter@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/broccoli-tslinter/-/broccoli-tslinter-2.0.0.tgz#0c155f2cdef7f979a55f3bebebc16b6e2afbe546" dependencies: broccoli-persistent-filter "^1.2.0" chalk "^1.1.1" exists-sync "0.0.3" - tslint "^3.5.0" - typescript "^1.8.7" broccoli-typescript-compiler@^0.6.0: version "0.6.2" @@ -1129,7 +1178,7 @@ chalk@^0.5.1: strip-ansi "^0.3.0" supports-color "^0.2.0" -chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3, chalk@~1.1.0: +chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" dependencies: @@ -1139,14 +1188,6 @@ chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3, chalk@~1.1.0: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@~0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.4.0.tgz#5199a3ddcd0c1efe23bc08c1b027b06176e0c64f" - dependencies: - ansi-styles "~1.0.0" - has-color "~0.1.0" - strip-ansi "~0.1.0" - charm@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/charm/-/charm-1.0.2.tgz#8add367153a6d9a581331052c4090991da995e35" @@ -1203,7 +1244,7 @@ cli-table2@^0.2.0: optionalDependencies: colors "^1.1.2" -cli-table@^0.3.0, cli-table@^0.3.1, cli-table@~0.3.1: +cli-table@^0.3.0, cli-table@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/cli-table/-/cli-table-0.3.1.tgz#f53b05266a8b1a0b934b3d0821e6e2dc5914ae23" dependencies: @@ -1220,13 +1261,6 @@ cli-width@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.1.0.tgz#b234ca209b29ef66fc518d9b98d5847b00edf00a" -cli@~1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/cli/-/cli-1.0.1.tgz#22817534f24bfa4950c34d532d48ecbc621b8c14" - dependencies: - exit "0.1.2" - glob "^7.1.1" - cliui@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1" @@ -1272,10 +1306,6 @@ code-point-at@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" [email protected], colors@~0.6.0-1: - version "0.6.2" - resolved "https://registry.yarnpkg.com/colors/-/colors-0.6.2.tgz#2423fe6678ac0c5dae8852e5d0e5be08c997abcc" - [email protected]: version "1.0.3" resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" @@ -1284,6 +1314,10 @@ colors@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63" +colors@~0.6.0-1: + version "0.6.2" + resolved "https://registry.yarnpkg.com/colors/-/colors-0.6.2.tgz#2423fe6678ac0c5dae8852e5d0e5be08c997abcc" + columnify@~1.5.4: version "1.5.4" resolved "https://registry.yarnpkg.com/columnify/-/columnify-1.5.4.tgz#4737ddf1c7b69a8a7c340570782e947eec8e78bb" @@ -1317,7 +1351,7 @@ [email protected]: dependencies: graceful-readlink ">= 1.0.0" -commander@^2.5.0, commander@^2.6.0, commander@^2.9.0, commander@~2.9.0: +commander@^2.5.0, commander@^2.6.0, commander@^2.9.0: version "2.9.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4" dependencies: @@ -1327,12 +1361,6 @@ commander@~2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.1.0.tgz#d121bbae860d9992a3d517ba96f56588e47c6781" -comment-parser@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-0.3.1.tgz#fd657aac8c1492d308c9a6100fc9b49d2435aba1" - dependencies: - readable-stream "^2.0.4" - commoner@~0.10.3: version "0.10.8" resolved "https://registry.yarnpkg.com/commoner/-/commoner-0.10.8.tgz#34fc3672cd24393e8bb47e70caa0293811f4f2c5" @@ -1431,12 +1459,6 @@ connect@^3.3.3: parseurl "~1.3.1" utils-merge "1.0.0" [email protected]: - version "1.1.0" - resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10" - dependencies: - date-now "^0.1.4" - console-control-strings@^1.0.0, console-control-strings@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" @@ -1530,10 +1552,6 @@ [email protected]: version "0.5.3" resolved "https://registry.yarnpkg.com/ctype/-/ctype-0.5.3.tgz#82c18c2461f74114ef16c135224ad0b9144ca12f" [email protected]: - version "1.0.3" - resolved "https://registry.yarnpkg.com/cycle/-/cycle-1.0.3.tgz#21e80b2be8580f98b468f379430662b046c34ad2" - d@^0.1.1, d@~0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/d/-/d-0.1.1.tgz#da184c535d18d8ee7ba2aa229b914009fae11309" @@ -1550,10 +1568,6 @@ dashdash@^1.12.0: dependencies: assert-plus "^1.0.0" -date-now@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b" - debug@2, debug@^2.1.0, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0: version "2.5.2" resolved "https://registry.yarnpkg.com/debug/-/debug-2.5.2.tgz#50c295a53dbf1657146e0c1b21307275e90d49cb" @@ -1586,10 +1600,6 @@ deep-eql@^0.1.3: dependencies: type-detect "0.1.1" -deep-equal@*: - version "1.0.1" - resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5" - deep-is@~0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" @@ -1687,45 +1697,13 @@ [email protected], diff@^1.3.1: version "1.4.0" resolved "https://registry.yarnpkg.com/diff/-/diff-1.4.0.tgz#7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf" -diff@^2.2.1: - version "2.2.3" - resolved "https://registry.yarnpkg.com/diff/-/diff-2.2.3.tgz#60eafd0d28ee906e4e8ff0a52c1229521033bf99" - doctrine@^1.2.2: version "1.5.0" resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa" dependencies: esutils "^2.0.2" isarray "^1.0.0" -dom-serializer@0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82" - dependencies: - domelementtype "~1.1.1" - entities "~1.1.1" - -domelementtype@1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2" - -domelementtype@~1.1.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b" - [email protected]: - version "2.3.0" - resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.3.0.tgz#2de59a0822d5027fabff6f032c2b25a2a8abe738" - dependencies: - domelementtype "1" - [email protected]: - version "1.5.1" - resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf" - dependencies: - dom-serializer "0" - domelementtype "1" - dot-prop@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-3.0.0.tgz#1b708af094a49c9a0e7dbcad790aba539dac1177" @@ -2065,19 +2043,18 @@ [email protected]: json-stable-stringify "^1.0.1" lodash "^3.10.1" -emberjs-build@^0.15.0: - version "0.15.2" - resolved "https://registry.yarnpkg.com/emberjs-build/-/emberjs-build-0.15.2.tgz#5904f0e439e8aeb9f0ad5d254fe8ad1236a0e040" +emberjs-build@chadhietala/emberjs-build#allow-interators: + version "0.19.0" + resolved "https://codeload.github.com/chadhietala/emberjs-build/tar.gz/700f74f7d1479d96ba85d64c2d9e9023885c3b29" dependencies: amd-name-resolver "0.0.4" broccoli "0.16.3" broccoli-babel-transpiler "^5.6.1" broccoli-concat "^2.0.0" broccoli-file-creator "^1.0.0" broccoli-funnel "^1.0.1" - broccoli-jscs "^1.4.1" - broccoli-jshint "^1.1.0" broccoli-kitchen-sink-helpers "^0.2.6" + broccoli-lint-eslint "^3.2.0" broccoli-merge-trees "^1.1.1" broccoli-persistent-filter "^1.0.8" broccoli-source "^1.1.0" @@ -2150,10 +2127,6 @@ ensure-posix-path@^1.0.0, ensure-posix-path@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/ensure-posix-path/-/ensure-posix-path-1.0.2.tgz#a65b3e42d0b71cfc585eb774f9943c8d9b91b0c2" [email protected]: - version "1.0.0" - resolved "https://registry.yarnpkg.com/entities/-/entities-1.0.0.tgz#b2987aa3821347fcde642b24fdfc9e4fb712bf26" - entities@~1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0" @@ -2239,7 +2212,7 @@ [email protected]: optionalDependencies: source-map "~0.1.30" -escope@^3.2.0, escope@^3.6.0: +escope@^3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/escope/-/escope-3.6.0.tgz#e01975e812781a163a6dadfdd80398dc64c889c3" dependencies: @@ -2302,7 +2275,7 @@ esprima-fb@~15001.1001.0-dev-harmony-fb: version "15001.1001.0-dev-harmony-fb" resolved "https://registry.yarnpkg.com/esprima-fb/-/esprima-fb-15001.1001.0-dev-harmony-fb.tgz#43beb57ec26e8cf237d3dd8b33e42533577f2659" -esprima@^2.6.0, esprima@~2.7.0: +esprima@^2.6.0: version "2.7.3" resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581" @@ -2329,7 +2302,7 @@ esrecurse@^4.1.0: estraverse "~4.1.0" object-assign "^4.0.1" -estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0: +estraverse@^4.1.1, estraverse@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13" @@ -2386,7 +2359,7 @@ exit-hook@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8" [email protected], [email protected], exit@^0.1.2, exit@~0.1.2: +exit@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" @@ -2461,10 +2434,6 @@ [email protected]: version "1.0.2" resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.0.2.tgz#e1080e0658e300b06294990cc70e1502235fd550" [email protected]: - version "0.1.8" - resolved "https://registry.yarnpkg.com/eyes/-/eyes-0.1.8.tgz#62cf120234c683785d902348a800ef3e0cc20bc0" - fast-levenshtein@~2.0.4: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" @@ -2571,13 +2540,7 @@ findup-sync@^0.2.1: dependencies: glob "~4.3.0" -findup-sync@^0.3.0, findup-sync@~0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-0.3.0.tgz#37930aa5d816b777c03445e1966cc6790a4c0b16" - dependencies: - glob "~5.0.0" - -findup-sync@^0.4.0, findup-sync@^0.4.2: +findup-sync@^0.4.2: version "0.4.3" resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-0.4.3.tgz#40043929e7bc60adf0b7f4827c4c6e75a0deca12" dependencies: @@ -2849,25 +2812,24 @@ github@^0.2.3: dependencies: mime "^1.2.11" -glimmer-engine@^0.19.4: - version "0.19.4" - resolved "https://registry.yarnpkg.com/glimmer-engine/-/glimmer-engine-0.19.4.tgz#7dc29f30efa4ab4682e8131e0418dcc3ba3dc8e3" +glimmer-engine@^0.20.0: + version "0.20.0" + resolved "https://registry.yarnpkg.com/glimmer-engine/-/glimmer-engine-0.20.0.tgz#fb2ad96a34df6a712d7f0e8d84043d08ec994388" dependencies: broccoli-concat "^2.1.0" broccoli-funnel "^1.0.1" broccoli-merge-trees "^1.1.1" broccoli-stew "^1.2.0" - broccoli-tslinter "^1.0.2" + broccoli-tslinter "^2.0.0" broccoli-typescript-compiler "^0.6.0" broccoli-uglify-js "~0.1.3" - emberjs-build "^0.15.0" + emberjs-build chadhietala/emberjs-build#allow-interators exists-sync "0.0.3" git-repo-version "^0.1.2" handlebars "^3.0.2" qunit "^0.9.1" simple-dom "^0.3.0" simple-html-tokenizer "^0.2.5" - typescript "~2.0.9" glob-base@^0.3.0: version "0.3.0" @@ -2896,7 +2858,7 @@ [email protected]: inherits "2" minimatch "~0.2.11" [email protected], glob@^7.0.0, glob@^7.0.3, glob@^7.0.4, glob@^7.0.5, glob@^7.1.1: [email protected], glob@^7.0.0, glob@^7.0.3, glob@^7.0.4, glob@^7.0.5: version "7.1.1" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8" dependencies: @@ -2907,7 +2869,7 @@ [email protected], glob@^7.0.0, glob@^7.0.3, glob@^7.0.4, glob@^7.0.5, glob@^7.1.1: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^5.0.1, glob@^5.0.10, glob@^5.0.13, glob@^5.0.15, glob@~5.0.0: +glob@^5.0.10, glob@^5.0.13, glob@^5.0.15: version "5.0.15" resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1" dependencies: @@ -3025,7 +2987,7 @@ [email protected]: optionalDependencies: uglify-js "~2.3" -handlebars@^3.0.1, handlebars@^3.0.2: +handlebars@^3.0.1, handlebars@^3.0.2, handlebars@^3.0.3, handlebars@~3: version "3.0.3" resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-3.0.3.tgz#0e09651a2f0fb3c949160583710d551f92e6d2ad" dependencies: @@ -3084,7 +3046,7 @@ [email protected]: dependencies: isarray "0.0.1" -has-color@^0.1.7, has-color@~0.1.0: +has-color@^0.1.7: version "0.1.7" resolved "https://registry.yarnpkg.com/has-color/-/has-color-0.1.7.tgz#67144a5260c34fc3cca677d041daf52fe7b78b2f" @@ -3179,16 +3141,6 @@ html-differ@^1.3.4: vow "0.4.3" vow-fs "0.3.1" [email protected], [email protected]: - version "3.8.3" - resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.8.3.tgz#996c28b191516a8be86501a7d79757e5c70c1068" - dependencies: - domelementtype "1" - domhandler "2.3" - domutils "1.5" - entities "1.0" - readable-stream "1.1" - http-errors@~1.5.0: version "1.5.1" resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.5.1.tgz#788c0d2c1de2c81b9e6e8c01843b6b97eb920750" @@ -3228,10 +3180,6 @@ https-proxy-agent@~1.0.0: debug "2" extend "3" [email protected]: - version "0.3.5" - resolved "https://registry.yarnpkg.com/i/-/i-0.3.5.tgz#1d2b854158ec8169113c6cb7f6b6801e99e211d5" - iconv-lite@^0.4.5, iconv-lite@~0.4.13: version "0.4.15" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.15.tgz#fe265a218ac6a57cfe854927e9d04c19825eddeb" @@ -3267,10 +3215,6 @@ inflight@^1.0.4, inflight@~1.0.5: once "^1.3.0" wrappy "1" -inherit@^2.2.2: - version "2.2.6" - resolved "https://registry.yarnpkg.com/inherit/-/inherit-2.2.6.tgz#f1614b06c8544e8128e4229c86347db73ad9788d" - inherits@2, [email protected], inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" @@ -3482,10 +3426,6 @@ is-typedarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" -is-utf8@^0.2.0: - version "0.2.1" - resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" - is-windows@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-0.2.0.tgz#de1aa6d63ea29dd248737b69f1ff8b8002d2108c" @@ -3512,7 +3452,7 @@ isobject@^2.0.0: dependencies: isarray "1.0.0" [email protected], isstream@~0.1.2: +isstream@~0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" @@ -3581,85 +3521,14 @@ [email protected], js-yaml@^3.2.5, js-yaml@^3.2.7, js-yaml@^3.5.1, js-yaml@^3.6.1: argparse "^1.0.7" esprima "^2.6.0" -js-yaml@~3.4.0: - version "3.4.6" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.4.6.tgz#6be1b23f6249f53d293370fd4d1aaa63ce1b4eb0" - dependencies: - argparse "^1.0.2" - esprima "^2.6.0" - inherit "^2.2.2" - jsbn@~0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.0.tgz#650987da0dd74f4ebf5a11377a2aa2d273e97dfd" -jscs-jsdoc@^1.3.1: - version "1.3.2" - resolved "https://registry.yarnpkg.com/jscs-jsdoc/-/jscs-jsdoc-1.3.2.tgz#1f2c82b6ab4b97524da958f46b4e562e0305f9a7" - dependencies: - comment-parser "^0.3.1" - jsdoctypeparser "~1.2.0" - -jscs-preset-wikimedia@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/jscs-preset-wikimedia/-/jscs-preset-wikimedia-1.0.0.tgz#fff563342038fc2e8826b7bb7309c3ae3406fc7e" - -jscs@^2.0.0: - version "2.11.0" - resolved "https://registry.yarnpkg.com/jscs/-/jscs-2.11.0.tgz#6e11ef0caaa07731f9dcc2b2b27d8ecee1ddbcb6" - dependencies: - babel-jscs "^2.0.0" - chalk "~1.1.0" - cli-table "~0.3.1" - commander "~2.9.0" - escope "^3.2.0" - esprima "~2.7.0" - estraverse "^4.1.0" - exit "~0.1.2" - glob "^5.0.1" - htmlparser2 "3.8.3" - js-yaml "~3.4.0" - jscs-jsdoc "^1.3.1" - jscs-preset-wikimedia "~1.0.0" - jsonlint "~1.6.2" - lodash "~3.10.0" - minimatch "~3.0.0" - natural-compare "~1.2.2" - pathval "~0.1.1" - prompt "~0.2.14" - reserved-words "^0.1.1" - resolve "^1.1.6" - strip-bom "^2.0.0" - strip-json-comments "~1.0.2" - to-double-quotes "^2.0.0" - to-single-quotes "^2.0.0" - vow "~0.4.8" - vow-fs "~0.3.4" - xmlbuilder "^3.1.0" - -jsdoctypeparser@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/jsdoctypeparser/-/jsdoctypeparser-1.2.0.tgz#e7dedc153a11849ffc5141144ae86a7ef0c25392" - dependencies: - lodash "^3.7.0" - jsesc@~0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" -jshint@^2.7.0: - version "2.9.4" - resolved "https://registry.yarnpkg.com/jshint/-/jshint-2.9.4.tgz#5e3ba97848d5290273db514aee47fe24cf592934" - dependencies: - cli "~1.0.0" - console-browserify "1.1.x" - exit "0.1.x" - htmlparser2 "3.8.x" - lodash "3.7.x" - minimatch "~3.0.2" - shelljs "0.3.x" - strip-json-comments "1.0.x" - json-parse-helpfulerror@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz#13f14ce02eed4e981297b64eb9e3b932e2dd13dc" @@ -3698,13 +3567,6 @@ jsonify@~0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73" -jsonlint@~1.6.2: - version "1.6.2" - resolved "https://registry.yarnpkg.com/jsonlint/-/jsonlint-1.6.2.tgz#5737045085f55eb455c68b1ff4ebc01bd50e8830" - dependencies: - JSV ">= 4.0.x" - nomnom ">= 1.5.x" - jsonpointer@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9" @@ -4015,15 +3877,11 @@ [email protected]: version "2.4.1" resolved "https://registry.yarnpkg.com/lodash/-/lodash-2.4.1.tgz#5b7723034dda4d262e5a46fb2c58d7cc22f71420" [email protected]: - version "3.7.0" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.7.0.tgz#3678bd8ab995057c07ade836ed2ef087da811d45" - [email protected]: version "4.16.2" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.16.2.tgz#3e626db827048a699281a8a125226326cfc0e652" -lodash@^3.10.0, lodash@^3.10.1, lodash@^3.5.0, lodash@^3.7.0, lodash@^3.9.3, lodash@~3.10.0: +lodash@^3.10.0, lodash@^3.10.1, lodash@^3.9.3: version "3.10.1" resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6" @@ -4197,7 +4055,7 @@ [email protected], [email protected]: lru-cache "2" sigmund "~1.0.0" -"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@~3.0.0, minimatch@~3.0.2: +"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774" dependencies: @@ -4231,25 +4089,19 @@ minimist@^1.1.0, minimist@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" [email protected]: [email protected], [email protected]: version "0.3.0" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.0.tgz#1bbf5ab1ba827af23575143490426455f481fe1e" [email protected], mkdirp@^0.3.5, mkdirp@~0.3.5: - version "0.3.5" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.5.tgz#de3e5f8961c88c787ee1368df849ac4413eca8d7" - [email protected], [email protected], [email protected], "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1: [email protected], [email protected], "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" dependencies: minimist "0.0.8" -mkdirp@~0.4.0: - version "0.4.2" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.4.2.tgz#427c8c18ece398b932f6f666f4e1e5b7740e78c8" - dependencies: - minimist "0.0.8" +mkdirp@^0.3.5, mkdirp@~0.3.5: + version "0.3.5" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.5.tgz#de3e5f8961c88c787ee1368df849ac4413eca8d7" mktemp@~0.4.0: version "0.4.0" @@ -4312,14 +4164,6 @@ natural-compare@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" -natural-compare@~1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.2.2.tgz#1f96d60e3141cac1b6d05653ce0daeac763af6aa" - [email protected]: - version "0.4.2" - resolved "https://registry.yarnpkg.com/ncp/-/ncp-0.4.2.tgz#abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574" - [email protected]: version "0.6.1" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9" @@ -4384,13 +4228,6 @@ node-uuid@^1.4.3, node-uuid@~1.4.0, node-uuid@~1.4.7: version "1.4.7" resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.7.tgz#6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f" -"nomnom@>= 1.5.x": - version "1.8.1" - resolved "https://registry.yarnpkg.com/nomnom/-/nomnom-1.8.1.tgz#2151f722472ba79e50a76fc125bb8c8f2e4dc2a7" - dependencies: - chalk "~0.4.0" - underscore "~1.6.0" - "nopt@2 || 3", nopt@^3.0.1, nopt@~3.0.6: version "3.0.6" resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" @@ -4608,7 +4445,7 @@ opener@~1.4.1: version "1.4.2" resolved "https://registry.yarnpkg.com/opener/-/opener-1.4.2.tgz#b32582080042af8680c389a499175b4c54fff523" -optimist@^0.6.1, optimist@~0.6.0: +optimist@^0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686" dependencies: @@ -4749,10 +4586,6 @@ [email protected]: version "0.1.7" resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" -pathval@~0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/pathval/-/pathval-0.1.1.tgz#08f911cdca9cce5942880da7817bc0b723b66d82" - pify@^2.0.0: version "2.3.0" resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" @@ -4767,14 +4600,6 @@ pinkie@^2.0.0: version "2.0.4" resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" [email protected]: - version "0.3.1" - resolved "https://registry.yarnpkg.com/pkginfo/-/pkginfo-0.3.1.tgz#5b29f6a81f70717142e09e765bbeab97b4f81e21" - [email protected]: - version "0.4.0" - resolved "https://registry.yarnpkg.com/pkginfo/-/pkginfo-0.4.0.tgz#349dbb7ffd38081fcadc0853df687f0c7744cd65" - pluralize@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-1.2.1.tgz#d1a21483fd22bb41e58a12fa3421823140897c45" @@ -4823,16 +4648,6 @@ promise-map-series@^0.2.1: dependencies: rsvp "^3.0.14" -prompt@~0.2.14: - version "0.2.14" - resolved "https://registry.yarnpkg.com/prompt/-/prompt-0.2.14.tgz#57754f64f543fd7b0845707c818ece618f05ffdc" - dependencies: - pkginfo "0.x.x" - read "1.0.x" - revalidator "0.1.x" - utile "0.2.x" - winston "0.8.x" - promzard@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/promzard/-/promzard-0.3.0.tgz#26a5d6ee8c7dee4cb12208305acfb93ba382a9ee" @@ -4968,7 +4783,7 @@ read-package-tree@~5.1.5: read-package-json "^2.0.0" readdir-scoped-modules "^1.0.0" -read@1, [email protected], read@~1.0.1, read@~1.0.7: +read@1, read@~1.0.1, read@~1.0.7: version "1.0.7" resolved "https://registry.yarnpkg.com/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4" dependencies: @@ -4986,16 +4801,7 @@ read@1, [email protected], read@~1.0.1, read@~1.0.7: string_decoder "~0.10.x" util-deprecate "~1.0.1" [email protected]: - version "1.1.13" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.13.tgz#f6eef764f514c89e2b9e23146a75ba106756d23e" - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "0.0.1" - string_decoder "~0.10.x" - -readable-stream@^2.0.0, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.2.2: +readable-stream@^2.0.0, readable-stream@^2.0.5, readable-stream@^2.2.2: version "2.2.2" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.2.tgz#a9e6fec3c7dda85f8bb1b3ba7028604556fc825e" dependencies: @@ -5225,10 +5031,6 @@ [email protected]: version "1.0.0" resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" -reserved-words@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/reserved-words/-/reserved-words-0.1.1.tgz#6f7c15e5e5614c50da961630da46addc87c0cef2" - resolve-dir@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-0.1.1.tgz#b219259a5602fac5c5c496ad894a6e8cc430261e" @@ -5259,17 +5061,13 @@ retry@^0.10.0, retry@~0.10.0: version "0.10.1" resolved "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4" [email protected]: - version "0.1.8" - resolved "https://registry.yarnpkg.com/revalidator/-/revalidator-0.1.8.tgz#fece61bfa0c1b52a206bd6b18198184bdd523a3b" - right-align@^0.1.1: version "0.1.3" resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef" dependencies: align-text "^0.1.1" -rimraf@2, [email protected], rimraf@^2.2.8, rimraf@^2.3.2, rimraf@^2.3.4, rimraf@^2.4.1, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@^2.5.2, rimraf@^2.5.3, rimraf@^2.5.4, rimraf@~2.5.4: +rimraf@2, rimraf@^2.2.8, rimraf@^2.3.2, rimraf@^2.3.4, rimraf@^2.4.1, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@^2.5.2, rimraf@^2.5.3, rimraf@^2.5.4, rimraf@~2.5.4: version "2.5.4" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.5.4.tgz#96800093cbf1a0c86bd95b4625467535c29dfa04" dependencies: @@ -5435,10 +5233,6 @@ shebang-regex@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" [email protected]: - version "0.3.0" - resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.3.0.tgz#3596e6307a781544f591f37da618360f31db57b1" - shelljs@^0.7.5: version "0.7.5" resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.5.tgz#2eef7a50a21e1ccf37da00df767ec69e30ad0675" @@ -5477,6 +5271,10 @@ simple-html-tokenizer@^0.2.5: version "0.2.6" resolved "https://registry.yarnpkg.com/simple-html-tokenizer/-/simple-html-tokenizer-0.2.6.tgz#a6efab7bc705cf3a96f1aaeaa1a76365f0d16c33" +simple-html-tokenizer@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/simple-html-tokenizer/-/simple-html-tokenizer-0.3.0.tgz#9b8b5559d80e331a544dd13dd59382e5d0d94411" + simple-is@~0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/simple-is/-/simple-is-0.2.0.tgz#2abb75aade39deb5cc815ce10e6191164850baf0" @@ -5655,10 +5453,6 @@ stable@~0.1.3: version "0.1.5" resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.5.tgz#08232f60c732e9890784b5bed0734f8b32a887b9" [email protected]: - version "0.0.9" - resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.9.tgz#a8f6eaeca90674c333e7c43953f275b451510695" - "statuses@>= 1.3.1 < 2", statuses@~1.3.0: version "1.3.1" resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e" @@ -5720,21 +5514,11 @@ strip-ansi@^3.0.0, strip-ansi@^3.0.1, strip-ansi@~3.0.1: dependencies: ansi-regex "^2.0.0" -strip-ansi@~0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.1.1.tgz#39e8a98d044d150660abe4a6808acf70bb7bc991" - -strip-bom@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e" - dependencies: - is-utf8 "^0.2.0" - strip-bom@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" [email protected], strip-json-comments@~1.0.1, strip-json-comments@~1.0.2: +strip-json-comments@~1.0.1: version "1.0.4" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-1.0.4.tgz#1e15fbcac97d3ee99bf2d73b4c656b082bbafb91" @@ -5896,10 +5680,6 @@ [email protected]: version "0.1.4" resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890" -to-double-quotes@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/to-double-quotes/-/to-double-quotes-2.0.0.tgz#aaf231d6fa948949f819301bbab4484d8588e4a7" - to-fast-properties@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.2.tgz#f3f5c0c3ba7299a7ef99427e44633257ade43320" @@ -5908,10 +5688,6 @@ [email protected]: version "0.0.2" resolved "https://registry.yarnpkg.com/to-iso-string/-/to-iso-string-0.0.2.tgz#4dc19e664dfccbe25bd8db508b00c6da158255d1" -to-single-quotes@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/to-single-quotes/-/to-single-quotes-2.0.1.tgz#7cc29151f0f5f2c41946f119f5932fe554170125" - tough-cookie@>=0.12.0, tough-cookie@~2.3.0: version "2.3.2" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.2.tgz#f081f76e4c85720e6c37a5faced737150d84072a" @@ -5948,18 +5724,6 @@ tryor@~0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/tryor/-/tryor-0.1.2.tgz#8145e4ca7caff40acde3ccf946e8b8bb75b4172b" -tslint@^3.5.0: - version "3.15.1" - resolved "https://registry.yarnpkg.com/tslint/-/tslint-3.15.1.tgz#da165ca93d8fdc2c086b51165ee1bacb48c98ea5" - dependencies: - colors "^1.1.2" - diff "^2.2.1" - findup-sync "~0.3.0" - glob "^7.0.3" - optimist "~0.6.0" - resolve "^1.1.7" - underscore.string "^3.3.4" - tunnel-agent@~0.4.0, tunnel-agent@~0.4.1: version "0.4.3" resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb" @@ -5993,14 +5757,6 @@ typedarray@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" -typescript@^1.8.7: - version "1.8.10" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-1.8.10.tgz#b475d6e0dff0bf50f296e5ca6ef9fbb5c7320f1e" - -typescript@~2.0.9: - version "2.0.10" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.0.10.tgz#ccdd4ed86fd5550a407101a0814012e1b3fac3dd" - uc.micro@^1.0.0, uc.micro@^1.0.1, uc.micro@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.3.tgz#7ed50d5e0f9a9fb0a573379259f2a77458d50192" @@ -6047,7 +5803,7 @@ umask@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/umask/-/umask-1.1.0.tgz#f29cebf01df517912bb58ff9c4e50fde8e33320d" [email protected], underscore.string@^3.3.4: [email protected]: version "3.3.4" resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-3.3.4.tgz#2c2a3f9f83e64762fdc45e6ceac65142864213db" dependencies: @@ -6062,10 +5818,6 @@ underscore@>=1.8.3, underscore@^1.6.0: version "1.8.3" resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022" -underscore@~1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.6.0.tgz#8b38b10cacdef63337b8b24e4ff86d45aea529a8" - unique-filename@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.0.tgz#d05f2fe4032560871f30e93cbe735eea201514f3" @@ -6106,22 +5858,11 @@ util-extend@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/util-extend/-/util-extend-1.0.3.tgz#a7c216d267545169637b3b6edc6ca9119e2ff93f" [email protected]: - version "0.2.1" - resolved "https://registry.yarnpkg.com/utile/-/utile-0.2.1.tgz#930c88e99098d6220834c356cbd9a770522d90d7" - dependencies: - async "~0.2.9" - deep-equal "*" - i "0.3.x" - mkdirp "0.x.x" - ncp "0.4.x" - rimraf "2.x.x" - [email protected]: version "1.0.0" resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.0.tgz#0294fb922bb9375153541c4f7096231f287c8af8" -uuid@^2.0.1, uuid@^2.0.2: +uuid@^2.0.1: version "2.0.3" resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a" @@ -6160,33 +5901,14 @@ [email protected]: node-uuid "1.4.0" vow-queue "0.1.0" -vow-fs@~0.3.4: - version "0.3.6" - resolved "https://registry.yarnpkg.com/vow-fs/-/vow-fs-0.3.6.tgz#2d4c59be22e2bf2618ddf597ab4baa923be7200d" - dependencies: - glob "^7.0.5" - uuid "^2.0.2" - vow "^0.4.7" - vow-queue "^0.4.1" - [email protected]: version "0.1.0" resolved "https://registry.yarnpkg.com/vow-queue/-/vow-queue-0.1.0.tgz#a9b561477c7ea5d563b0caaa52e40e668de0c238" -vow-queue@^0.4.1: - version "0.4.2" - resolved "https://registry.yarnpkg.com/vow-queue/-/vow-queue-0.4.2.tgz#e7fe17160e15c7c4184d1b666a9bc64e18e30184" - dependencies: - vow "~0.4.0" - [email protected]: version "0.4.3" resolved "https://registry.yarnpkg.com/vow/-/vow-0.4.3.tgz#d5c394d4f1e844c988100b57b540956c4a005ba6" -vow@^0.4.7, vow@~0.4.0, vow@~0.4.8: - version "0.4.13" - resolved "https://registry.yarnpkg.com/vow/-/vow-0.4.13.tgz#e7c14f1bd9c8be0e7359a4597fe2d1ef6d1a7e88" - walk-sync@^0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-0.1.3.tgz#8a07261a00bda6cfb1be25e9f100fad57546f583" @@ -6267,18 +5989,6 @@ window-size@^0.1.2: version "0.1.4" resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876" [email protected]: - version "0.8.3" - resolved "https://registry.yarnpkg.com/winston/-/winston-0.8.3.tgz#64b6abf4cd01adcaefd5009393b1d8e8bec19db0" - dependencies: - async "0.2.x" - colors "0.6.x" - cycle "1.0.x" - eyes "0.1.x" - isstream "0.1.x" - pkginfo "0.3.x" - stack-trace "0.0.x" - [email protected], [email protected], wordwrap@~0.0.2: version "0.0.2" resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f" @@ -6335,12 +6045,6 @@ [email protected], xmlbuilder@>=2.4.6: dependencies: lodash "~3.5.0" -xmlbuilder@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-3.1.0.tgz#2c86888f2d4eade850fa38ca7f7223f7209516e1" - dependencies: - lodash "^3.5.0" - xmldom@^0.1.19: version "0.1.27" resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"
true
Other
emberjs
ember.js
9a06439a460196347d50092ae42dbbc1bc198429.json
fix typo in test description
packages/ember-routing/tests/utils_test.js
@@ -15,7 +15,7 @@ QUnit.test('converts array style into verbose object style', function(assert) { equal(normalized[paramName].scope, 'model', 'defaults scope to model'); }); -QUnit.test('converts object stlye [{foo: \'an_alias\'}]', function(assert) { +QUnit.test('converts object style [{foo: \'an_alias\'}]', function(assert) { let paramName = 'foo'; let params = [{ 'foo': 'an_alias' }]; let normalized = normalizeControllerQueryParams(params); @@ -25,7 +25,7 @@ QUnit.test('converts object stlye [{foo: \'an_alias\'}]', function(assert) { equal(normalized[paramName].scope, 'model', 'defaults scope to model'); }); -QUnit.test('retains maximally verbose object stlye [{foo: {as: \'foo\'}}]', function(assert) { +QUnit.test('retains maximally verbose object style [{foo: {as: \'foo\'}}]', function(assert) { let paramName = 'foo'; let params = [{ 'foo': { as: 'an_alias' } }]; let normalized = normalizeControllerQueryParams(params);
false
Other
emberjs
ember.js
cb54a5bf85d959bf5cfdf73f03fed8fac03024fa.json
replace prototypal on classical inheritance
packages/ember-routing/lib/system/dsl.js
@@ -6,17 +6,17 @@ import { assert, deprecate } from 'ember-metal'; @submodule ember-routing */ -function DSL(name, options) { - this.parent = name; - this.enableLoadingSubstates = options && options.enableLoadingSubstates; - this.matches = []; - this.explicitIndex = undefined; - this.options = options; -} +let uuid = 0; -export default DSL; +class DSL { + constructor(name, options) { + this.parent = name; + this.enableLoadingSubstates = options && options.enableLoadingSubstates; + this.matches = []; + this.explicitIndex = undefined; + this.options = options; + } -DSL.prototype = { route(name, options, callback) { let dummyErrorRoute = `/_unused_dummy_error_path_route_${name}/:error`; if (arguments.length === 2 && typeof options === 'function') { @@ -30,11 +30,11 @@ DSL.prototype = { assert( `'${name}' cannot be used as a route name.`, - (function() { + ((() => { if (options.overrideNameAssertion === true) { return true; } return ['array', 'basic', 'object', 'application'].indexOf(name) === -1; - })() + }))() ); if (this.enableLoadingSubstates) { @@ -55,7 +55,7 @@ DSL.prototype = { } else { createRoute(this, name, options); } - }, + } push(url, name, callback, serialize) { let parts = name.split('.'); @@ -76,7 +76,7 @@ DSL.prototype = { if (url === '' || url === '/' || parts[parts.length - 1] === 'index') { this.explicitIndex = true; } this.matches.push([url, name, callback]); - }, + } resource(name, options, callback) { if (arguments.length === 2 && typeof options === 'function') { @@ -91,7 +91,7 @@ DSL.prototype = { options.resetNamespace = true; deprecate('this.resource() is deprecated. Use this.route(\'name\', { resetNamespace: true }, function () {}) instead.', false, { id: 'ember-routing.router-resource', until: '3.0.0' }); this.route(name, options, callback); - }, + } generate() { let dslMatches = this.matches; @@ -107,7 +107,82 @@ DSL.prototype = { } }; } -}; + + mount(_name, options = {}) { + let engineRouteMap = this.options.resolveRouteMap(_name); + let name = _name; + + if (options.as) { + name = options.as; + } + + let fullName = getFullName(this, name, options.resetNamespace); + + let engineInfo = { + name: _name, + instanceId: uuid++, + mountPoint: fullName, + fullName + }; + + let path = options.path; + + if (typeof path !== 'string') { + path = `/${name}`; + } + + let callback; + let dummyErrorRoute = `/_unused_dummy_error_path_route_${name}/:error`; + if (engineRouteMap) { + let shouldResetEngineInfo = false; + let oldEngineInfo = this.options.engineInfo; + if (oldEngineInfo) { + shouldResetEngineInfo = true; + this.options.engineInfo = engineInfo; + } + + let optionsForChild = assign({ engineInfo }, this.options); + let childDSL = new DSL(fullName, optionsForChild); + + createRoute(childDSL, 'loading'); + createRoute(childDSL, 'error', { path: dummyErrorRoute }); + + + engineRouteMap.class.call(childDSL); + + callback = childDSL.generate(); + + if (shouldResetEngineInfo) { + this.options.engineInfo = oldEngineInfo; + } + } + + let localFullName = 'application'; + let routeInfo = assign({ localFullName }, engineInfo); + + if (this.enableLoadingSubstates) { + // These values are important to register the loading routes under their + // proper names for the Router and within the Engine's registry. + let substateName = `${name}_loading`; + let localFullName = `application_loading`; + let routeInfo = assign({ localFullName }, engineInfo); + createRoute(this, substateName, { resetNamespace: options.resetNamespace }); + this.options.addRouteForEngine(substateName, routeInfo); + + substateName = `${name}_error`; + localFullName = `application_error`; + routeInfo = assign({ localFullName }, engineInfo); + createRoute(this, substateName, { resetNamespace: options.resetNamespace, path: dummyErrorRoute }); + this.options.addRouteForEngine(substateName, routeInfo); + } + + this.options.addRouteForEngine(fullName, routeInfo); + + this.push(path, fullName, callback); + } +} + +export default DSL; function canNest(dsl) { return dsl.parent && dsl.parent !== 'application'; @@ -136,78 +211,3 @@ DSL.map = callback => { callback.call(dsl); return dsl; }; - -let uuid = 0; - -DSL.prototype.mount = function(_name, options = {}) { - let engineRouteMap = this.options.resolveRouteMap(_name); - let name = _name; - - if (options.as) { - name = options.as; - } - - let fullName = getFullName(this, name, options.resetNamespace); - - let engineInfo = { - name: _name, - instanceId: uuid++, - mountPoint: fullName, - fullName - }; - - let path = options.path; - - if (typeof path !== 'string') { - path = `/${name}`; - } - - let callback; - let dummyErrorRoute = `/_unused_dummy_error_path_route_${name}/:error`; - if (engineRouteMap) { - let shouldResetEngineInfo = false; - let oldEngineInfo = this.options.engineInfo; - if (oldEngineInfo) { - shouldResetEngineInfo = true; - this.options.engineInfo = engineInfo; - } - - let optionsForChild = assign({ engineInfo }, this.options); - let childDSL = new DSL(fullName, optionsForChild); - - createRoute(childDSL, 'loading'); - createRoute(childDSL, 'error', { path: dummyErrorRoute }); - - - engineRouteMap.class.call(childDSL); - - callback = childDSL.generate(); - - if (shouldResetEngineInfo) { - this.options.engineInfo = oldEngineInfo; - } - } - - let localFullName = 'application'; - let routeInfo = assign({ localFullName }, engineInfo); - - if (this.enableLoadingSubstates) { - // These values are important to register the loading routes under their - // proper names for the Router and within the Engine's registry. - let substateName = `${name}_loading`; - let localFullName = `application_loading`; - let routeInfo = assign({ localFullName }, engineInfo); - createRoute(this, substateName, { resetNamespace: options.resetNamespace }); - this.options.addRouteForEngine(substateName, routeInfo); - - substateName = `${name}_error`; - localFullName = `application_error`; - routeInfo = assign({ localFullName }, engineInfo); - createRoute(this, substateName, { resetNamespace: options.resetNamespace, path: dummyErrorRoute }); - this.options.addRouteForEngine(substateName, routeInfo); - } - - this.options.addRouteForEngine(fullName, routeInfo); - - this.push(path, fullName, callback); -};
false
Other
emberjs
ember.js
ceccf6f1edd0bb7d6b0c8062a9666d7d854fd006.json
container_proxy: Add @since to ownerInjection()
packages/ember-runtime/lib/mixins/container_proxy.js
@@ -45,6 +45,7 @@ let containerProxyMixin = { @public @method ownerInjection + @since 2.3.0 @return {Object} */ ownerInjection() {
false
Other
emberjs
ember.js
9616516c95bf2c5a4c32b5269555b397897c4d6e.json
Fix deopt for the field load of `.concat` This passed all meaningful tests, but there is one test that is asserting something I'm shocked about, that I'm going to submit this for review anyway. If this were true we'd do things like call concat on a string with an array. Which makes little sense to me. I believe this test isn't testing a real thing.
packages/ember-metal/lib/mixin.js
@@ -43,7 +43,9 @@ import { function ROOT() {} ROOT.__hasSuper = false; -const a_slice = [].slice; +const a_slice = Array.prototype.slice; +const a_concat = Array.prototype.concat; +const isArray = Array.isArray; function isMethod(obj) { return 'function' === typeof obj && @@ -72,14 +74,11 @@ function mixinProperties(mixinsMeta, mixin) { } function concatenatedMixinProperties(concatProp, props, values, base) { - let concats; - // reset before adding each new mixin to pickup concats from previous - concats = values[concatProp] || base[concatProp]; + let concats = values[concatProp] || base[concatProp]; if (props[concatProp]) { - concats = concats ? concats.concat(props[concatProp]) : props[concatProp]; + concats = concats ? a_concat.call(concats, props[concatProp]) : props[concatProp]; } - return concats; } @@ -146,18 +145,18 @@ function applyConcatenatedProperties(obj, key, value, values) { let baseValue = values[key] || obj[key]; let ret; - if (baseValue) { - if ('function' === typeof baseValue.concat) { + if (baseValue === null || baseValue === undefined) { + ret = makeArray(value); + } else { + if (isArray(baseValue)) { if (value === null || value === undefined) { ret = baseValue; } else { - ret = baseValue.concat(value); + ret = a_concat.call(baseValue, value); } } else { - ret = makeArray(baseValue).concat(value); + ret = a_concat.call(makeArray(baseValue), value); } - } else { - ret = makeArray(value); } runInDebug(() => { @@ -176,7 +175,7 @@ function applyMergedProperties(obj, key, value, values) { let baseValue = values[key] || obj[key]; runInDebug(function() { - if (Array.isArray(value)) { // use conditional to avoid stringifying every time + if (isArray(value)) { // use conditional to avoid stringifying every time assert(`You passed in \`${JSON.stringify(value)}\` as the value for \`${key}\` but \`${key}\` cannot be an Array`, false); } });
true
Other
emberjs
ember.js
9616516c95bf2c5a4c32b5269555b397897c4d6e.json
Fix deopt for the field load of `.concat` This passed all meaningful tests, but there is one test that is asserting something I'm shocked about, that I'm going to submit this for review anyway. If this were true we'd do things like call concat on a string with an array. Which makes little sense to me. I believe this test isn't testing a real thing.
packages/ember-metal/tests/mixin/concatenated_properties_test.js
@@ -106,5 +106,5 @@ QUnit.test('adding a concatenable property that already has a defined value shou }); let obj = mixin({}, mixinA, mixinB); - equal(get(obj, 'foobar'), 'foobar'); + deepEqual(get(obj, 'foobar'), ['foo', 'bar']); });
true
Other
emberjs
ember.js
9616516c95bf2c5a4c32b5269555b397897c4d6e.json
Fix deopt for the field load of `.concat` This passed all meaningful tests, but there is one test that is asserting something I'm shocked about, that I'm going to submit this for review anyway. If this were true we'd do things like call concat on a string with an array. Which makes little sense to me. I believe this test isn't testing a real thing.
packages/ember-utils/lib/make-array.js
@@ -1,3 +1,5 @@ +const isArray = Array.isArray; + /** Forces the passed object to be part of an array. If the object is already an array, it will return the object. Otherwise, it will add the object to @@ -23,5 +25,5 @@ */ export default function makeArray(obj) { if (obj === null || obj === undefined) { return []; } - return Array.isArray(obj) ? obj : [obj]; + return isArray(obj) ? obj : [obj]; }
true
Other
emberjs
ember.js
316667fb9b77f02a712d58361c6d02b91af09a5d.json
Remove shims for now
index.js
@@ -15,7 +15,6 @@ function add(paths, name, path) { add(paths, 'prod', 'vendor/ember/ember.prod.js'); add(paths, 'debug', 'vendor/ember/ember.debug.js'); -add(paths, 'shims', 'vendor/ember/shims.js'); add(paths, 'jquery', 'vendor/ember/jquery/jquery.js'); add(absolutePaths, 'templateCompiler', __dirname + '/dist/ember-template-compiler.js'); @@ -60,14 +59,8 @@ module.exports = { ] }); - var shims = stew.find(__dirname + '/vendor/ember', { - destDir: 'ember', - files: [ 'shims.js' ] - }); - return stew.find([ ember, - shims, jquery ]); }
false
Other
emberjs
ember.js
536b75079328620dcc6e1adf55f6532d9daf2df3.json
Fix whitespaces [ci-skip]
packages/ember-glimmer/lib/component.js
@@ -122,7 +122,7 @@ export const BOUNDS = symbol('BOUNDS'); tagName: 'em' }); ``` - + Would result in instances with the following HTML: ```html @@ -659,7 +659,7 @@ const Component = CoreView.extend( ```javascript let MyComponent = Ember.Component.extend; - + MyComponent.reopenClass({ positionalParams: ['name', 'age'] }); @@ -682,7 +682,7 @@ const Component = CoreView.extend( ```javascript let MyComponent = Ember.Component.extend; - + MyComponent.reopenClass({ positionalParams: 'names' });
false
Other
emberjs
ember.js
5173e8256aaa0fad4b5d8bd8a562f432ecfa6b3f.json
Add RubyGems publishing
bin/publish_npm_and_bower
@@ -77,6 +77,18 @@ if [[ "$TRAVIS_TAG" =~ ^v[0-9.]+$ ]]; then fi fi +#### RUBYGEMS PUBLISHING + +if [[ "$TRAVIS_TAG" =~ ^v[0-9.]+$ ]]; then + echo -e "Publishing to RubyGems...\n" + + mkdir -p ~/.gem + echo $RUBYGEMS_AUTH_TOKEN > ~/.gem/credentials + + gem build ember-source.gemspec + gem push ember-source-${TRAVIS_TAG:1}.gem +fi + #### BOWER PUBLISHING # Sending output to /dev/null to prevent GH_TOKEN leak on error.
false
Other
emberjs
ember.js
5e43ab7e03d2f2ffbbffe6c3fed8f44afa4056d4.json
Add publishing to npm upon tagging. Also ensure that ember-docs.json is published.
.travis.yml
@@ -54,12 +54,12 @@ env: I/BFT0MbnR6JVCZiPV7TCWPgY1gvgZ6TEEIKGqauDMUBdL8ZK6I=' - secure: e0yxVfwVW61d3Mi/QBOsY6Rfd1mZd3VXUd9xNRoz/fkvQJRuVwDe7oG3NOuJ4LZzvMw7BJ+zpDV9D8nKhAyPEEOgpkkMHUB7Ds83pHG4qSMzm4EAwBCadDLXCQirldz8dzN5FAqgGucXoj5fj/p2SKOkO6qWIZveGr8pdBJEG1E= matrix: - - TEST_SUITE=each-package-tests + - TEST_SUITE=each-package-tests PUBLISH=true - TEST_SUITE=built-tests EMBER_ENV=production DISABLE_JSCS=true DISABLE_JSHINT=true - TEST_SUITE=old-jquery-and-extend-prototypes DISABLE_JSCS=true DISABLE_JSHINT=true - TEST_SUITE=node DISABLE_JSCS=true DISABLE_JSHINT=true - TEST_SUITE=blueprints - TEST_SUITE=travis-browsers DISABLE_JSCS=true DISABLE_JSHINT=true - TEST_SUITE=sauce - - TEST_SUITE=allow-backtracking-rerender ALLOW_BACKTRACKING=true DISABLE_PUBLISHING=true - - TEST_SUITE=each-package-tests BUILD_TYPE=alpha + - TEST_SUITE=allow-backtracking-rerender ALLOW_BACKTRACKING=true + - TEST_SUITE=each-package-tests BUILD_TYPE=alpha PUBLISH=true
true
Other
emberjs
ember.js
5e43ab7e03d2f2ffbbffe6c3fed8f44afa4056d4.json
Add publishing to npm upon tagging. Also ensure that ember-docs.json is published.
bin/publish_builds
@@ -3,13 +3,13 @@ echo -e "CURRENT_BRANCH: ${TRAVIS_BRANCH}\n" echo -e "PULL_REQUEST: ${TRAVIS_PULL_REQUEST}\n" -if [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$DISABLE_PUBLISHING" != "true" ]; then +if [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$PUBLISH" == "true" ]; then if [ "$EMBER_ENV" != "production" ]; then DISABLE_JSCS=true DISABLE_JSHINT=true ember build --environment=production fi yarn run docs # Generate documentation to be published. ./bin/publish_to_s3.js - ./bin/bower_ember_build + ./bin/publish_npm_and_bower fi
true
Other
emberjs
ember.js
5e43ab7e03d2f2ffbbffe6c3fed8f44afa4056d4.json
Add publishing to npm upon tagging. Also ensure that ember-docs.json is published.
bin/publish_npm_and_bower
@@ -52,7 +52,7 @@ case $TRAVIS_BRANCH in esac else echo "Not a bower release branch or tag. Exiting!" - exit 0 ;; + exit 0 fi esac echo -e "CHANNEL: ${CHANNEL}\n" @@ -63,10 +63,23 @@ if [[ -n $BUILD_TYPE ]]; then echo -e "CHANNEL OVERRIDE: ${CHANNEL}\n" fi +#### NPM PUBLISHING +if [[ "$TRAVIS_TAG" != "" ]]; then + echo $NPM_AUTH_TOKEN > ~/.npmrc + if [[ "$CHANNEL" == "release" ]]; then + echo "npm publish" + else + echo "npm publish --tag $CHANNEL" + fi +fi + +#### BOWER PUBLISHING + # Sending output to /dev/null to prevent GH_TOKEN leak on error. git clone --branch ${CHANNEL} https://${USER}:${GH_TOKEN}@github.com/${COMPONENTS_EMBER_REPO_SLUG}.git bower_ember &> /dev/null rm -rf bower_ember/* -cp -r ${INCLUDED_FILES} bower_ember/ +cp ${INCLUDED_FILES} bower_ember/ +cp docs/data.json bower_ember/ember-docs.json cd bower_ember git remote rm origin @@ -75,8 +88,8 @@ git remote add origin https://${USER}:${GH_TOKEN}@github.com/${COMPONENTS_EMBER_ git add -A git commit -m "Ember Bower Auto build for https://github.com/emberjs/ember.js/commit/${TRAVIS_COMMIT}." - if [[ "$TRAVIS_TAG" != "" ]]; then + echo -e "Creating tag $TRAVIS_TAG" git tag $TRAVIS_TAG PUSH_TARGET=$TRAVIS_TAG fi
true
Other
emberjs
ember.js
1b3e916e519f176878f6d79b29f19e5c4f6695e7.json
tests: Replace "nojshint" parameter with "nolint"
bin/run-tests.js
@@ -110,7 +110,7 @@ function generateBuiltTests() { // ember-testing/ember-debug are stripped from prod/min. var common = 'skipPackage=container,ember-testing,ember-debug'; testFunctions.push(function() { - return run(common + '&nojshint=true'); + return run(common + '&nolint=true'); }); testFunctions.push(function() { return run(common + '&dist=min&prod=true'); @@ -125,22 +125,22 @@ function generateBuiltTests() { function generateOldJQueryTests() { testFunctions.push(function() { - return run('jquery=1.8.3&nojshint=true'); + return run('jquery=1.8.3&nolint=true'); }); testFunctions.push(function() { - return run('jquery=1.10.2&nojshint=true'); + return run('jquery=1.10.2&nolint=true'); }); testFunctions.push(function() { - return run('jquery=2.2.4&nojshint=true'); + return run('jquery=2.2.4&nolint=true'); }); } function generateExtendPrototypeTests() { testFunctions.push(function() { - return run('extendprototypes=true&nojshint=true'); + return run('extendprototypes=true&nolint=true'); }); testFunctions.push(function() { - return run('extendprototypes=true&nojshint=true&enableoptionalfeatures=true'); + return run('extendprototypes=true&nolint=true&enableoptionalfeatures=true'); }); }
true
Other
emberjs
ember.js
1b3e916e519f176878f6d79b29f19e5c4f6695e7.json
tests: Replace "nojshint" parameter with "nolint"
tests/index.html
@@ -159,7 +159,7 @@ // Enable/disable livereload QUnit.config.urlConfig.push({ id: 'livereload', label: 'Live Reload'}); // Handle JSHint - QUnit.config.urlConfig.push('nojshint'); + QUnit.config.urlConfig.push({ id: 'nolint', label: 'Skip ESLint'}); QUnit.config.urlConfig.push('forceskip'); if (QUnit.config.seed) { @@ -186,9 +186,9 @@ for (var moduleName in Ember.__loader.registry) { if (!moduleName.match(packageRegexp)) { continue; } if (moduleName.match(skipPackageRegexp)) { continue; } + if (QUnit.urlParams.nolint && moduleName.match(/lint-test$/)) { continue; } if (moduleName.match(/[_-]test$/)) { Ember.__loader.require(moduleName); } - if (!QUnit.urlParams.nojshint && moduleName.match(/[-_.]jshint$/)) { Ember.__loader.require(moduleName); } } </script>
true
Other
emberjs
ember.js
ef2e3fdd3ec46506d29c70fecf00d508351a873d.json
ember-metal/mixin: Remove duplicate "required" export
packages/ember-metal/lib/mixin.js
@@ -855,6 +855,5 @@ export function _beforeObserver(...args) { export { Mixin, - required, REQUIRED };
false
Other
emberjs
ember.js
300281fde6d0444cb73f74ea22b549eea534fe4d.json
ember-glimmer/components/text_field: Fill empty catch block with comment
packages/ember-glimmer/lib/components/text_field.js
@@ -30,7 +30,9 @@ function canSetTypeOfInput(type) { try { inputTypeTestElement.type = type; - } catch (e) { } + } catch (e) { + // ignored + } return inputTypes[type] = inputTypeTestElement.type === type; }
false
Other
emberjs
ember.js
30cf11aba1f8cbc0827ec42b600e14fb1b5b49b9.json
Add unit tests for `ember-glimmer/utils/iterable`
packages/ember-glimmer/tests/unit/utils/iterable-test.js
@@ -0,0 +1,188 @@ +import Ember from 'ember'; +import { moduleFor, TestCase } from 'ember-glimmer/tests/utils/test-case'; +import iterableFor from 'ember-glimmer/utils/iterable'; +import { UpdatableReference } from 'ember-glimmer/utils/references'; +import eachIn from 'ember-glimmer/helpers/each-in'; +import { EvaluatedPositionalArgs } from 'glimmer-runtime'; + +const ITERATOR_KEY_GUID = 'be277757-bbbe-4620-9fcb-213ef433cca2'; + +moduleFor('Iterable', class extends TestCase { + ['@test iterates over an array']() { + let iterator = iteratorForArray(['foo', 'bar']); + + this.assert.deepEqual(iterator.next(), { key: 'foo', memo: 0, value: 'foo' }); + this.assert.deepEqual(iterator.next(), { key: 'bar', memo: 1, value: 'bar' }); + } + + ['@test iterates over an `Ember.A`']() { + let iterator = iteratorForArray(Ember.A(['foo', 'bar'])); + + this.assert.deepEqual(iterator.next(), { key: 'foo', memo: 0, value: 'foo' }); + this.assert.deepEqual(iterator.next(), { key: 'bar', memo: 1, value: 'bar' }); + } + + ['@test returns `null` when out of items']() { + let iterator = iteratorForArray(['foo']); + + this.assert.deepEqual(iterator.next(), { key: 'foo', memo: 0, value: 'foo' }); + this.assert.deepEqual(iterator.next(), null); + } + + ['@test iterates over an array with indices as keys']() { + let iterator = iteratorForArray(['foo', 'bar'], '@index'); + + this.assert.deepEqual(iterator.next(), { key: '0', memo: 0, value: 'foo' }); + this.assert.deepEqual(iterator.next(), { key: '1', memo: 1, value: 'bar' }); + } + + ['@test iterates over an array with identities as keys']() { + let iterator = iteratorForArray(['foo', 'bar'], '@identity'); + + this.assert.deepEqual(iterator.next(), { key: 'foo', memo: 0, value: 'foo' }); + this.assert.deepEqual(iterator.next(), { key: 'bar', memo: 1, value: 'bar' }); + } + + ['@test iterates over an array with arbitrary properties as keys']() { + let iterator = iteratorForArray([{ k: 'first', v: 'foo' }, { k: 'second', v: 'bar' }], 'k'); + + this.assert.deepEqual(iterator.next(), { key: 'first', memo: 0, value: { k: 'first', v: 'foo' } }); + this.assert.deepEqual(iterator.next(), { key: 'second', memo: 1, value: { k: 'second', v: 'bar' } }); + } + + ['@test errors on `#next` with an undefined ref']() { + let iterator = iteratorForArray(undefined); + + this.assert.expect(1); + + try { + iterator.next(); + } catch({ message }) { + this.assert.equal(message, 'Cannot call next() on an empty iterator'); + } + } + + ['@test errors on `#next` with a null ref']() { + let iterator = iteratorForArray(null); + + this.assert.expect(1); + + try { + iterator.next(); + } catch({ message }) { + this.assert.equal(message, 'Cannot call next() on an empty iterator'); + } + } + + ['@test errors on `#next` with an invalid ref type']() { + let iterator = iteratorForArray('string'); + + this.assert.expect(1); + + try { + iterator.next(); + } catch({ message }) { + this.assert.equal(message, 'Cannot call next() on an empty iterator'); + } + } + + ['@test errors on `#next` with an empty array']() { + let iterator = iteratorForArray([]); + + this.assert.expect(1); + + try { + iterator.next(); + } catch({ message }) { + this.assert.equal(message, 'Cannot call next() on an empty iterator'); + } + } + + ['@test iterates over an object\'s own properties']() { + let iterator = iteratorForObject({ first: 'foo', second: 'bar' }); + + this.assert.deepEqual(iterator.next(), { key: 'first', memo: 'first', value: 'foo' }); + this.assert.deepEqual(iterator.next(), { key: 'second', memo: 'second', value: 'bar' }); + } + + ['@test iterates over an object\'s own properties with indices as keys']() { + let iterator = iteratorForObject({ first: 'foo', second: 'bar' }, '@index'); + + this.assert.deepEqual(iterator.next(), { key: 'first', memo: 'first', value: 'foo' }); + this.assert.deepEqual(iterator.next(), { key: 'second', memo: 'second', value: 'bar' }); + } + + ['@test iterates over an object\'s own properties with identities as keys']() { + let iterator = iteratorForObject({ first: 'foo', second: 'bar' }, '@identity'); + + this.assert.deepEqual(iterator.next(), { key: 'foo', memo: 'first', value: 'foo' }); + this.assert.deepEqual(iterator.next(), { key: 'bar', memo: 'second', value: 'bar' }); + } + + ['@test iterates over an object\'s own properties with arbitrary properties as keys']() { + let iterator = iteratorForObject({ first: { k: 'uno', v: 'foo' }, second: { k: 'dos', v: 'bar' } }, 'k'); + + this.assert.deepEqual(iterator.next(), { key: 'uno', memo: 'first', value: { k: 'uno', v: 'foo' } }); + this.assert.deepEqual(iterator.next(), { key: 'dos', memo: 'second', value: { k: 'dos', v: 'bar' } }); + } + + ['@test each-in errors on `#next` with an undefined ref']() { + let iterator = iteratorForObject(undefined); + + this.assert.expect(1); + + try { + iterator.next(); + } catch({ message }) { + this.assert.equal(message, 'Cannot call next() on an empty iterator'); + } + } + + ['@test each-in errors on `#next` with a null ref']() { + let iterator = iteratorForObject(null); + + this.assert.expect(1); + + try { + iterator.next(); + } catch({ message }) { + this.assert.equal(message, 'Cannot call next() on an empty iterator'); + } + } + + ['@test each-in errors on `#next` with an invalid ref type']() { + let iterator = iteratorForObject('string'); + + this.assert.expect(1); + + try { + iterator.next(); + } catch({ message }) { + this.assert.equal(message, 'Cannot call next() on an empty iterator'); + } + } + + ['@test ensures keys are unique']() { + let iterator = iteratorForArray([{ k: 'qux', v: 'foo' }, { k: 'qux', v: 'bar' }, { k: 'qux', v: 'baz' }], 'k'); + + this.assert.deepEqual(iterator.next(), { key: 'qux', memo: 0, value: { k: 'qux', v: 'foo' } }); + this.assert.deepEqual(iterator.next(), { key: `qux${ITERATOR_KEY_GUID}1`, memo: 1, value: { k: 'qux', v: 'bar' } }); + this.assert.deepEqual(iterator.next(), { key: `qux${ITERATOR_KEY_GUID}2`, memo: 2, value: { k: 'qux', v: 'baz' } }); + } +}); + +function iteratorForArray(arr, keyPath) { + let ref = new UpdatableReference(arr); + let iterable = iterableFor(ref, keyPath); + + return iterable.iterate(); +} + +function iteratorForObject(obj, keyPath) { + let vm = null; + let positionalArgs = EvaluatedPositionalArgs.create([new UpdatableReference(obj)]); + let ref = eachIn(vm, { positional: positionalArgs }); + let iterable = iterableFor(ref, keyPath); + + return iterable.iterate(); +}
false
Other
emberjs
ember.js
b6ce7378625340b453d8c87550384d87a25deb73.json
Use testem v1.14.2 Changelog: https://github.com/testem/testem/releases/tag/v1.14.0 https://github.com/testem/testem/releases/tag/v1.14.1 https://github.com/testem/testem/releases/tag/v1.14.2
package.json
@@ -52,7 +52,7 @@ "broccoli-uglify-sourcemap": "^1.4.2", "chalk": "^1.1.1", "dag-map": "^2.0.1", - "ember-cli": "^2.6.1", + "ember-cli": "2.10.0", "ember-cli-blueprint-test-helpers": "^0.12.0", "ember-cli-dependency-checker": "^1.2.0", "ember-cli-sauce": "^1.8.0", @@ -75,7 +75,7 @@ "router_js": "^1.2.4", "serve-static": "^1.10.0", "simple-dom": "^0.3.0", - "testem": "^1.8.1" + "testem": "^1.14.2" }, "ember-addon": { "after": "ember-cli-legacy-blueprints"
true
Other
emberjs
ember.js
b6ce7378625340b453d8c87550384d87a25deb73.json
Use testem v1.14.2 Changelog: https://github.com/testem/testem/releases/tag/v1.14.0 https://github.com/testem/testem/releases/tag/v1.14.1 https://github.com/testem/testem/releases/tag/v1.14.2
yarn.lock
@@ -68,6 +68,10 @@ ansi-escapes@^1.1.0: version "1.4.0" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e" +ansi-regex@*, ansi-regex@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.0.0.tgz#c5061b6e0ef8a81775e50f5d66151bf6bf371107" + ansi-regex@^0.2.0, ansi-regex@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-0.2.1.tgz#0d8e946967a3d8143f93e24e298525fc1b2235f9" @@ -76,10 +80,6 @@ ansi-regex@^1.0.0, ansi-regex@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-1.1.1.tgz#41c847194646375e6a1a5d10c3ca054ef9fc980d" -ansi-regex@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.0.0.tgz#c5061b6e0ef8a81775e50f5d66151bf6bf371107" - ansi-styles@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.1.0.tgz#eaecbf66cd706882760b2f4691582b8f55d7a7de" @@ -104,6 +104,13 @@ ansistyles@~0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/ansistyles/-/ansistyles-0.1.3.tgz#5de60415bda071bb37127854c864f41b23254539" +anymatch@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.0.tgz#a3e52fa39168c825ff57b0248126ce5a8ff95507" + dependencies: + arrify "^1.0.0" + micromatch "^2.1.5" + aproba@^1.0.3, aproba@~1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.0.4.tgz#2713680775e7614c8ba186c065d4e2e52d1072c0" @@ -196,6 +203,10 @@ [email protected]: version "0.0.6" resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz#f33b2159f0532a3f3107a272c0ccfbd1ad2979ca" +arrify@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" + asap@^2.0.0, asap@~2.0.4: version "2.0.5" resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.5.tgz#522765b50c3510490e52d7dcfe085ef9ba96958f" @@ -468,10 +479,6 @@ bcrypt-pbkdf@^1.0.0: dependencies: tweetnacl "^0.14.3" [email protected]: - version "1.0.0" - resolved "https://registry.yarnpkg.com/benchmark/-/benchmark-1.0.0.tgz#2f1e2fa4c359f11122aa183082218e957e390c73" - better-assert@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/better-assert/-/better-assert-1.0.2.tgz#40866b9e1b9e0b55b481894311e68faffaebc522" @@ -507,8 +514,8 @@ bluebird@^2.9.33: resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1" bluebird@^3.1.1, bluebird@^3.4.6: - version "3.4.6" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.4.6.tgz#01da8d821d87813d158967e743d5fe6c62cf8c0f" + version "3.4.7" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.4.7.tgz#f72d760be09b7f76d08ed8fae98b289a8d05fab3" body@^5.1.0: version "5.1.0" @@ -587,8 +594,8 @@ broccoli-brocfile-loader@^0.18.0: findup-sync "^0.4.2" broccoli-builder@^0.18.0: - version "0.18.2" - resolved "https://registry.yarnpkg.com/broccoli-builder/-/broccoli-builder-0.18.2.tgz#2093ca0b1ac793e30d0810913399da98fb2d0667" + version "0.18.3" + resolved "https://registry.yarnpkg.com/broccoli-builder/-/broccoli-builder-0.18.3.tgz#9d2c90558e7f4d1118ae6e938c63b35da00dd38f" dependencies: heimdalljs "^0.2.0" promise-map-series "^0.2.1" @@ -597,20 +604,7 @@ broccoli-builder@^0.18.0: rsvp "^3.0.17" silent-error "^1.0.1" -broccoli-caching-writer@^2.0.4, broccoli-caching-writer@~2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/broccoli-caching-writer/-/broccoli-caching-writer-2.0.4.tgz#d995d7d1977292e498f78df05887230fcb4a5e2c" - dependencies: - broccoli-kitchen-sink-helpers "^0.2.5" - broccoli-plugin "1.1.0" - debug "^2.1.1" - lodash-node "^3.2.0" - rimraf "^2.2.8" - rsvp "^3.0.17" - symlink-or-copy "^1.0.0" - walk-sync "^0.2.0" - -broccoli-caching-writer@^2.3.1: +broccoli-caching-writer@^2.0.4, broccoli-caching-writer@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/broccoli-caching-writer/-/broccoli-caching-writer-2.3.1.tgz#b93cf58f9264f003075868db05774f4e7f25bd07" dependencies: @@ -632,6 +626,19 @@ broccoli-caching-writer@^3.0.0: rsvp "^3.0.17" walk-sync "^0.3.0" +broccoli-caching-writer@~2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/broccoli-caching-writer/-/broccoli-caching-writer-2.0.4.tgz#d995d7d1977292e498f78df05887230fcb4a5e2c" + dependencies: + broccoli-kitchen-sink-helpers "^0.2.5" + broccoli-plugin "1.1.0" + debug "^2.1.1" + lodash-node "^3.2.0" + rimraf "^2.2.8" + rsvp "^3.0.17" + symlink-or-copy "^1.0.0" + walk-sync "^0.2.0" + broccoli-clean-css@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/broccoli-clean-css/-/broccoli-clean-css-1.1.0.tgz#9db143d9af7e0ae79c26e3ac5a9bb2d720ea19fa" @@ -906,8 +913,8 @@ broccoli-uglify-js@~0.1.3: uglify-js "~2.4.11" broccoli-uglify-sourcemap@^1.0.1, broccoli-uglify-sourcemap@^1.4.2: - version "1.4.2" - resolved "https://registry.yarnpkg.com/broccoli-uglify-sourcemap/-/broccoli-uglify-sourcemap-1.4.2.tgz#1e280afbdfaa700b2f42155f6c4a036c37e61ca7" + version "1.5.1" + resolved "https://registry.yarnpkg.com/broccoli-uglify-sourcemap/-/broccoli-uglify-sourcemap-1.5.1.tgz#9fd2e87f1c177b11a758e73c3a11d6a03d90d086" dependencies: broccoli-plugin "^1.2.1" debug "^2.2.0" @@ -916,7 +923,7 @@ broccoli-uglify-sourcemap@^1.0.1, broccoli-uglify-sourcemap@^1.4.2: mkdirp "^0.5.0" source-map-url "^0.3.0" symlink-or-copy "^1.0.1" - uglify-js "^2.6.0" + uglify-js "^2.7.0" walk-sync "^0.1.3" broccoli-writer@^0.1.1, broccoli-writer@~0.1.1: @@ -988,8 +995,8 @@ can-symlink@^1.0.0: tmp "0.0.28" capture-exit@^1.0.4: - version "1.0.7" - resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-1.0.7.tgz#69b4023241347a9b3db9f13eb91d22765e9a86f8" + version "1.1.0" + resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-1.1.0.tgz#d931b32b11c2bd20ae57f34af0c1eb2c18781626" dependencies: rsvp "^3.3.3" @@ -1107,8 +1114,8 @@ clean-css-promise@^0.1.0: pinkie-promise "^2.0.0" clean-css@^3.4.5: - version "3.4.22" - resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-3.4.22.tgz#db323064f752028778233b58c54cd8535f860892" + version "3.4.23" + resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-3.4.23.tgz#604fbbca24c12feb59b02f00b84f1fb7ded6d001" dependencies: commander "2.8.x" source-map "0.4.x" @@ -1280,9 +1287,9 @@ [email protected]: version "1.1.2" resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.1.2.tgz#296594f2753daa63996d2af08d15a95116c9aec3" [email protected]: - version "1.2.0" - resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.0.tgz#ccd113a86388d06482d03de3fc7df98526ba8efe" [email protected]: + version "1.2.1" + resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6" [email protected]: version "0.0.3" @@ -1319,12 +1326,12 @@ [email protected]: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" concat-stream@^1.4.7, concat-stream@^1.5.2: - version "1.5.2" - resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.2.tgz#708978624d856af41a5a741defdd261da752c266" + version "1.6.0" + resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7" dependencies: - inherits "~2.0.1" - readable-stream "~2.0.0" - typedarray "~0.0.5" + inherits "^2.0.3" + readable-stream "^2.2.2" + typedarray "^0.0.6" config-chain@~1.1.10: version "1.1.11" @@ -1426,16 +1433,17 @@ core-util-is@~1.0.0: crc32-stream@^1.0.0: version "1.0.0" - resolved "http://registry.npmjs.org/crc32-stream/-/crc32-stream-1.0.0.tgz#ea155e5e1d738ed3778438ffe92ffe2a141aeb3f" + resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-1.0.0.tgz#ea155e5e1d738ed3778438ffe92ffe2a141aeb3f" dependencies: buffer-crc32 "^0.2.1" readable-stream "^2.0.0" -cross-spawn@^4.0.0: - version "4.0.2" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-4.0.2.tgz#7b9247621c23adfdd3856004a823cbe397424d41" +cross-spawn@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.0.1.tgz#a3bbb302db2297cbea3c04edf36941f4613aa399" dependencies: lru-cache "^4.0.1" + shebang-command "^1.2.0" which "^1.2.9" [email protected]: @@ -1478,13 +1486,9 @@ date-now@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b" [email protected]: - version "0.7.4" - resolved "https://registry.yarnpkg.com/debug/-/debug-0.7.4.tgz#06e1ea8082c2cb14e39806e22e2f6f757f92af39" - debug@2, debug@^2.1.0, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0: - version "2.4.4" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.4.4.tgz#c04d17a654e9202464803f096153f70a6f31f4be" + version "2.5.2" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.5.2.tgz#50c295a53dbf1657146e0c1b21307275e90d49cb" dependencies: ms "0.7.2" @@ -1494,7 +1498,13 @@ [email protected], debug@~2.2.0: dependencies: ms "0.7.1" -debuglog@^1.0.1: [email protected]: + version "2.3.3" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.3.3.tgz#40c453e67e6e13c901ddec317af8986cda9eff8c" + dependencies: + ms "0.7.2" + +debuglog@*, debuglog@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" @@ -1585,10 +1595,6 @@ dezalgo@^1.0.0, dezalgo@^1.0.1, dezalgo@~1.0.3: asap "^2.0.0" wrappy "1" [email protected]: - version "0.0.6" - resolved "https://registry.yarnpkg.com/did_it_work/-/did_it_work-0.0.6.tgz#5180cb9e16ebf9a8753a0cc6b4af9ccdff71ec05" - [email protected]: version "1.0.8" resolved "https://registry.yarnpkg.com/diff/-/diff-1.0.8.tgz#343276308ec991b7bc82267ed55bc1411f971666" @@ -1817,7 +1823,7 @@ ember-cli-version-checker@^1.0.2, ember-cli-version-checker@^1.1.6, ember-cli-ve rsvp "3.0.14" yuidocjs "^0.10.0" -ember-cli@^2.6.1: [email protected]: version "2.10.0" resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-2.10.0.tgz#3aefd56a207f60be1ba120aeacd41e7e7a9383d8" dependencies: @@ -2011,26 +2017,26 @@ end-of-stream@^1.0.0: dependencies: once "~1.3.0" [email protected]: - version "1.7.0" - resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-1.7.0.tgz#0bb81d3563ab7afb668f1e1b400c9403b03006ee" [email protected]: + version "1.8.0" + resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-1.8.0.tgz#7b730e4127414087596d9be3c88d2bc5fdb6cf5c" dependencies: - component-emitter "1.1.2" + component-emitter "1.2.1" component-inherit "0.0.3" - debug "2.2.0" - engine.io-parser "1.3.0" + debug "2.3.3" + engine.io-parser "1.3.1" has-cors "1.1.0" indexof "0.0.1" - parsejson "0.0.1" - parseqs "0.0.2" - parseuri "0.0.4" + parsejson "0.0.3" + parseqs "0.0.5" + parseuri "0.0.5" ws "1.1.1" - xmlhttprequest-ssl "1.5.1" + xmlhttprequest-ssl "1.5.3" yeast "0.1.2" [email protected]: - version "1.3.0" - resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-1.3.0.tgz#61a35c7f3a3ccd1b179e4f52257a7a8cfacaeb21" [email protected]: + version "1.3.1" + resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-1.3.1.tgz#9554f1ae33107d6fbd170ca5466d2f833f6a07cf" dependencies: after "0.8.1" arraybuffer.slice "0.0.6" @@ -2039,14 +2045,15 @@ [email protected]: has-binary "0.1.6" wtf-8 "1.0.0" [email protected]: - version "1.7.0" - resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-1.7.0.tgz#a417857af4995d9bbdf8a0e03a87e473ebe64fbe" [email protected]: + version "1.8.0" + resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-1.8.0.tgz#3eeb5f264cb75dbbec1baaea26d61f5a4eace2aa" dependencies: accepts "1.3.3" base64id "0.1.0" - debug "2.2.0" - engine.io-parser "1.3.0" + cookie "0.3.1" + debug "2.3.3" + engine.io-parser "1.3.1" ws "1.1.1" ensure-posix-path@^1.0.0, ensure-posix-path@^1.0.1: @@ -2176,8 +2183,8 @@ esprima@~3.0.0: resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.0.0.tgz#53cf247acda77313e551c3aa2e73342d3fb4f7d9" esprima@~3.1.0: - version "3.1.2" - resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.2.tgz#954b5d19321ca436092fa90f06d6798531fe8184" + version "3.1.3" + resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633" esrecurse@^4.1.0: version "4.1.0" @@ -2349,7 +2356,7 @@ faye-websocket@~0.10.0: fb-watchman@^1.8.0: version "1.9.0" - resolved "http://registry.npmjs.org/fb-watchman/-/fb-watchman-1.9.0.tgz#6f268f1f347a6b3c875d1e89da7e1ed79adfc0ec" + resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-1.9.0.tgz#6f268f1f347a6b3c875d1e89da7e1ed79adfc0ec" dependencies: bser "^1.0.2" @@ -2491,6 +2498,14 @@ form-data@~2.0.0: combined-stream "^1.0.5" mime-types "^2.1.11" +form-data@~2.1.1: + version "2.1.2" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.2.tgz#89c3534008b97eada4cbb157d58f6f5df025eae4" + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.5" + mime-types "^2.1.12" + forwarded@~0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.0.tgz#19ef9874c4ae1c297bcf078fde63a09b66a84363" @@ -2653,8 +2668,8 @@ getpass@^0.1.1: assert-plus "^1.0.0" git-repo-info@^1.0.4, git-repo-info@^1.1.4: - version "1.3.1" - resolved "https://registry.yarnpkg.com/git-repo-info/-/git-repo-info-1.3.1.tgz#0c1a19ef1964b822a7230f087396af80481ce8ec" + version "1.4.0" + resolved "https://registry.yarnpkg.com/git-repo-info/-/git-repo-info-1.4.0.tgz#ed210221defd3fdefce8b16ac61985cabe242e4a" [email protected]: version "0.2.0" @@ -2919,11 +2934,12 @@ has-unicode@^2.0.0, has-unicode@~2.0.1: resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" hash-for-dep@^1.0.2: - version "1.0.4" - resolved "https://registry.yarnpkg.com/hash-for-dep/-/hash-for-dep-1.0.4.tgz#8774e7b80c7c07be3bdc58b55278a4c6865d3737" + version "1.1.2" + resolved "https://registry.yarnpkg.com/hash-for-dep/-/hash-for-dep-1.1.2.tgz#e3347ed92960eb0bb53a2c6c2b70e36d75b7cd0c" dependencies: broccoli-kitchen-sink-helpers "^0.3.1" heimdalljs "^0.2.3" + heimdalljs-logger "^0.1.7" resolve "^1.1.6" [email protected]: @@ -3065,7 +3081,7 @@ iferr@^0.1.5, iferr@~0.1.5: version "0.1.5" resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501" -imurmurhash@^0.1.4: +imurmurhash@*, imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" @@ -3088,7 +3104,7 @@ inherit@^2.2.2: version "2.2.6" resolved "https://registry.yarnpkg.com/inherit/-/inherit-2.2.6.tgz#f1614b06c8544e8128e4229c86347db73ad9788d" -inherits@2, [email protected], inherits@^2.0.1, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3: +inherits@2, [email protected], inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" @@ -3445,10 +3461,6 @@ json-stringify-safe@~5.0.0, json-stringify-safe@~5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" [email protected]: - version "3.2.6" - resolved "https://registry.yarnpkg.com/json3/-/json3-3.2.6.tgz#f6efc93c06a04de9aec53053df2559bb19e2038b" - [email protected]: version "3.3.2" resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1" @@ -3475,8 +3487,8 @@ jsonlint@~1.6.2: nomnom ">= 1.5.x" jsonpointer@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.0.tgz#6661e161d2fc445f19f98430231343722e1fcbd5" + version "4.0.1" + resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9" jsprim@^1.2.2: version "1.3.1" @@ -3595,17 +3607,25 @@ lodash._basefor@^3.0.0: version "3.0.3" resolved "https://registry.yarnpkg.com/lodash._basefor/-/lodash._basefor-3.0.3.tgz#7550b4e9218ef09fad24343b612021c79b4c20c2" +lodash._baseindexof@*: + version "3.1.0" + resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c" + lodash._baseuniq@~4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8" dependencies: lodash._createset "~4.0.0" lodash._root "~3.0.0" -lodash._bindcallback@^3.0.0: +lodash._bindcallback@*, lodash._bindcallback@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e" +lodash._cacheindexof@*: + version "3.0.2" + resolved "https://registry.yarnpkg.com/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92" + lodash._createassigner@^3.0.0: version "3.1.1" resolved "https://registry.yarnpkg.com/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz#838a5bae2fdaca63ac22dee8e19fa4e6d6970b11" @@ -3614,11 +3634,17 @@ lodash._createassigner@^3.0.0: lodash._isiterateecall "^3.0.0" lodash.restparam "^3.0.0" +lodash._createcache@*: + version "3.1.2" + resolved "https://registry.yarnpkg.com/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093" + dependencies: + lodash._getnative "^3.0.0" + lodash._createset@~4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26" -lodash._getnative@^3.0.0: +lodash._getnative@*, lodash._getnative@^3.0.0: version "3.9.1" resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" @@ -3737,7 +3763,7 @@ lodash.omit@^4.1.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.omit/-/lodash.omit-4.5.0.tgz#6eb19ae5a1ee1dd9df0b969e66ce0b7fa30b5e60" -lodash.restparam@^3.0.0: +lodash.restparam@*, lodash.restparam@^3.0.0: version "3.6.1" resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805" @@ -3790,8 +3816,8 @@ lodash@^3.10.0, lodash@^3.10.1, lodash@^3.5.0, lodash@^3.7.0, lodash@^3.9.3, lod resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6" lodash@^4.0.0, lodash@^4.14.0, lodash@^4.16.6, lodash@^4.3.0, lodash@^4.5.0, lodash@^4.6.1, lodash@^4.8.0: - version "4.17.2" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.2.tgz#34a3055babe04ce42467b607d700072c7ff6bf42" + version "4.17.3" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.3.tgz#557ed7d2a9438cac5fd5a43043ca60cb455e01f7" lodash@~1.2.1: version "1.2.1" @@ -3912,7 +3938,7 @@ methods@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" -micromatch@^2.3.7: +micromatch@^2.1.5, micromatch@^2.3.7: version "2.3.11" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565" dependencies: @@ -3934,7 +3960,7 @@ micromatch@^2.3.7: version "1.25.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.25.0.tgz#c18dbd7c73a5dbf6f44a024dc0d165a1e7b1c392" -mime-types@^2.1.11, mime-types@~2.1.11, mime-types@~2.1.13, mime-types@~2.1.7: +mime-types@^2.1.11, mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.13, mime-types@~2.1.7: version "2.1.13" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.13.tgz#e07aaa9c6c6b9a7ca3012c69003ad25a39e92a88" dependencies: @@ -3993,20 +4019,20 @@ minimist@^1.1.0, minimist@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" [email protected], [email protected]: [email protected]: version "0.3.0" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.0.tgz#1bbf5ab1ba827af23575143490426455f481fe1e" [email protected], mkdirp@^0.3.5, mkdirp@~0.3.5: + version "0.3.5" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.5.tgz#de3e5f8961c88c787ee1368df849ac4413eca8d7" + [email protected], [email protected], [email protected], "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" dependencies: minimist "0.0.8" -mkdirp@^0.3.5, mkdirp@~0.3.5: - version "0.3.5" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.5.tgz#de3e5f8961c88c787ee1368df849ac4413eca8d7" - mkdirp@~0.4.0: version "0.4.2" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.4.2.tgz#427c8c18ece398b932f6f666f4e1e5b7740e78c8" @@ -4317,7 +4343,7 @@ oauth-sign@~0.8.1: version "0.8.2" resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43" -object-assign@^4.0.1, object-assign@^4.1.0: [email protected], object-assign@^4.0.1, object-assign@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0" @@ -4438,21 +4464,21 @@ [email protected]: version "1.1.3" resolved "https://registry.yarnpkg.com/parse5/-/parse5-1.1.3.tgz#8bab58d06525f00e4e37d755116eb82e7241f142" [email protected]: - version "0.0.1" - resolved "https://registry.yarnpkg.com/parsejson/-/parsejson-0.0.1.tgz#9b10c6c0d825ab589e685153826de0a3ba278bcc" [email protected]: + version "0.0.3" + resolved "https://registry.yarnpkg.com/parsejson/-/parsejson-0.0.3.tgz#ab7e3759f209ece99437973f7d0f1f64ae0e64ab" dependencies: better-assert "~1.0.0" [email protected]: - version "0.0.2" - resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.2.tgz#9dfe70b2cddac388bde4f35b1f240fa58adbe6c7" [email protected]: + version "0.0.5" + resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d" dependencies: better-assert "~1.0.0" [email protected]: - version "0.0.4" - resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.4.tgz#806582a39887e1ea18dd5e2fe0e01902268e9350" [email protected]: + version "0.0.5" + resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.5.tgz#80204a50d4dbb779bfdc6ebe2778d90e4bce320a" dependencies: better-assert "~1.0.0" @@ -4601,6 +4627,10 @@ qs@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/qs/-/qs-1.0.2.tgz#50a93e2b5af6691c31bcea5dae78ee6ea1903768" +qs@~6.3.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.0.tgz#f403b264f23bc01228c74131b407f18d5ea5d442" + [email protected], quick-temp@^0.1.0, quick-temp@^0.1.2, quick-temp@^0.1.3, quick-temp@^0.1.5: version "0.1.6" resolved "https://registry.yarnpkg.com/quick-temp/-/quick-temp-0.1.6.tgz#a6242a15cba9f9cdbd341287b5c569e318eec307" @@ -4701,9 +4731,9 @@ read@1, [email protected], read@~1.0.1, read@~1.0.7: dependencies: mute-stream "~0.0.4" -"readable-stream@1 || 2", readable-stream@^2, readable-stream@^2.0.0, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@~2.1.5: - version "2.1.5" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.1.5.tgz#66fa8b720e1438b364681f2ad1a63c618448c9d0" +"readable-stream@1 || 2", readable-stream@^2, readable-stream@^2.0.0, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.2.2: + version "2.2.2" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.2.tgz#a9e6fec3c7dda85f8bb1b3ba7028604556fc825e" dependencies: buffer-shims "^1.0.0" core-util-is "~1.0.0" @@ -4731,7 +4761,7 @@ readable-stream@~1.0.2: isarray "0.0.1" string_decoder "~0.10.x" -readable-stream@~2.0.0, readable-stream@~2.0.5: +readable-stream@~2.0.5: version "2.0.6" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e" dependencies: @@ -4742,7 +4772,19 @@ readable-stream@~2.0.0, readable-stream@~2.0.5: string_decoder "~0.10.x" util-deprecate "~1.0.1" -readdir-scoped-modules@^1.0.0: +readable-stream@~2.1.5: + version "2.1.5" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.1.5.tgz#66fa8b720e1438b364681f2ad1a63c618448c9d0" + dependencies: + buffer-shims "^1.0.0" + core-util-is "~1.0.0" + inherits "~2.0.1" + isarray "~1.0.0" + process-nextick-args "~1.0.6" + string_decoder "~0.10.x" + util-deprecate "~1.0.1" + +readdir-scoped-modules@*, readdir-scoped-modules@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz#9fafa37d286be5d92cbaebdee030dc9b5f406747" dependencies: @@ -4805,7 +4847,7 @@ [email protected]: regex-cache@^0.4.2: version "0.4.3" - resolved "http://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz#9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145" + resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.3.tgz#9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145" dependencies: is-equal-shallow "^0.1.3" is-primitive "^2.0.0" @@ -4844,31 +4886,30 @@ repeating@^1.1.0, repeating@^1.1.2: dependencies: is-finite "^1.0.0" -request@2, request@^2.51.0, request@^2.74.0, request@~2.74.0: - version "2.74.0" - resolved "https://registry.yarnpkg.com/request/-/request-2.74.0.tgz#7693ca768bbb0ea5c8ce08c084a45efa05b892ab" +request@2, request@^2.51.0, request@^2.74.0: + version "2.79.0" + resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de" dependencies: aws-sign2 "~0.6.0" aws4 "^1.2.1" - bl "~1.1.2" caseless "~0.11.0" combined-stream "~1.0.5" extend "~3.0.0" forever-agent "~0.6.1" - form-data "~1.0.0-rc4" + form-data "~2.1.1" har-validator "~2.0.6" hawk "~3.1.3" http-signature "~1.1.0" is-typedarray "~1.0.0" isstream "~0.1.2" json-stringify-safe "~5.0.1" mime-types "~2.1.7" - node-uuid "~1.4.7" oauth-sign "~0.8.1" - qs "~6.2.0" + qs "~6.3.0" stringstream "~0.0.4" tough-cookie "~2.3.0" tunnel-agent "~0.4.1" + uuid "^3.0.0" [email protected]: version "2.75.0" @@ -4915,6 +4956,32 @@ request@~2.40.0: tough-cookie ">=0.12.0" tunnel-agent "~0.4.0" +request@~2.74.0: + version "2.74.0" + resolved "https://registry.yarnpkg.com/request/-/request-2.74.0.tgz#7693ca768bbb0ea5c8ce08c084a45efa05b892ab" + dependencies: + aws-sign2 "~0.6.0" + aws4 "^1.2.1" + bl "~1.1.2" + caseless "~0.11.0" + combined-stream "~1.0.5" + extend "~3.0.0" + forever-agent "~0.6.1" + form-data "~1.0.0-rc4" + har-validator "~2.0.6" + hawk "~3.1.3" + http-signature "~1.1.0" + is-typedarray "~1.0.0" + isstream "~0.1.2" + json-stringify-safe "~5.0.1" + mime-types "~2.1.7" + node-uuid "~1.4.7" + oauth-sign "~0.8.1" + qs "~6.2.0" + stringstream "~0.0.4" + tough-cookie "~2.3.0" + tunnel-agent "~0.4.1" + [email protected]: version "1.0.0" resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" @@ -5016,9 +5083,10 @@ safe-json-parse@~1.0.1: resolved "https://registry.yarnpkg.com/safe-json-parse/-/safe-json-parse-1.0.1.tgz#3e76723e38dfdda13c9b1d29a1e07ffee4b30b57" sane@^1.1.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/sane/-/sane-1.4.1.tgz#88f763d74040f5f0c256b6163db399bf110ac715" + version "1.5.0" + resolved "https://registry.yarnpkg.com/sane/-/sane-1.5.0.tgz#a4adeae764d048621ecb27d5f9ecf513101939f3" dependencies: + anymatch "^1.3.0" exec-sh "^0.2.0" fb-watchman "^1.8.0" minimatch "^3.0.2" @@ -5037,8 +5105,8 @@ sauce-connect-launcher@^1.1.0: rimraf "^2.5.4" saucie@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/saucie/-/saucie-2.0.1.tgz#a664f01ab0168ec5d28d8f8c6386756251f86d75" + version "2.1.1" + resolved "https://registry.yarnpkg.com/saucie/-/saucie-2.1.1.tgz#dca983486dfd2840c2099c96a3c9315277c5c2a9" dependencies: bluebird "^3.1.1" extend "^3.0.0" @@ -5105,6 +5173,12 @@ sha@~2.0.1: graceful-fs "^4.1.2" readable-stream "^2.0.2" +shebang-command@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" + dependencies: + shebang-regex "^1.0.0" + shebang-regex@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" @@ -5167,59 +5241,49 @@ [email protected]: dependencies: hoek "2.x.x" [email protected]: - version "0.4.0" - resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-0.4.0.tgz#fb9f82ab1aa65290bf72c3657955b930a991a24f" [email protected]: + version "0.5.0" + resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz#cb6d4bb8bec81e1078b99677f9ced0046066bb8b" dependencies: - debug "2.2.0" - socket.io-parser "2.2.2" + debug "2.3.3" + socket.io-parser "2.3.1" [email protected]: - version "1.5.0" - resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-1.5.0.tgz#08232d0adb5a665a7c24bd9796557a33f58f38ae" [email protected]: + version "1.6.0" + resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-1.6.0.tgz#5b668f4f771304dfeed179064708386fa6717853" dependencies: backo2 "1.0.2" component-bind "1.0.0" - component-emitter "1.2.0" - debug "2.2.0" - engine.io-client "1.7.0" + component-emitter "1.2.1" + debug "2.3.3" + engine.io-client "1.8.0" has-binary "0.1.7" indexof "0.0.1" object-component "0.0.3" - parseuri "0.0.4" - socket.io-parser "2.2.6" + parseuri "0.0.5" + socket.io-parser "2.3.1" to-array "0.1.4" [email protected]: - version "2.2.2" - resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-2.2.2.tgz#3d7af6b64497e956b7d9fe775f999716027f9417" - dependencies: - benchmark "1.0.0" - component-emitter "1.1.2" - debug "0.7.4" - isarray "0.0.1" - json3 "3.2.6" - [email protected]: - version "2.2.6" - resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-2.2.6.tgz#38dfd61df50dcf8ab1d9e2091322bf902ba28b99" [email protected]: + version "2.3.1" + resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-2.3.1.tgz#dd532025103ce429697326befd64005fcfe5b4a0" dependencies: - benchmark "1.0.0" component-emitter "1.1.2" debug "2.2.0" isarray "0.0.1" json3 "3.3.2" [email protected]: - version "1.5.0" - resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-1.5.0.tgz#024dd9719d9267d6a6984eebe2ab5ceb9a0b8a98" [email protected]: + version "1.6.0" + resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-1.6.0.tgz#3e40d932637e6bd923981b25caf7c53e83b6e2e1" dependencies: - debug "2.2.0" - engine.io "1.7.0" + debug "2.3.3" + engine.io "1.8.0" has-binary "0.1.7" - socket.io-adapter "0.4.0" - socket.io-client "1.5.0" - socket.io-parser "2.2.6" + object-assign "4.1.0" + socket.io-adapter "0.5.0" + socket.io-client "1.6.0" + socket.io-parser "2.3.1" sort-object-keys@^1.1.1: version "1.1.2" @@ -5242,8 +5306,8 @@ source-map-support@^0.2.10: source-map "0.1.32" source-map-support@^0.4.0: - version "0.4.6" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.6.tgz#32552aa64b458392a85eab3b0b5ee61527167aeb" + version "0.4.8" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.8.tgz#4871918d8a3af07289182e974e32844327b2e98b" dependencies: source-map "^0.5.3" @@ -5433,12 +5497,11 @@ sync-exec@^0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/sync-exec/-/sync-exec-0.6.2.tgz#717d22cc53f0ce1def5594362f3a89a2ebb91105" -tap-parser@^1.1.3: - version "1.3.2" - resolved "https://registry.yarnpkg.com/tap-parser/-/tap-parser-1.3.2.tgz#120c5089c88c3c8a793ef288867de321e18f8c22" +tap-parser@^3.0.2: + version "3.0.4" + resolved "https://registry.yarnpkg.com/tap-parser/-/tap-parser-3.0.4.tgz#3d8fcce8aa3792276afd7d75a1b791981630b83f" dependencies: events-to-array "^1.0.1" - inherits "~2.0.1" js-yaml "^3.2.7" optionalDependencies: readable-stream "^2" @@ -5467,17 +5530,16 @@ [email protected]: os-tmpdir "^1.0.0" rimraf "~2.2.6" -testem@^1.8.1: - version "1.13.0" - resolved "https://registry.yarnpkg.com/testem/-/testem-1.13.0.tgz#441779b340afae4bd318d5c2be29b99d8964947f" +testem@^1.14.2, testem@^1.8.1: + version "1.14.2" + resolved "https://registry.yarnpkg.com/testem/-/testem-1.14.2.tgz#0c29f82e99cebf51c1a5808e57a922b9624075af" dependencies: backbone "^1.1.2" bluebird "^3.4.6" charm "^1.0.0" commander "^2.6.0" consolidate "^0.14.0" - cross-spawn "^4.0.0" - did_it_work "0.0.6" + cross-spawn "^5.0.0" express "^4.10.7" fireworm "^0.7.0" glob "^7.0.4" @@ -5492,10 +5554,10 @@ testem@^1.8.1: npmlog "^4.0.0" printf "^0.2.3" rimraf "^2.4.4" - socket.io "1.5.0" + socket.io "1.6.0" spawn-args "^0.2.0" styled_string "0.0.1" - tap-parser "^1.1.3" + tap-parser "^3.0.2" xmldom "^0.1.19" text-table@~0.2.0: @@ -5631,7 +5693,7 @@ type-is@~1.6.13: media-typer "0.3.0" mime-types "~2.1.13" -typedarray@~0.0.5: +typedarray@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" @@ -5647,7 +5709,7 @@ uc.micro@^1.0.0, uc.micro@^1.0.1, uc.micro@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.3.tgz#7ed50d5e0f9a9fb0a573379259f2a77458d50192" -uglify-js@^2.6, uglify-js@^2.6.0: +uglify-js@^2.6, uglify-js@^2.7.0: version "2.7.5" resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.7.5.tgz#4612c0c7baaee2ba7c487de4904ae122079f2ca8" dependencies: @@ -5761,7 +5823,11 @@ uuid@^2.0.1, uuid@^2.0.2: version "2.0.3" resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a" -validate-npm-package-license@^3.0.1: +uuid@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1" + +validate-npm-package-license@*, validate-npm-package-license@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc" dependencies: @@ -5915,14 +5981,10 @@ [email protected]: pkginfo "0.3.x" stack-trace "0.0.x" [email protected]: [email protected], [email protected], wordwrap@~0.0.2: version "0.0.2" resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f" [email protected], wordwrap@~0.0.2: - version "0.0.3" - resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107" - wrappy@1, wrappy@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" @@ -5975,9 +6037,9 @@ xmldom@^0.1.19: version "0.1.27" resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9" [email protected]: - version "1.5.1" - resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.1.tgz#3b7741fea4a86675976e908d296d4445961faa67" [email protected]: + version "1.5.3" + resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz#185a888c04eca46c3e4070d99f7b49de3528992d" xtend@^4.0.0, xtend@~4.0.0: version "4.0.1"
true
Other
emberjs
ember.js
c5268257b5ee6e8a2268cb961a995c2be239cedc.json
Add changelog for 2.10.2 [ci skip]
CHANGELOG.md
@@ -22,6 +22,11 @@ - [#14441](https://github.com/emberjs/ember.js/pull/14441) [DEPRECATION] Deprecate remaining usage of the `{{render}}` helper. - [#14482](https://github.com/emberjs/ember.js/pull/14482) [DEPRECATION] Deprecate `Component#renderToElement`. +### 2.10.2 (December 19, 2016) + +- [#14685](https://github.com/emberjs/ember.js/pull/14685) [BUGFIX] Fix `this.$()` returning `undefined` in `willDestroyElement`. +- [#14717](https://github.com/emberjs/ember.js/pull/14717) [BUGFIX] Fix an issue with block params named `attrs`. + ### 2.10.1 (December 13, 2016) - [#14671](https://github.com/emberjs/ember.js/pull/14671) [BUGFIX] Fix an issue with the list attribute in <input> elements.
false
Other
emberjs
ember.js
20d07ad548a72de1546eeb03635eb074bb0cfbc5.json
Add missing header in CHANGELOG [ci skip]
CHANGELOG.md
@@ -1,5 +1,7 @@ # Ember Changelog +### 2.11.0-beta.4 (December 14, 2016) + - [#14685](https://github.com/emberjs/ember.js/pull/14685) [BUGFIX] Fix `this.$()` returning `undefined` in `willDestroyElement`. - [#14717](https://github.com/emberjs/ember.js/pull/14717) [BUGFIX] Fix an issue with block params named `attrs`.
false
Other
emberjs
ember.js
198119c8179752b8756ce0140311c1b8c951254b.json
[BUG beta] blueprints/acceptance-test/mocha: Return last async helper ... from test function
blueprints/acceptance-test/mocha-files/tests/acceptance/__name__-test.js
@@ -17,7 +17,7 @@ describe('<%= friendlyTestName %>', function() { it('can visit /<%= dasherizedModuleName %>', function() { visit('/<%= dasherizedModuleName %>'); - andThen(function() { + return andThen(() => { expect(currentURL()).to.equal('/<%= dasherizedModuleName %>'); }); });
true
Other
emberjs
ember.js
198119c8179752b8756ce0140311c1b8c951254b.json
[BUG beta] blueprints/acceptance-test/mocha: Return last async helper ... from test function
node-tests/blueprints/acceptance-test-test.js
@@ -78,7 +78,7 @@ describe('Acceptance: ember generate and destroy acceptance-test', function() { .to.contain("describe('Acceptance | foo', function() {") .to.contain("it('can visit /foo', function() {") .to.contain("visit('/foo');") - .to.contain("andThen(function() {") + .to.contain("return andThen(() => {") .to.contain("expect(currentURL()).to.equal('/foo');"); })); });
true
Other
emberjs
ember.js
b42569172fc44dc22af93360ab439c9cd226454a.json
improve docs computed filter
packages/ember-runtime/lib/computed/reduce_computed_macros.js
@@ -278,6 +278,28 @@ export function mapBy(dependentKey, propertyKey) { hamster.get('remainingChores'); // [{name: 'write more unit tests', done: false}] ``` + You can also use `@each.property` in your dependent key, the callback will still use the underlying array: + + ```javascript + let Hamster = Ember.Object.extend({ + remainingChores: Ember.computed.filter('[email protected]', function(chore, index, array) { + return !chore.get('done'); + }) + }); + + let hamster = Hamster.create({ + chores: Ember.A([ + Ember.Object.create({ name: 'cook', done: true }), + Ember.Object.create({ name: 'clean', done: true }), + Ember.Object.create({ name: 'write more unit tests', done: false }) + ]) + }); + hamster.get('remainingChores'); // [{name: 'write more unit tests', done: false}] + hamster.get('chores').objectAt(2).set('done', true); + hamster.get('remainingChores'); // [] + ``` + + @method filter @for Ember.computed @param {String} dependentKey
false
Other
emberjs
ember.js
be54b40bf0b1fc5b21aca44ce96cf12db9848294.json
Add v2.11.0-beta.2 to the CHANGELOG.
CHANGELOG.md
@@ -1,5 +1,9 @@ # Ember Changelog +### 2.11.0-beta.2 (November 29, 2016) + +- [#14658](https://github.com/emberjs/ember.js/pull/14658) [BUGFIX] Make the ember-source build work. + ### 2.11.0-beta.1 (November 28, 2016) - [#14389](https://github.com/emberjs/ember.js/pull/14389) [BUGFIX] Move `classNames` and `classNameBindings` properties into the component's prototype.
false
Other
emberjs
ember.js
db927b246ba0f4364786da60555bd9447baacb1a.json
Add d8-*.js to .npmignore.
.npmignore
@@ -1,3 +1,4 @@ +d8-*.js node-tests/ CODE_OF_CONDUCT.md CONTRIBUTING.md
false
Other
emberjs
ember.js
756b16acc75ad4b9cc8e90bcafc61c6b7498d145.json
package.json: Remove local "bower" dependency
package.json
@@ -44,7 +44,6 @@ "babel-plugin-feature-flags": "^0.2.3", "babel-plugin-filter-imports": "~0.2.0", "backburner.js": "^0.3.1", - "bower": "~1.7.7", "broccoli-funnel": "^1.0.6", "broccoli-merge-trees": "^1.1.4", "broccoli-rollup": "^1.0.3",
false
Other
emberjs
ember.js
7b42950b156326c4e861805ae5788c13116f8141.json
Update version number to 2.12.0-alpha.1.
VERSION
@@ -1 +1 @@ -2.10.0+canary +2.12.0.alpha.1
true
Other
emberjs
ember.js
7b42950b156326c4e861805ae5788c13116f8141.json
Update version number to 2.12.0-alpha.1.
package.json
@@ -1,7 +1,7 @@ { "name": "ember-source", "license": "MIT", - "version": "2.11.0-alpha.1", + "version": "2.12.0-alpha.1", "keywords": [ "ember-addon" ],
true
Other
emberjs
ember.js
5103e1eb0e6cb19dbe32f3c3bd7d672a08f5331c.json
v2.10.0 CHANGELOG [ci skip]
CHANGELOG.md
@@ -1,21 +1,17 @@ # Ember Changelog -### 2.10.0-beta.3 (November 2, 2016) - -- [#14537](https://github.com/emberjs/ember.js/pull/14537) [BUGFIX] Improve behavior for QPs with undefined values -- [#14545](https://github.com/emberjs/ember.js/pull/14545) [BUGFIX] Refactor loading/error substates. Fixes a number of issues with substate usage with ember-engines. +### 2.10.0 (November 28, 2016) + +- [#14293](https://github.com/emberjs/ember.js/pull/14293) [BUGFIX] Remove style warning when the binding is quoted. +- [#12708](https://github.com/emberjs/ember.js/pull/12708) [BUGFIX] Improve compatibility between `Ember.isArray` and the native `Array.isArray` for `FileList`. +- [#14546](https://github.com/emberjs/ember.js/pull/14546) [BUGFIX] Update route-recognizer to v0.2.8. +- [#14575](https://github.com/emberjs/ember.js/pull/14575) [BUGFIX] Disallow calling `Ember.get` with empty paths. +- [#14591](https://github.com/emberjs/ember.js/pull/14591) [BUGFIX] Avoid run.next in `app.visit` resolve handler. +- [#14537](https://github.com/emberjs/ember.js/pull/14537) [BUGFIX] Improve behavior for query params with undefined values. +- [#14545](https://github.com/emberjs/ember.js/pull/14545) [BUGFIX] Fixes a number of issues with loading/error substates in ember-engines. - [#14571](https://github.com/emberjs/ember.js/pull/14571) [BUGFIX] Prevent errors in watching infrastructure for non-object paths. - [tildeio/router.js#197](https://github.com/tildeio/router.js/pull/197) [BUGFIX] Fix redirects performed during the routers validation stages. Properly handles `replaceWith` / `transitionTo` for initial and subsequent transitions. - -### 2.10.0-beta.2 (October 26, 2016) - -- [#14499](https://github.com/emberjs/ember.js/pull/14499) [BUGFIX] Fix "Invalid value used as weak map key" error in old versions of Node.js. -- [#14519](https://github.com/emberjs/ember.js/pull/14519) [BUGFIX] Ensure `didTransition` is fired before rendering. - [#14520](https://github.com/emberjs/ember.js/pull/14520) [BUGFIX] Ensure local variables (block params) have higher precedence over helpers. -- [#14520](https://github.com/emberjs/ember.js/pull/14520) [BUGFIX] Fix an issue where class-based helpers are destroyed unexpectedly. - -### 2.10.0-beta.1 (October 17, 2016) - - [#14156](https://github.com/emberjs/ember.js/pull/14156) [FEATURE ember-glimmer] Enable by default. ### 2.9.1 (November 1, 2016)
false
Other
emberjs
ember.js
8ec69ba1cb086faa21d5d66fd09aa0f386c1c943.json
Add a failing test for #14642
packages/ember-glimmer/tests/integration/components/curly-components-test.js
@@ -596,6 +596,20 @@ moduleFor('Components test: curly components', class extends RenderingTest { this.assertComponentElement(this.firstChild, { content: 'yielded: [hello] - In component' }); } + ['@test it can render a basic component with a block param when the yield is in a partial']() { + this.registerPartial('_partialWithYield', 'yielded: [{{yield "hello"}}]'); + + this.registerComponent('foo-bar', { template: '{{partial "partialWithYield"}} - In component' }); + + this.render('{{#foo-bar as |value|}}{{value}}{{/foo-bar}}'); + + this.assertComponentElement(this.firstChild, { content: 'yielded: [hello] - In component' }); + + this.runTask(() => this.rerender()); + + this.assertComponentElement(this.firstChild, { content: 'yielded: [hello] - In component' }); + } + ['@test it renders the layout with the component instance as the context']() { let instance;
false
Other
emberjs
ember.js
b2e290057fc844207d98c3efd04bcb3ae45939cf.json
ember-testing/setup_for_testing: Use Ember.Test.Adapter if QUnit is unavailable
packages/ember-testing/lib/setup_for_testing.js
@@ -1,3 +1,5 @@ +/* global self */ + import { setTesting } from 'ember-metal'; import { jQuery } from 'ember-views'; import { @@ -9,6 +11,7 @@ import { decrementPendingRequests, clearPendingRequests } from './test/pending_requests'; +import Adapter from './adapters/adapter'; import QUnitAdapter from './adapters/qunit'; /** @@ -29,7 +32,7 @@ export default function setupForTesting() { let adapter = getAdapter(); // if adapter is not manually set default to QUnit if (!adapter) { - setAdapter(new QUnitAdapter()); + setAdapter((typeof self.QUnit === 'undefined') ? new Adapter() : new QUnitAdapter()); } jQuery(document).off('ajaxSend', incrementPendingRequests);
true
Other
emberjs
ember.js
b2e290057fc844207d98c3efd04bcb3ae45939cf.json
ember-testing/setup_for_testing: Use Ember.Test.Adapter if QUnit is unavailable
packages/ember-testing/tests/adapters_test.js
@@ -4,18 +4,20 @@ import Adapter from '../adapters/adapter'; import QUnitAdapter from '../adapters/qunit'; import { Application as EmberApplication } from 'ember-application'; -var App, originalAdapter; +var App, originalAdapter, originalQUnit; QUnit.module('ember-testing Adapters', { setup() { originalAdapter = Test.adapter; + originalQUnit = window.QUnit; }, teardown() { run(App, App.destroy); App.removeTestHelpers(); App = null; Test.adapter = originalAdapter; + window.QUnit = originalQUnit; } }); @@ -38,7 +40,7 @@ QUnit.test('Setting a test adapter manually', function() { Test.adapter.asyncStart(); }); -QUnit.test('QUnitAdapter is used by default', function() { +QUnit.test('QUnitAdapter is used by default (if QUnit is available)', function() { expect(1); Test.adapter = null; @@ -50,3 +52,19 @@ QUnit.test('QUnitAdapter is used by default', function() { ok(Test.adapter instanceof QUnitAdapter); }); + +QUnit.test('Adapter is used by default (if QUnit is not available)', function() { + expect(2); + + delete window.QUnit; + + Test.adapter = null; + + run(function() { + App = EmberApplication.create(); + App.setupForTesting(); + }); + + ok(Test.adapter instanceof Adapter); + ok(!(Test.adapter instanceof QUnitAdapter)); +});
true
Other
emberjs
ember.js
fa665691b200b0013503fcd8603748208ad4541a.json
Update yarn.lock for glimmer-engine version. Not for beta since yarn isn't used in beta branch ATM.
yarn.lock
@@ -2699,9 +2699,9 @@ github@^0.2.3: dependencies: mime "^1.2.11" -glimmer-engine@^0.17.6: - version "0.17.6" - resolved "https://registry.yarnpkg.com/glimmer-engine/-/glimmer-engine-0.17.6.tgz#edca3676c21a42f9bf389a8707ff4cc12c66d347" +glimmer-engine: + version "0.17.7" + resolved "https://registry.yarnpkg.com/glimmer-engine/-/glimmer-engine-0.17.7.tgz#d0657a23fc49fa0ec4ff73e68132ac6d38c70787" dependencies: broccoli-concat "^2.1.0" broccoli-funnel "^1.0.1"
false
Other
emberjs
ember.js
2ca045698802cf1563599561aaaff2105803c66a.json
Add 2.10.0-beta.3 to CHANGELOG.md. [ci skip]
CHANGELOG.md
@@ -1,5 +1,12 @@ # Ember Changelog +### 2.10.0-beta.3 (November 2, 2016) + +- [#14537](https://github.com/emberjs/ember.js/pull/14537) [BUGFIX] Improve behavior for QPs with undefined values +- [#14545](https://github.com/emberjs/ember.js/pull/14545) [BUGFIX] Refactor loading/error substates. Fixes a number of issues with substate usage with ember-engines. +- [#14571](https://github.com/emberjs/ember.js/pull/14571) [BUGFIX] Prevent errors in watching infrastructure for non-object paths. +- [tildeio/router.js#197](https://github.com/tildeio/router.js/pull/197) [BUGFIX] Fix redirects performed during the routers validation stages. Properly handles `replaceWith` / `transitionTo` for initial and subsequent transitions. + ### 2.10.0-beta.2 (October 26, 2016) - [#14499](https://github.com/emberjs/ember.js/pull/14499) [BUGFIX] Fix "Invalid value used as weak map key" error in old versions of Node.js.
false
Other
emberjs
ember.js
7700097f3497f605dda062467e322e76e368e96b.json
Add 2.9.1 to CHANGELOG.md [ci skip]
CHANGELOG.md
@@ -11,6 +11,12 @@ - [#14156](https://github.com/emberjs/ember.js/pull/14156) [FEATURE ember-glimmer] Enable by default. +### 2.9.1 (November 1, 2016) + +- [#14528](https://github.com/emberjs/ember.js/pull/14528) [BUGFIX] Fix memory leak (leaking component instances in the component registry). +- [#14509](https://github.com/emberjs/ember.js/pull/14509) [BUGFIX] Fix overwriting rest positional parameters when passed as named parameters. Allows `link-to` to be used as a contextual component. +- [#14550](https://github.com/emberjs/ember.js/pull/14550) [BUGFIX] Allow canceling items queued by `run.schedule`. + ### 2.9.0 (October 17, 2016) - No changes from 2.8.2. @@ -19,7 +25,7 @@ - [#14528](https://github.com/emberjs/ember.js/pull/14528) [BUGFIX] Fix memory leak (leaking component instances in the component registry). - [#14509](https://github.com/emberjs/ember.js/pull/14509) [BUGFIX] Fix overwriting rest positional parameters when passed as named parameters. Allows `link-to` to be used as a contextual component. -- [#14550](https://github.com/emberjs/ember.js/pull/14550) [BUGFIX lts-2-8] Allow canceling items queued by `run.schedule`. +- [#14550](https://github.com/emberjs/ember.js/pull/14550) [BUGFIX] Allow canceling items queued by `run.schedule`. ### 2.8.2 (October 6, 2016)
false
Other
emberjs
ember.js
8eaae63c965adfe9aa66f7cdd63bf184712ac1e5.json
Update CHANGELOG for 2.8.3. [ci skip]
CHANGELOG.md
@@ -15,6 +15,12 @@ - No changes from 2.8.2. +### 2.8.3 (November 1, 2016) + +- [#14528](https://github.com/emberjs/ember.js/pull/14528) [BUGFIX] Fix memory leak (leaking component instances in the component registry). +- [#14509](https://github.com/emberjs/ember.js/pull/14509) [BUGFIX] Fix overwriting rest positional parameters when passed as named parameters. Allows `link-to` to be used as a contextual component. +- [#14550](https://github.com/emberjs/ember.js/pull/14550) [BUGFIX lts-2-8] Allow canceling items queued by `run.schedule`. + ### 2.8.2 (October 6, 2016) - [#14365](https://github.com/emberjs/ember.js/pull/14365) [BUGFIX] Fix an issue with URLs with encoded characters and a trailing slash.
false
Other
emberjs
ember.js
9d31a6d0aca41f0c0cd901ee01948394078e90c8.json
Simplify d8-runner and add simple app `d8 d8-runner.js d8-app.js`
d8-app.js
@@ -0,0 +1,36 @@ +var Router = Ember.Router.extend({ + location: 'none', + rootURL: '/' +}); +Router.map(function() { + this.route('my-route', { path: '/my-route' }, function () { + }); +}); +Ember.TEMPLATES['index'] = Ember.HTMLBars.template({"id":null,"block":"{\"statements\":[[\"text\",\"index\"]],\"locals\":[],\"named\":[],\"yields\":[],\"blocks\":[],\"hasPartials\":false}","meta":{}}); +Ember.TEMPLATES['my-route/index'] = Ember.HTMLBars.template({"id":null,"block":"{\"statements\":[[\"text\",\"my-route\"]],\"locals\":[],\"named\":[],\"yields\":[],\"blocks\":[],\"hasPartials\":false}","meta":{}}); +var App = Ember.Application.extend({ + Router: Router, + autoboot: false +}); +var app = new App(); +var serializer = new SimpleDOM.HTMLSerializer(SimpleDOM.voidMap); +var doc = new SimpleDOM.Document(); +var options = { + isBrowser: false, + document: doc, + rootElement: doc.body, + shouldRender: true +}; +app.visit('/', options).then(function (instance) { + print(serializer.serialize(doc.body)); + var router = instance.lookup('router:main'); + return router.transitionTo('/my-route'); +}).then(function () { + return new Ember.RSVP.Promise(function (resolve) { + Ember.run.schedule('afterRender', resolve) + }); +}).then(function () { + print(serializer.serialize(doc.body)); +}).catch(function (err) { + print(err.stack); +});
true
Other
emberjs
ember.js
9d31a6d0aca41f0c0cd901ee01948394078e90c8.json
Simplify d8-runner and add simple app `d8 d8-runner.js d8-app.js`
d8-runner.js
@@ -37,7 +37,6 @@ // begin MISC setup; const global = new Function('return this;')(); global.self = global; -global.window = {}; function loadFile(file) { print('load: ' + file); load(file); @@ -54,17 +53,18 @@ global.setTimeout = function(callback) { Promise.resolve().then(callback).catch(e => print('error' + e)); }; loadFile('./node_modules/simple-dom/dist/simple-dom.js'); -const document = new SimpleDOM.Document(); -document.createElementNS = document.createElement; // TODO:wat -global.document = document; -SimpleDOM.Node.prototype.insertAdjacentHTML = function( ) {}; + +// url protocol +global.URL = {}; // end MISC setup // Load the ember you want -loadFile('./dist/ember.js'); // prod build === no asserts and dev related code +loadFile('./dist/ember.prod.js'); // prod build === no asserts and dev related code // loadFile('/dist/ember.min.js'); // prod build + minified // loadFile('/dist/ember.debug.js'); // debug build === asserts and stuff, has perf issues + // do what you want -console.log(Ember); + +// try running `d8 d8-runner.js d8-app.js`
true
Other
emberjs
ember.js
1e164731edbfe6198d50511450d4d1cb584415cd.json
Use npm for jquery and qunitjs
bower.json
@@ -4,10 +4,6 @@ "type": "git", "url": "https://github.com/emberjs/ember.js.git" }, - "dependencies": { - "jquery": ">=1.11.1 <4.0.0", - "qunit": "^1.20.0" - }, "devDependencies": { "ember-dev": "https://github.com/emberjs/ember-dev.git#eace5340485bdb5e4223ab67fecf4aff31c1940c", "router.js": "https://github.com/tildeio/router.js.git#f3ff6564cb817b2cdb620ab430964f19e67c4919"
true
Other
emberjs
ember.js
1e164731edbfe6198d50511450d4d1cb584415cd.json
Use npm for jquery and qunitjs
ember-cli-build.js
@@ -18,9 +18,11 @@ var filterImports = require('babel-plugin-filter-imports'); var vendoredPackage = require('emberjs-build/lib/vendored-package'); var htmlbarsPackage = require('emberjs-build/lib/htmlbars-package'); var vendoredES6Package = require('emberjs-build/lib/es6-vendored-package'); +var replaceVersion = require('emberjs-build/lib/utils/replace-version'); var Funnel = require('broccoli-funnel'); var Rollup = require('broccoli-rollup'); +var mergeTrees = require('broccoli-merge-trees'); var rollupEnifed = { transformBundle(code, options) { @@ -74,7 +76,8 @@ function rsvp() { rollup: { entry: 'rsvp.js', dest: 'rsvp.js', - format: 'es' + format: 'es', + exports: 'named' }, annotation: 'rsvp.js' }); @@ -233,6 +236,26 @@ function getVersion() { return prefix + '+' + sha.slice(0, 8); } +// non bundled vendor +function jquery() { + let jquery = require.resolve('jquery'); + return new Funnel(path.dirname(jquery), { + files: ['jquery.js'], + destDir: 'jquery', + annotation: 'jquery/jquery.js' + }); +} + +// TEST files +function qunit() { + var qunitjs = require.resolve('qunitjs'); + return new Funnel(path.dirname(qunitjs), { + files: ['qunit.js', 'qunit.css'], + destDir: 'qunit', + annotation: 'qunit/qunit.{js|css}' + }); +} + module.exports = function() { var features = getFeatures(); var version = getVersion(); @@ -259,6 +282,19 @@ module.exports = function() { 'handlebars': glimmerPackage('handlebars') // inlined parser }; + // Replace _getBowerTree with one from npm + EmberBuild.prototype._getBowerTree = function getBowerTree() { + return mergeTrees([ + qunit(), + jquery(), + replaceVersion(new Funnel('config/package_manager_files', { + destDir: '/' + }), { + version: version + }) + ]); + }; + var emberBuild = new EmberBuild({ babel: { development: babelConfigFor('development'),
true
Other
emberjs
ember.js
1e164731edbfe6198d50511450d4d1cb584415cd.json
Use npm for jquery and qunitjs
package.json
@@ -28,6 +28,7 @@ "backburner.js": "^0.3.1", "bower": "~1.7.7", "broccoli-funnel": "^1.0.6", + "broccoli-merge-trees": "^1.1.4", "broccoli-rollup": "^1.0.3", "broccoli-stew": "^1.2.0", "chalk": "^1.1.1", @@ -47,6 +48,7 @@ "glimmer-engine": "^0.17.6", "glob": "^5.0.13", "html-differ": "^1.3.4", + "jquery": "^3.1.1", "mocha": "^2.4.5", "qunit-extras": "^1.5.0", "qunit-phantomjs-runner": "^2.2.0",
true
Other
emberjs
ember.js
1e164731edbfe6198d50511450d4d1cb584415cd.json
Use npm for jquery and qunitjs
yarn.lock
@@ -770,7 +770,7 @@ broccoli-kitchen-sink-helpers@^0.3.1: glob "^5.0.10" mkdirp "^0.5.1" -broccoli-merge-trees@^1.0.0, broccoli-merge-trees@^1.1.1, broccoli-merge-trees@^1.1.3: +broccoli-merge-trees, broccoli-merge-trees@^1.0.0, broccoli-merge-trees@^1.1.1, broccoli-merge-trees@^1.1.3: version "1.1.4" resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-1.1.4.tgz#ab9eafd30b0dd8136e882ffd8fb08f3817533ea0" dependencies: @@ -3383,6 +3383,10 @@ jodid25519@^1.0.0: dependencies: jsbn "~0.1.0" +jquery: + version "3.1.1" + resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.1.1.tgz#347c1c21c7e004115e0a4da32cece041fad3c8a3" + js-string-escape@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef"
true
Other
emberjs
ember.js
0fd29a8cfb5a95e14842eef83e063ffb73f29d2d.json
Use npm for qunit-phantomjs-runner
bin/run-tests.js
@@ -32,7 +32,7 @@ function run(queryString) { } function runInPhantom(url, retries, resolve, reject) { - var args = ['bower_components/qunit-phantom-runner/runner.js', url]; + var args = [require.resolve('qunit-phantomjs-runner'), url, '900']; console.log('Running: phantomjs ' + args.join(' '));
true
Other
emberjs
ember.js
0fd29a8cfb5a95e14842eef83e063ffb73f29d2d.json
Use npm for qunit-phantomjs-runner
bower.json
@@ -6,8 +6,7 @@ }, "dependencies": { "jquery": ">=1.11.1 <4.0.0", - "qunit": "^1.20.0", - "qunit-phantom-runner": "jonkemp/qunit-phantomjs-runner#1.2.0" + "qunit": "^1.20.0" }, "devDependencies": { "ember-dev": "https://github.com/emberjs/ember-dev.git#eace5340485bdb5e4223ab67fecf4aff31c1940c",
true
Other
emberjs
ember.js
0fd29a8cfb5a95e14842eef83e063ffb73f29d2d.json
Use npm for qunit-phantomjs-runner
package.json
@@ -49,6 +49,7 @@ "html-differ": "^1.3.4", "mocha": "^2.4.5", "qunit-extras": "^1.5.0", + "qunit-phantomjs-runner": "^2.2.0", "qunitjs": "^1.22.0", "route-recognizer": "^0.2.8", "serve-static": "^1.10.0",
true
Other
emberjs
ember.js
0fd29a8cfb5a95e14842eef83e063ffb73f29d2d.json
Use npm for qunit-phantomjs-runner
yarn.lock
@@ -4728,6 +4728,10 @@ qunit-extras@^1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/qunit-extras/-/qunit-extras-1.5.0.tgz#a64d1c5088ab20c01c0e1b04c72132c397b3964c" +qunit-phantomjs-runner: + version "2.2.0" + resolved "https://registry.yarnpkg.com/qunit-phantomjs-runner/-/qunit-phantomjs-runner-2.2.0.tgz#557a0f55d7d83c315312d1b7048ed972ffea4549" + qunit@^0.7.2: version "0.7.7" resolved "https://registry.yarnpkg.com/qunit/-/qunit-0.7.7.tgz#f0006f60b31a91c41e58aba92147576879b425bd"
true
Other
emberjs
ember.js
2eceeb0d3a6c72c9de01f9ed9e6e9369ca1f2dae.json
Use npm for rsvp
bower.json
@@ -10,8 +10,7 @@ "qunit-phantom-runner": "jonkemp/qunit-phantomjs-runner#1.2.0" }, "devDependencies": { - "rsvp": "https://github.com/tildeio/rsvp.js.git#v3.2.1", - "router.js": "https://github.com/tildeio/router.js.git#f3ff6564cb817b2cdb620ab430964f19e67c4919", - "ember-dev": "https://github.com/emberjs/ember-dev.git#eace5340485bdb5e4223ab67fecf4aff31c1940c" + "ember-dev": "https://github.com/emberjs/ember-dev.git#eace5340485bdb5e4223ab67fecf4aff31c1940c", + "router.js": "https://github.com/tildeio/router.js.git#f3ff6564cb817b2cdb620ab430964f19e67c4919" } }
true
Other
emberjs
ember.js
2eceeb0d3a6c72c9de01f9ed9e6e9369ca1f2dae.json
Use npm for rsvp
ember-cli-build.js
@@ -62,29 +62,23 @@ function backburner() { format: 'amd', moduleId: 'backburner', exports: 'named' - } + }, + annotation: 'backburner.js' }); } function rsvp() { - // TODO upstream - var version = require('./bower_components/rsvp/package').version; - var banner = fs.readFileSync( - path.resolve(__dirname, 'bower_components/rsvp/config/versionTemplate.txt'), - 'utf8'); - var rollup = new Rollup('bower_components/rsvp/lib', { + var transpileES6 = require('emberjs-build/lib/utils/transpile-es6'); + var lib = path.resolve(path.dirname(require.resolve('rsvp')), '../lib'); + var rollup = new Rollup(lib, { rollup: { entry: 'rsvp.js', - plugins: [ rollupEnifed ], - banner: banner.replace('VERSION_PLACEHOLDER_STRING', version), dest: 'rsvp.js', - format: 'amd', - exports: 'named', - moduleId: 'rsvp' + format: 'es' }, annotation: 'rsvp.js' }); - return rollup; + return transpileES6(rollup); } function routeRecognizer() { @@ -100,7 +94,8 @@ function routeRecognizer() { format: 'amd', moduleId: 'route-recognizer', exports: 'named' - } + }, + annotation: 'route-recognizer.js' }); }
true
Other
emberjs
ember.js
2eceeb0d3a6c72c9de01f9ed9e6e9369ca1f2dae.json
Use npm for rsvp
package.json
@@ -51,20 +51,20 @@ "qunit-extras": "^1.5.0", "qunitjs": "^1.22.0", "route-recognizer": "^0.2.8", - "rsvp": "~3.2.1", "serve-static": "^1.10.0", "simple-dom": "^0.3.0", "testem": "^1.8.1" }, "dependencies": { + "broccoli-stew": "^1.2.0", "ember-cli-get-component-path-option": "^1.0.0", "ember-cli-normalize-entity-name": "^1.0.0", "ember-cli-path-utils": "^1.0.0", "ember-cli-string-utils": "^1.0.0", "ember-cli-test-info": "^1.0.0", "ember-cli-valid-component-name": "^1.0.0", - "simple-dom": "^0.3.0", - "broccoli-stew": "^1.2.0" + "rsvp": "^3.3.3", + "simple-dom": "^0.3.0" }, "ember-addon": { "after": "ember-cli-legacy-blueprints"
true
Other
emberjs
ember.js
2eceeb0d3a6c72c9de01f9ed9e6e9369ca1f2dae.json
Use npm for rsvp
yarn.lock
@@ -62,10 +62,6 @@ ansi-escapes@^1.1.0: version "1.4.0" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e" -ansi-regex@*, ansi-regex@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.0.0.tgz#c5061b6e0ef8a81775e50f5d66151bf6bf371107" - ansi-regex@^0.2.0, ansi-regex@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-0.2.1.tgz#0d8e946967a3d8143f93e24e298525fc1b2235f9" @@ -74,6 +70,10 @@ ansi-regex@^1.0.0, ansi-regex@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-1.1.1.tgz#41c847194646375e6a1a5d10c3ca054ef9fc980d" +ansi-regex@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.0.0.tgz#c5061b6e0ef8a81775e50f5d66151bf6bf371107" + ansi-styles@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.1.0.tgz#eaecbf66cd706882760b2f4691582b8f55d7a7de" @@ -3109,7 +3109,7 @@ iferr@^0.1.5: version "0.1.5" resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501" -imurmurhash@*, imurmurhash@^0.1.4: +imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" @@ -5128,18 +5128,14 @@ route-recognizer@^0.2.8: version "0.2.8" resolved "https://registry.yarnpkg.com/route-recognizer/-/route-recognizer-0.2.8.tgz#931e2629b09f351ac8e577aea03ad0151781e625" -rsvp@^3.0.14, rsvp@^3.0.16, rsvp@^3.0.17, rsvp@^3.0.18, rsvp@^3.0.21, rsvp@^3.0.6, rsvp@^3.1.0, rsvp@^3.2.1: +rsvp, rsvp@^3.0.14, rsvp@^3.0.16, rsvp@^3.0.17, rsvp@^3.0.18, rsvp@^3.0.21, rsvp@^3.0.6, rsvp@^3.1.0, rsvp@^3.2.1: version "3.3.3" resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.3.3.tgz#34633caaf8bc66ceff4be3c2e1dffd032538a813" rsvp@~3.0.6: version "3.0.21" resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.0.21.tgz#49c588fe18ef293bcd0ab9f4e6756e6ac433359f" -rsvp@~3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.2.1.tgz#07cb4a5df25add9e826ebc67dcc9fd89db27d84a" - [email protected]: version "3.0.14" resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.0.14.tgz#9d2968cf36d878d3bb9a9a5a4b8e1ff55a76dd31"
true