Merge pull request #154 from dfreeman/fix-ember-try-tests

Fix CI

.github/workflows/ci.yml

@@ -15,6 +15,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: volta-cli/action@v1
       - run: yarn install --frozen-lockfile --non-interactive
+      - run: yarn build
       - run: yarn test
 
   playground-test:

.prettierignore

@@ -2,3 +2,4 @@ packages/@glimmerx/babel-preset/test/
 packages/@glimmerx/prettier-plugin-component-templates/test/fixtures/*/code.*
 packages/@glimmerx/prettier-plugin-component-templates/test/fixtures/*/output.*
 
+dist/

package.json

@@ -92,7 +92,7 @@
     "npm": false
   },
   "volta": {
-    "node": "12.10.0",
+    "node": "12.22.12",
     "yarn": "1.22.4"
   }
 }

packages/@glimmerx/babel-preset/test/fixtures/debug/output.js

@@ -2,6 +2,12 @@ var _class, _descriptor, _cantTouchThis, _hammerTime;
 
 function _initializerDefineProperty(target, property, descriptor, context) { if (!descriptor) return; Object.defineProperty(target, property, { enumerable: descriptor.enumerable, configurable: descriptor.configurable, writable: descriptor.writable, value: descriptor.initializer ? descriptor.initializer.call(context) : void 0 }); }
 
