Merge pull request #775 from bertdeblock/fix-ci

Author: kategengler

.github/workflows/ci.yml

@@ -16,8 +16,8 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v1
-    - uses: actions/setup-node@v1
+    - uses: actions/checkout@v3
+    - uses: actions/setup-node@v3
       with:
         node-version: 12.x
     - name: install dependencies
@@ -38,8 +38,8 @@ jobs:
         node-version: [12.x, 14.x]
 
     steps:
-    - uses: actions/checkout@v1
-    - uses: actions/setup-node@v1
+    - uses: actions/checkout@v3
+    - uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node-version }}
     - name: install dependencies
@@ -56,8 +56,8 @@ jobs:
     needs: [test, lint]
 
     steps:
-    - uses: actions/checkout@v1
-    - uses: actions/setup-node@v1
+    - uses: actions/checkout@v3
+    - uses: actions/setup-node@v3
       with:
         node-version: 12.x
     - name: install dependencies
@@ -93,8 +93,8 @@ jobs:
          - with-ember-cli-htmlbars-inline-precompile
 
     steps:
-    - uses: actions/checkout@v1
-    - uses: actions/setup-node@v1
+    - uses: actions/checkout@v3
+    - uses: actions/setup-node@v3
       with:
         node-version: 12.x
     - name: install dependencies

config/ember-try.js

@@ -12,17 +12,25 @@ module.exports = async function () {
         npm: {
           devDependencies: {
             'ember-source': '~3.8.0',
+            'ember-styleguide': '^5.0.0',
             'ember-cli': '~3.8.0',
           },
+          ember: {
+            edition: 'classic',
+          },
         },
       },
       {
         name: 'ember-lts-3.12',
         npm: {
           devDependencies: {
             'ember-source': '~3.12.0',
+            'ember-styleguide': '^5.0.0',
             'ember-cli': '~3.12.0',
           },
+          ember: {
+            edition: 'classic',
+          },
         },
       },
       {

config/environment.js

@@ -5,7 +5,7 @@ module.exports = function (environment) {
     modulePrefix: 'ember-cli-htmlbars',
     environment,
     rootURL: '/',
-    locationType: 'auto',
+    locationType: 'history',
     EmberENV: {
       FEATURES: {
         // Here you can enable experimental features on an ember canary build

package.json

@@ -72,14 +72,13 @@
     "ember-cli-babel": "^7.26.6",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-inject-live-reload": "^2.1.0",
-    "ember-export-application-global": "^2.0.1",
     "ember-load-initializers": "^2.1.1",
     "ember-maybe-import-regenerator": "^0.1.6",
     "ember-qunit": "^5.1.4",
     "ember-resolver": "^8.0.2",
     "ember-source": "~3.28.0",
     "ember-source-channel-url": "^3.0.0",
-    "ember-styleguide": "^5.0.0",
+    "ember-styleguide": "^8.4.0",
     "ember-template-lint": "^3.6.0",
     "ember-try": "^1.4.0",
     "eslint": "^7.32.0",
@@ -106,6 +105,9 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
+  "ember": {
+    "edition": "octane"
+  },
   "ember-addon": {
     "main": "lib/ember-addon-main.js",
     "configPath": "tests/dummy/config"

tests/dummy/config/environment.js

@@ -5,7 +5,7 @@ module.exports = function (environment) {
     modulePrefix: 'dummy',
     environment,
     rootURL: '/',
-    locationType: 'auto',
+    locationType: 'history',
     EmberENV: {
       FEATURES: {
         // Here you can enable experimental features on an ember canary build