Merge pull request #803 from kiwiupover/dave/custom-fastboot-app

Author: Robert Jackson

.github/workflows/ci.yml

@@ -88,3 +88,5 @@ jobs:
         run: yarn install --ignore-engines --frozen-lockfile
       - name: Basic App
         run: yarn workspace basic-app test:mocha
+      - name: Custom App
+        run: yarn workspace custom-fastboot-app test:mocha

packages/ember-cli-fastboot/.eslintrc.js

@@ -15,6 +15,8 @@ module.exports = {
     browser: true
   },
   rules: {
+    'ember/no-get': 'warn',
+    'ember/require-computed-property-dependencies': 'warn'
   },
   overrides: [
     // node files

packages/ember-cli-fastboot/test/custom-html-file-test.js

@@ -11,49 +11,6 @@ chai.use(require('chai-fs'));
 describe('generating package.json', function() {
   this.timeout(300000);
 
-  describe('with customized fingerprinting options', function() {
-    // Tests an app with a custom `assetMapPath` set
-    let customApp = new AddonTestApp();
-
-    before(function() {
-      return customApp.create('customized-fingerprinting', { emberVersion: 'latest'})
-        .then(function() {
-          return customApp.runEmberCommand('build', '--environment=production');
-        });
-    });
-
-    it('respects a custom asset map path and prepended URLs', function() {
-      expect(customApp.filePath('dist/totally-customized-asset-map.json')).to.be.a.file();
-
-      function p(filePath) {
-        return customApp.filePath(path.join('dist', filePath));
-      }
-
-      let pkg = fs.readJsonSync(customApp.filePath('/dist/package.json'));
-      let manifest = pkg.fastboot.manifest;
-
-      manifest.appFiles.forEach(function(file) {
-        expect(p(file)).to.be.a.file();
-      });
-      expect(p(manifest.htmlFile)).to.be.a.file();
-      manifest.vendorFiles.forEach(function(file) {
-        expect(p(file)).to.be.a.file();
-      });
-    });
-
-    it('respects individual files being excluded from fingerprinting', function() {
-      expect(customApp.filePath('dist/totally-customized-asset-map.json')).to.be.a.file();
-
-      let pkg = fs.readJsonSync(customApp.filePath('/dist/package.json'));
-      let manifest = pkg.fastboot.manifest;
-
-      // customized-fingerprinting-fastboot.js is excluded from fingerprinting
-      expect(manifest.appFiles).to.include('assets/customized-fingerprinting-fastboot.js');
-      // vendor.js is excluded from fingerprinting
-      expect(manifest.vendorFiles).to.include('assets/vendor.js');
-    });
-  });
-
   describe('with customized outputPaths options', function() {
     // Tests an app with a custom `outputPaths` set
     let customApp = new AddonTestApp();
@@ -85,30 +42,5 @@ describe('generating package.json', function() {
       });
     });
   });
-
-  describe('with custom htmlFile', function() {
-    this.timeout(300000);
-
-    let customApp = new AddonTestApp();
-
-    before(function() {
-      return customApp.create('custom-html-file')
-        .then(function() {
-          return customApp.runEmberCommand('build', '--environment=production');
-        });
-    });
-
-    it('uses custom htmlFile in the manifest', function() {
-      function p(filePath) {
-        return customApp.filePath(path.join('dist', filePath));
-      }
-
-      let pkg = fs.readJsonSync(customApp.filePath('/dist/package.json'));
-      let manifest = pkg.fastboot.manifest;
-
-      expect(manifest.htmlFile).to.equal('custom-index.html');
-      expect(p(manifest.htmlFile)).to.be.a.file();
-    });
-  });
 });
 

packages/ember-cli-fastboot/test/fixtures/custom-html-file/app/app.js

@@ -0,0 +1,19 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+
+[*.hbs]
+insert_final_newline = false
+
+[*.{diff,md}]
+trim_trailing_whitespace = false