Remove glimmer-engine

emberjs · Jan 17, 2017 · c96ffce · c96ffce
1 parent 630e1e9
commit c96ffce
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 249 deletions.
diff --git a/ember-cli-build.js b/ember-cli-build.js
@@ -89,7 +89,7 @@ function rsvp() {
 function routeRecognizer() {
   var packageJson = require('route-recognizer/package');
   var packageDir = path.dirname(require.resolve('route-recognizer/package'));
-  var entry = path.join(packageDir, packageJson['module'] || packageJson['js:next'] || packageJson['main'].replace(/dist\//, 'dist/es6/'));
+  var entry = path.join(packageDir, packageJson['module'] || packageJson['jsnext:main'] || packageJson['main'].replace(/dist\//, 'dist/es6/'));
   var basename = path.basename(entry);
   var es6 = new Funnel(path.dirname(entry), {
     files: [ basename ]
@@ -116,7 +116,7 @@ function buildPackage(name, options) {
     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 entryModule = packageJson['module'] || packageJson['jsnext:main'] || 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);
 
@@ -300,7 +300,7 @@ module.exports = function() {
     'router':                router(),
     'dag-map':               dag(),
     'route-recognizer':      routeRecognizer(),
-    'simple-html-tokenizer': htmlbarsPackage('simple-html-tokenizer', { libPath: 'node_modules/glimmer-engine/dist/es6' }),
+    'simple-html-tokenizer': buildPackage('simple-html-tokenizer'),
 
     '@glimmer/compiler':     buildPackage('@glimmer/compiler', {
                                external: ['@glimmer/syntax', '@glimmer/wire-format', '@glimmer/util']

diff --git a/package.json b/package.json
@@ -44,7 +44,8 @@
     "jquery": "^3.1.1",
     "resolve": "^1.1.7",
     "rsvp": "^3.3.3",
-    "simple-dom": "^0.3.0"
+    "simple-dom": "^0.3.0",
+    "simple-html-tokenizer": "^0.3.0"
   },
   "devDependencies": {
     "@glimmer/test-helpers": "^0.21.1",
@@ -71,7 +72,6 @@
     "git-repo-info": "^1.1.4",
     "git-repo-version": "^0.3.1",
     "github": "^0.2.3",
-    "glimmer-engine": "^0.20.0",
     "glob": "^5.0.13",
     "html-differ": "^1.3.4",
     "mocha": "^2.4.5",

diff --git a/packages/ember-glimmer/lib/helpers/component.js b/packages/ember-glimmer/lib/helpers/component.js
@@ -14,7 +14,7 @@ import {
   EvaluatedPositionalArgs,
   isComponentDefinition
 } from '@glimmer/runtime';
-import { assert } from 'ember-metal';
+import { assert, runInDebug } from 'ember-metal';
 
 /**
   The `{{component}}` helper lets you add instances of `Ember.Component` to a
@@ -205,11 +205,15 @@ function createCurriedDefinition(definition, args) {
   );
 }
 
-const EMPTY_BLOCKS = {
+let EMPTY_BLOCKS = {
   default: null,
   inverse: null
 };
 
+runInDebug(() => {
+  EMPTY_BLOCKS = Object.freeze(EMPTY_BLOCKS);
+});
+
 function curryArgs(definition, newArgs) {
   let { args, ComponentClass } = definition;
   let positionalParams = ComponentClass.class.positionalParams;

diff --git a/packages/ember-glimmer/lib/syntax.js b/packages/ember-glimmer/lib/syntax.js
@@ -95,5 +95,8 @@ export function populateMacros(blocks, inlines) {
     let macro = experimentalMacros[i];
     macro(blocks, inlines);
   }
+
+  experimentalMacros = [];
+
   return { blocks, inlines };
 }