Import htmlSafe from the correct location (#55)

* Import htmlSafe from the correct location

* Update GH Actions config for the release-1.x branch

* Bump version

.github/workflows/ci.yml

@@ -6,7 +6,7 @@ on:
   push:
     # filtering branches here prevents duplicate builds from pull_request and push
     branches:
-      - master
+      - 'release-1.x'
       - 'v*'
     # always run CI for tags
     tags:
@@ -25,32 +25,10 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v1
         with:
-          node-version: 10
+          node-version: 16
       - name: Install Dependencies
         run: yarn install --frozen-lockfile
       - name: Lint
         run: yarn lint
       - name: Test
         run: yarn test:ember
-
-  test-try:
-    name: Ember Try
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        scenario:
-          - ember-lts-3.8
-          - ember-release
-          - ember-beta
-          - ember-canary
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v1
-      - name: Install Node
-        uses: actions/setup-node@v1
-        with:
-          node-version: 10
-      - name: Install Dependencies
-        run: yarn install --frozen-lockfile
-      - name: Try Scenario
-        run: yarn ember try:one ${{ matrix.scenario }}

addon/-private/environment/index.js

@@ -1,6 +1,6 @@
 import { makeArray } from '@ember/array';
 import { set, get } from '@ember/object';
-import { isHTMLSafe } from '@ember/string';
+import { isHTMLSafe } from '@ember/template';
 import createEnvComputed from './create-env-computed';
 import EnvironmentData from './data';
 import EnvironmentArray from './array';

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-exclaim",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "An addon allowing apps to expose declarative, JSON-configurable custom UIs backed by Ember components",
   "keywords": [
     "ember-addon"
@@ -29,7 +29,7 @@
     "botanist": "^1.3.0",
     "ember-auto-import": "^1.12.0",
     "ember-cli-babel": "^7.26.3",
-    "ember-cli-htmlbars": "^5.7.1"
+    "ember-cli-htmlbars": "^6.3.0"
   },
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",

tests/unit/environment-test.js

@@ -6,7 +6,7 @@ import Environment, {
   wrap,
   resolvePath,
 } from 'ember-exclaim/-private/environment';
-import { htmlSafe } from '@ember/string';
+import { htmlSafe } from '@ember/template';
 
 module('Unit | environment', function () {
   test('simple lookups', function (assert) {