Revert back to put config in dist/package.json

xg-wang · xg-wang · commit e66da344937c · 2021-04-07T11:55:28.000-07:00
diff --git a/packages/ember-cli-fastboot/lib/broccoli/fastboot-config.js b/packages/ember-cli-fastboot/lib/broccoli/fastboot-config.js
@@ -37,7 +37,7 @@ module.exports = class FastBootConfig extends Plugin {
     } else {
       this.htmlFile = 'index.html';
     }
-    
+
     this.prepareConfig();
     this.prepareDependencies();
   }
diff --git a/packages/fastboot/src/html-entrypoint.js b/packages/fastboot/src/html-entrypoint.js
@@ -4,7 +4,7 @@ const { JSDOM } = require('jsdom');
 const fs = require('fs');
 const path = require('path');
 
-function htmlEntrypoint(appName, distPath, htmlPath, config) {
+function htmlEntrypoint(appName, distPath, htmlPath, config = {}) {
   let html = fs.readFileSync(path.join(distPath, htmlPath), 'utf8');
   let dom = new JSDOM(html);
   let scripts = [];
diff --git a/packages/fastboot/test/fixtures/html-entrypoint/package.json b/packages/fastboot/test/fixtures/html-entrypoint/package.json
@@ -4,6 +4,30 @@
   "fastboot": {
     "schemaVersion": 5,
     "moduleWhitelist": [],
-    "htmlEntrypoint": "index.html"
+    "htmlEntrypoint": "index.html",
+    "config": {
+      "fastboot-test": {
+        "modulePrefix": "fastboot-test",
+        "environment": "development",
+        "rootURL": "/",
+        "locationType": "auto",
+        "EmberENV": {
+          "FEATURES": {},
+          "EXTEND_PROTOTYPES": {
+            "Date": false
+          },
+          "_APPLICATION_TEMPLATE_WRAPPER": false,
+          "_DEFAULT_ASYNC_OBSERVERS": true,
+          "_JQUERY_INTEGRATION": false,
+          "_TEMPLATE_ONLY_GLIMMER_COMPONENTS": true
+        },
+        "APP": {
+          "name": "fastboot-test",
+          "version": "0.0.0+e168a770",
+          "autoboot": false
+        },
+        "exportApplicationGlobal": true
+      }
+    }
   }
 }
diff --git a/packages/fastboot/test/fixtures/onerror-per-visit/assets/onerror-per-visit.js b/packages/fastboot/test/fixtures/onerror-per-visit/assets/onerror-per-visit.js
diff --git a/packages/fastboot/test/html-entrypoint-test.js b/packages/fastboot/test/html-entrypoint-test.js
@@ -219,36 +219,18 @@ describe('htmlEntrypoint', function() {
     expect(scripts).to.deep.equal([]);
   });
 
-  it('extracts configs from meta', function() {
-    let tmpobj = tmp.dirSync();
-    let tmpLocation = tmpobj.name;
-
-    let project = {
-      'index.html': `
-        <html>
-          <meta name="my-app/config/environment" content="%7B%22rootURL%22%3A%22%2Fcustom-root-url%2F%22%7D" >
-          <body>
-            <script src="/custom-root-url/bar.js"></script>
-          </body>
-        </html>
-      `,
-    };
-
-    fixturify.writeSync(tmpLocation, project);
-    let { config } = htmlEntrypoint('my-app', tmpLocation, 'index.html');
-    expect(config).to.deep.equal({
-      'my-app': { APP: { autoboot: false }, rootURL: '/custom-root-url/' },
-    });
-  });
-
   it('understands customized rootURL', function() {
     let tmpobj = tmp.dirSync();
     let tmpLocation = tmpobj.name;
+    let config = {
+      'my-app': {
+        rootURL: '/custom-root-url/',
+      },
+    };
 
     let project = {
       'index.html': `
         <html>
-          <meta name="my-app/config/environment" content="%7B%22rootURL%22%3A%22%2Fcustom-root-url%2F%22%7D" >
           <body>
             <script src="/custom-root-url/bar.js"></script>
           </body>
@@ -258,7 +240,7 @@ describe('htmlEntrypoint', function() {
 
     fixturify.writeSync(tmpLocation, project);
 
-    let { scripts } = htmlEntrypoint('my-app', tmpLocation, 'index.html');
+    let { scripts } = htmlEntrypoint('my-app', tmpLocation, 'index.html', config);
     expect(scripts).to.deep.equal([`${tmpLocation}/bar.js`]);
   });
 });

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ module.exports = class FastBootConfig extends Plugin {`
`37`	`37`	`} else {`
`38`	`38`	`this.htmlFile = 'index.html';`
`39`	`39`	`}`
`40`		`-`
	`40`	`+`
`41`	`41`	`this.prepareConfig();`
`42`	`42`	`this.prepareDependencies();`
`43`	`43`	`}`