Update glimmer import references to @Glimmer

ember-cli-build.js

@@ -269,14 +269,14 @@ module.exports = function() {
     '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'),
+    '@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
   };
 

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'
       ]
     },
@@ -38,11 +38,11 @@ module.exports = function(features) {
       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: []
     }

package.json

@@ -64,7 +64,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",

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');

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';

packages/ember-glimmer/lib/environment.js

@@ -12,7 +12,7 @@ import {
   isSafeString,
   compileLayout,
   getDynamicVar
-} from 'glimmer-runtime';
+} from '@glimmer/runtime';
 import {
   CurlyComponentDefinition
 } from './syntax/curly-component';

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');
 

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');
@@ -373,7 +373,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));
     });

packages/ember-glimmer/lib/helpers/component.js

@@ -13,7 +13,7 @@ import {
   EvaluatedNamedArgs,
   EvaluatedPositionalArgs,
   isComponentDefinition
-} from 'glimmer-runtime';
+} from '@glimmer/runtime';
 import { assert } from 'ember-metal';
 
 /**

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

packages/ember-glimmer/lib/helpers/get.js

@@ -6,7 +6,7 @@ import {
   combine,
   isConst,
   referenceFromParts
-} from 'glimmer-reference';
+} from '@glimmer/reference';
 
 /**
 @module ember

packages/ember-glimmer/lib/helpers/if-unless.js

@@ -14,7 +14,7 @@ import {
   UpdatableTag,
   combine,
   isConst
-} from 'glimmer-reference';
+} from '@glimmer/reference';
 
 
 /**

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,

packages/ember-glimmer/lib/syntax/-in-element.js

@@ -1,5 +1,5 @@
-import { BaselineSyntax, compileArgs } from 'glimmer-runtime';
-import { unwrap } from 'glimmer-util';
+import { BaselineSyntax, compileArgs } from '@glimmer/runtime';
+import { unwrap } from '@glimmer/util';
 
 const {
   defaultBlock,

packages/ember-glimmer/lib/syntax/-text-area.js

@@ -3,7 +3,6 @@ import { wrapComponentClassAttribute } from '../utils/bindings';
 export function textAreaMacro(path, params, hash, builder) {
   let definition = builder.env.getComponentDefinition(['-text-area'], builder.symbolTable);
   wrapComponentClassAttribute(hash);
-  console.log(definition);
   builder.component.static(definition, [params, hash, null, null], builder.symbolTable);
   return true;
 }

packages/ember-glimmer/lib/syntax/-with-dynamic-vars.js

@@ -1,5 +1,5 @@
-import { BaselineSyntax, compileArgs } from 'glimmer-runtime';
-import { unwrap } from 'glimmer-util';
+import { BaselineSyntax, compileArgs } from '@glimmer/runtime';
+import { unwrap } from '@glimmer/util';
 
 const {
   defaultBlock,

packages/ember-glimmer/lib/syntax/curly-component.js

@@ -2,7 +2,7 @@ import { OWNER } from 'ember-utils';
 import {
   PrimitiveReference,
   ComponentDefinition
-} from 'glimmer-runtime';
+} from '@glimmer/runtime';
 import {
   AttributeBinding,
   ClassNameBinding,

packages/ember-glimmer/lib/syntax/dynamic-component.js

@@ -1,7 +1,7 @@
 import {
   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) {

packages/ember-glimmer/lib/syntax/mount.js

@@ -4,8 +4,8 @@
 */
 import {
   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';

packages/ember-glimmer/lib/syntax/outlet.js

@@ -6,15 +6,15 @@ import { generateGuid, guidFor } from 'ember-utils';
 import {
   ComponentDefinition,
   CompiledArgs
-} from 'glimmer-runtime';
-import { runInDebug, _instrumentStart } from 'ember-metal';
+} 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();

packages/ember-glimmer/lib/syntax/render.js

@@ -4,8 +4,8 @@
 */
 import {
   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';

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);

packages/ember-glimmer/lib/utils/bindings.js

@@ -3,7 +3,7 @@ import {
   combine,
   map,
   referenceFromParts
-} from 'glimmer-reference';
+} from '@glimmer/reference';
 import { get, assert } from 'ember-metal';
 import { String as StringUtils } from 'ember-runtime';
 import { ROOT_REF } from '../component';

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';
 

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

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

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';

packages/ember-glimmer/tests/integration/helpers/debugger-test.js

@@ -3,7 +3,7 @@ import { Component } from '../../utils/helpers';
 import {
   setDebuggerCallback,
   resetDebuggerCallback
-} from 'glimmer-runtime';
+} from '@glimmer/runtime';
 import { set } from 'ember-metal';
 import { A as emberA } from 'ember-runtime';
 

packages/ember-glimmer/tests/integration/helpers/render-test.js

@@ -152,8 +152,8 @@ moduleFor('Helpers test: {{render}}', class extends RenderingTest {
     this.registerTemplate('post', '<p>{{model.title}}</p>');
 
     expectDeprecation(() => {
-      this.render(`<h1>HI</h1>{{render 'post' foo}}`, {
-        foo: {
+      this.render(`<h1>HI</h1>{{render 'post' post}}`, {
+        post: {
           title: `It's Simple Made Easy`
         }
       });

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 {

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';

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,

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) {