+function _classPrivateMethodInitSpec(obj, privateSet) { _checkPrivateRedeclaration(obj, privateSet); privateSet.add(obj); }
+
+function _classPrivateFieldInitSpec(obj, privateMap, value) { _checkPrivateRedeclaration(obj, privateMap); privateMap.set(obj, value); }
+
+function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
+
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) { var desc = {}; Object.keys(descriptor).forEach(function (key) { desc[key] = descriptor[key]; }); desc.enumerable = !!desc.enumerable; desc.configurable = !!desc.configurable; if ('value' in desc || desc.initializer) { desc.writable = true; } desc = decorators.slice().reverse().reduce(function (desc, decorator) { return decorator(target, property, desc) || desc; }, desc); if (context && desc.initializer !== void 0) { desc.value = desc.initializer ? desc.initializer.call(context) : void 0; desc.initializer = undefined; } if (desc.initializer === void 0) { Object.defineProperty(target, property, desc); desc = null; } return desc; }
@@ -34,15 +40,15 @@ let Test = _setComponentTemplate(_createTemplateFactory(
   "block": "[[[1,\"Hello World\"]],[],false,[]]",
   "moduleName": "(unknown template module)",
   "isStrictMode": true
-}), (_class = (_cantTouchThis = new WeakMap(), _hammerTime = new WeakSet(), class Test extends Component {
+}), (_class = (_cantTouchThis = /*#__PURE__*/new WeakMap(), _hammerTime = /*#__PURE__*/new WeakSet(), class Test extends Component {
   constructor(...args) {
     super(...args);
 
-    _hammerTime.add(this);
+    _classPrivateMethodInitSpec(this, _hammerTime);
 
     _initializerDefineProperty(this, "bar", _descriptor, this);
 
-    _cantTouchThis.set(this, {
+    _classPrivateFieldInitSpec(this, _cantTouchThis, {
       writable: true,
       value: 'mc hammer'
     });

packages/@glimmerx/babel-preset/test/fixtures/production/output.js

@@ -2,6 +2,12 @@ var _class, _descriptor, _cantTouchThis, _hammerTime;
 
 function _initializerDefineProperty(target, property, descriptor, context) { if (!descriptor) return; Object.defineProperty(target, property, { enumerable: descriptor.enumerable, configurable: descriptor.configurable, writable: descriptor.writable, value: descriptor.initializer ? descriptor.initializer.call(context) : void 0 }); }
 
+function _classPrivateMethodInitSpec(obj, privateSet) { _checkPrivateRedeclaration(obj, privateSet); privateSet.add(obj); }
+
+function _classPrivateFieldInitSpec(obj, privateMap, value) { _checkPrivateRedeclaration(obj, privateMap); privateMap.set(obj, value); }
+
+function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
+
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) { var desc = {}; Object.keys(descriptor).forEach(function (key) { desc[key] = descriptor[key]; }); desc.enumerable = !!desc.enumerable; desc.configurable = !!desc.configurable; if ('value' in desc || desc.initializer) { desc.writable = true; } desc = decorators.slice().reverse().reduce(function (desc, decorator) { return decorator(target, property, desc) || desc; }, desc); if (context && desc.initializer !== void 0) { desc.value = desc.initializer ? desc.initializer.call(context) : void 0; desc.initializer = undefined; } if (desc.initializer === void 0) { Object.defineProperty(target, property, desc); desc = null; } return desc; }
@@ -34,15 +40,15 @@ let Test = _setComponentTemplate(_createTemplateFactory(
   "block": "[[[1,\"Hello World\"]],[],false,[]]",
   "moduleName": "(unknown template module)",
   "isStrictMode": true
-}), (_class = (_cantTouchThis = new WeakMap(), _hammerTime = new WeakSet(), class Test extends Component {
+}), (_class = (_cantTouchThis = /*#__PURE__*/new WeakMap(), _hammerTime = /*#__PURE__*/new WeakSet(), class Test extends Component {
   constructor(...args) {
     super(...args);
 
-    _hammerTime.add(this);
+    _classPrivateMethodInitSpec(this, _hammerTime);
 
     _initializerDefineProperty(this, "bar", _descriptor, this);
 
-    _cantTouchThis.set(this, {
+    _classPrivateFieldInitSpec(this, _cantTouchThis, {
       writable: true,
       value: 'mc hammer'
     });

packages/@glimmerx/helper/package.json

@@ -23,7 +23,7 @@
     "@glimmerx/core": "0.6.6",
     "@glimmer/helper": "2.0.0-beta.20",
     "@glimmer/interfaces": "0.84.0",
-    "ember-cli-babel": "7.26.2"
+    "ember-cli-babel": "^7.26.2"
   },
   "volta": {
     "node": "12.10.0",

packages/@glimmerx/modifier/package.json

@@ -22,7 +22,7 @@
   "dependencies": {
     "@glimmer/core": "2.0.0-beta.20",
     "@glimmer/modifier": "2.0.0-beta.20",
-    "ember-cli-babel": "7.26.2"
+    "ember-cli-babel": "^7.26.2"
   },
   "volta": {
     "node": "12.10.0",

packages/@glimmerx/service/package.json

@@ -23,7 +23,7 @@
     "@glimmerx/core": "0.6.6",
     "@glimmer/debug": "2.0.0-beta.20",
     "@glimmer/env": "^0.1.7",
-    "ember-cli-babel": "7.26.2"
+    "ember-cli-babel": "^7.26.2"
   },
   "volta": {
     "node": "12.10.0",

packages/examples/basic-addon/package.json

@@ -28,17 +28,18 @@
     "@glimmerx/helper": "^0.6.6",
     "@glimmerx/modifier": "^0.6.6",
     "@glimmerx/service": "^0.6.6",
-    "ember-cli-babel": "7.26.2",
+    "ember-cli-babel": "^7.26.11",
     "ember-cli-htmlbars": "^5.7.1"
   },
   "devDependencies": {
     "@ember/optional-features": "^1.3.0",
+    "@ember/test-helpers": "^2.7.0",
     "@glimmer/tracking": "2.0.0-beta.20",
     "@glimmerx/eslint-plugin": "^0.6.6",
     "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-auto-import": "^1.5.3",
-    "ember-cli": "~3.17.0",
+    "ember-auto-import": "^2.4.1",
+    "ember-cli": "~3.28.0",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-inject-live-reload": "^2.0.2",
     "ember-cli-sri": "^2.1.1",
@@ -47,7 +48,7 @@
     "ember-export-application-global": "^2.0.1",
     "ember-load-initializers": "^2.1.1",
     "ember-maybe-import-regenerator": "^0.1.6",
-    "ember-qunit": "^4.6.0",
+    "ember-qunit": "^5.1.5",
     "ember-resolver": "^7.0.0",
     "ember-source": "~3.26.0",
     "ember-source-channel-url": "^2.0.1",
@@ -58,7 +59,9 @@
     "eslint-plugin-node": "^11.1.0",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
-    "qunit-dom": "^1.1.0"
+    "qunit": "^2.18.1",
+    "qunit-dom": "^2.0.0",
+    "webpack": "^5.72.0"
   },
   "engines": {
     "node": "10.* || >= 12"
@@ -71,7 +74,7 @@
     "main": "ember-addon-main.js"
   },
   "volta": {
-    "node": "12.10.0",
+    "node": "12.22.12",
     "yarn": "1.22.4"
   }
 }

packages/examples/basic-addon/tests/index.html

@@ -21,6 +21,13 @@
     {{content-for "body"}}
     {{content-for "test-body"}}
 
+    <div id="qunit"></div>
+    <div id="qunit-fixture">
+      <div id="ember-testing-container">
+        <div id="ember-testing"></div>
+      </div>
+    </div>
+
     <script src="/testem.js" integrity=""></script>
     <script src="{{rootURL}}assets/vendor.js"></script>
     <script src="{{rootURL}}assets/test-support.js"></script>

packages/examples/basic-addon/tests/test-helper.js

@@ -2,6 +2,10 @@ import Application from '../app';
 import config from '../config/environment';
 import { setApplication } from '@ember/test-helpers';
 import { start } from 'ember-qunit';
+import * as QUnit from 'qunit';
+import { setup } from 'qunit-dom';
+
+setup(QUnit.assert);
 
 setApplication(Application.create(config.APP));
 

packages/examples/ember-app/package.json

@@ -21,14 +21,15 @@
   },
   "devDependencies": {
     "@ember/optional-features": "^1.3.0",
+    "@ember/test-helpers": "^2.7.0",
     "@glimmer/component": "^1.0.0",
     "@glimmer/tracking": "2.0.0-beta.20",
     "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-auto-import": "^1.5.3",
-    "ember-cli": "~3.17.0",
+    "ember-auto-import": "^2.4.1",
+    "ember-cli": "~3.28.0",
     "ember-cli-app-version": "^3.2.0",
-    "ember-cli-babel": "7.26.2",
+    "ember-cli-babel": "^7.26.11",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-htmlbars": "^5.7.1",
     "ember-cli-inject-live-reload": "^2.0.2",
@@ -39,7 +40,7 @@
     "ember-fetch": "^8.0.1",
     "ember-load-initializers": "^2.1.1",
     "ember-maybe-import-regenerator": "^0.1.6",
-    "ember-qunit": "^4.6.0",
+    "ember-qunit": "^5.1.5",
     "ember-resolver": "^7.0.0",
     "ember-source": "~3.26.0",
     "ember-template-lint": "^2.4.1",
@@ -49,7 +50,9 @@
     "eslint-plugin-node": "^11.1.0",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
-    "qunit-dom": "^1.1.0"
+    "qunit": "^2.18.1",
+    "qunit-dom": "^2.0.0",
+    "webpack": "^5.72.0"
   },
   "engines": {
     "node": "10.* || >= 12"
@@ -58,7 +61,7 @@
     "edition": "octane"
   },
   "volta": {
-    "node": "12.10.0",
+    "node": "12.22.12",
     "yarn": "1.22.4"
   }
 }

packages/examples/ember-app/tests/index.html

@@ -21,6 +21,13 @@
     {{content-for "body"}}
     {{content-for "test-body"}}
 
+    <div id="qunit"></div>
+    <div id="qunit-fixture">
+      <div id="ember-testing-container">
+        <div id="ember-testing"></div>
+      </div>
+    </div>
+
     <script src="/testem.js" integrity=""></script>
     <script src="{{rootURL}}assets/vendor.js"></script>
     <script src="{{rootURL}}assets/test-support.js"></script>

packages/examples/ember-app/tests/test-helper.js

@@ -2,6 +2,10 @@ import Application from '../app';
 import config from '../config/environment';
 import { setApplication } from '@ember/test-helpers';
 import { start } from 'ember-qunit';
+import * as QUnit from 'qunit';
+import { setup } from 'qunit-dom';
+
+setup(QUnit.assert);
 
 setApplication(Application.create(config.APP));