Merge pull request #821 from ember-fastboot/co-to-async

xg-wang · web-flow · commit e4d0b7c7bcdf · 2021-04-06T07:57:30.000-07:00
diff --git a/.prettierrc.js b/.prettierrc.js
@@ -0,0 +1,7 @@
+"use strict";
+
+module.exports = {
+  singleQuote: true,
+  printWidth: 100,
+  trailingComma: "es5",
+};
diff --git a/packages/ember-cli-fastboot/package.json b/packages/ember-cli-fastboot/package.json
@@ -49,7 +49,6 @@
     "chai": "^4.1.2",
     "chai-fs": "^2.0.0",
     "chai-string": "^1.4.0",
-    "co": "^4.6.0",
     "ember-ajax": "^3.1.0",
     "ember-cli": "~3.3.0",
     "ember-cli-addon-tests": "^0.11.1",
@@ -92,7 +91,6 @@
     ]
   },
   "volta": {
-    "node": "12.19.0",
-    "yarn": "1.22.5"
+    "extends": "../../package.json"
   }
 }
diff --git a/packages/ember-cli-fastboot/test/new-package-json-test.js b/packages/ember-cli-fastboot/test/new-package-json-test.js
@@ -14,100 +14,82 @@ describe('FastbootConfig', function() {
   let subject;
   let project;
 
-  beforeEach(co.wrap(function* () {
-    input = yield createTempDir();
+  beforeEach(async function() {
+    input = await createTempDir();
     project = {
-      addons: [ ],
-      pkg:    { }
+      addons: [],
+      pkg: {},
     };
     subject = new FastbootConfig(input.path(), {
       project,
       outputPaths: {
         app: { js: 'app.js' },
-        vendor: { js: 'vendor.js' }
+        vendor: { js: 'vendor.js' },
       },
       appConfig: {
-        modulePrefix: 'app'
-      }
+        modulePrefix: 'app',
+      },
     });
     output = createBuilder(subject);
-  }));
+  });
 
-  afterEach(co.wrap(function* () {
-    yield input.dispose();
-    yield output.dispose();
-  }));
+  afterEach(async function() {
+    await input.dispose();
+    await output.dispose();
+  });
 
-  it('it builds only when information changes', co.wrap(function* () {
+  it('it builds only when information changes', async function() {
     input.write({
       'index.js': `export { A } from "./lib/a";`,
-      'lib': {
+      lib: {
         'a.js': `export class A {};`,
         'b.js': `export class B {};`,
-        'c.js': `export class C {};`
-      }
+        'c.js': `export class C {};`,
+      },
     });
 
-    yield output.build();
+    await output.build();
 
-    expect(
-      output.read()
-    ).to.deep.equal({
-      'package.json': `{"dependencies":{},"fastboot":{"appName":"app","config":{"app":{"modulePrefix":"app"}},"manifest":{"appFiles":["app.js","app-fastboot.js"],"htmlFile":"index.html","vendorFiles":["vendor.js"]},"moduleWhitelist":[],"schemaVersion":3}}`
+    expect(output.read()).to.deep.equal({
+      'package.json': `{"dependencies":{},"fastboot":{"appName":"app","config":{"app":{"modulePrefix":"app"}},"manifest":{"appFiles":["app.js","app-fastboot.js"],"htmlFile":"index.html","vendorFiles":["vendor.js"]},"moduleWhitelist":[],"schemaVersion":3}}`,
     });
 
-    yield output.build();
+    await output.build();
 
-    expect(
-      output.changes()
-    ).to.deep.equal({ });
+    expect(output.changes()).to.deep.equal({});
 
-    project.pkg.fastbootDependencies = [
-      'apple',
-      'orange'
-    ];
+    project.pkg.fastbootDependencies = ['apple', 'orange'];
 
     project.pkg.dependencies = {
       apple: '*',
       orange: '^1.0.0',
-      pizza: '^1.0.0'
+      pizza: '^1.0.0',
     };
 
-    yield output.build();
+    await output.build();
 
-    expect(
-      output.changes()
-    ).to.deep.equal({
-      'package.json': 'change'
+    expect(output.changes()).to.deep.equal({
+      'package.json': 'change',
     });
 
-    expect(
-      output.read()
-    ).to.deep.equal({
-      'package.json': `{"dependencies":{"apple":"*","orange":"^1.0.0"},"fastboot":{"appName":"app","config":{"app":{"modulePrefix":"app"}},"manifest":{"appFiles":["app.js","app-fastboot.js"],"htmlFile":"index.html","vendorFiles":["vendor.js"]},"moduleWhitelist":["apple","orange"],"schemaVersion":3}}`
+    expect(output.read()).to.deep.equal({
+      'package.json': `{"dependencies":{"apple":"*","orange":"^1.0.0"},"fastboot":{"appName":"app","config":{"app":{"modulePrefix":"app"}},"manifest":{"appFiles":["app.js","app-fastboot.js"],"htmlFile":"index.html","vendorFiles":["vendor.js"]},"moduleWhitelist":["apple","orange"],"schemaVersion":3}}`,
     });
 
-    project.pkg.fastbootDependencies = [
-      'apple',
-      'orange'
-    ];
+    project.pkg.fastbootDependencies = ['apple', 'orange'];
 
     project.pkg.dependencies.pizza = '^3.0.0';
 
-    yield output.build();
+    await output.build();
 
-    expect(
-      output.changes()
-    ).to.deep.equal({ });
+    expect(output.changes()).to.deep.equal({});
 
     project.pkg.dependencies.apple = '^3.0.0';
 
-    yield output.build();
+    await output.build();
 
-    expect(
-      output.read()
-    ).to.deep.equal({
-      'package.json': `{"dependencies":{"apple":"^3.0.0","orange":"^1.0.0"},"fastboot":{"appName":"app","config":{"app":{"modulePrefix":"app"}},"manifest":{"appFiles":["app.js","app-fastboot.js"],"htmlFile":"index.html","vendorFiles":["vendor.js"]},"moduleWhitelist":["apple","orange"],"schemaVersion":3}}`
+    expect(output.read()).to.deep.equal({
+      'package.json': `{"dependencies":{"apple":"^3.0.0","orange":"^1.0.0"},"fastboot":{"appName":"app","config":{"app":{"modulePrefix":"app"}},"manifest":{"appFiles":["app.js","app-fastboot.js"],"htmlFile":"index.html","vendorFiles":["vendor.js"]},"moduleWhitelist":["apple","orange"],"schemaVersion":3}}`,
     });
-  }));
+  });
 });
diff --git a/packages/fastboot-app-server/package.json b/packages/fastboot-app-server/package.json
@@ -47,8 +47,7 @@
     "node": "10.* || 12.* || >= 14"
   },
   "volta": {
-    "node": "12.19.0",
-    "yarn": "1.22.5"
+    "extends": "../../package.json"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
diff --git a/packages/fastboot-express-middleware/.prettierrc b/packages/fastboot-express-middleware/.prettierrc
diff --git a/packages/fastboot-express-middleware/package.json b/packages/fastboot-express-middleware/package.json
@@ -47,8 +47,7 @@
     "node": "10.* || 12.* || >= 14"
   },
   "volta": {
-    "node": "12.19.0",
-    "yarn": "1.22.5"
+    "extends": "../../package.json"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
diff --git a/packages/fastboot/.prettierrc b/packages/fastboot/.prettierrc
diff --git a/packages/fastboot/package.json b/packages/fastboot/package.json
@@ -59,8 +59,7 @@
     "node": "10.* || >=12"
   },
   "volta": {
-    "node": "12.19.0",
-    "yarn": "1.22.5"
+    "extends": "../../package.json"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
diff --git a/test-packages/integration-tests/package.json b/test-packages/integration-tests/package.json
@@ -12,7 +12,6 @@
     "mocha": "^8.2.1"
   },
   "volta": {
-    "node": "12.19.0",
-    "yarn": "1.22.5"
+    "extends": "../../package.json"
   }
 }
diff --git a/yarn.lock b/yarn.lock
@@ -5549,11 +5549,6 @@ clone@^2.0.0, clone@^2.1.2:
   resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
   integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
 
-co@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
-  integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
-
 code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,6 @@`
`49`	`49`	`"chai": "^4.1.2",`
`50`	`50`	`"chai-fs": "^2.0.0",`
`51`	`51`	`"chai-string": "^1.4.0",`
`52`		`- "co": "^4.6.0",`
`53`	`52`	`"ember-ajax": "^3.1.0",`
`54`	`53`	`"ember-cli": "~3.3.0",`
`55`	`54`	`"ember-cli-addon-tests": "^0.11.1",`
`@@ -92,7 +91,6 @@`
`92`	`91`	`]`
`93`	`92`	`},`
`94`	`93`	`"volta": {`
`95`		`- "node": "12.19.0",`
`96`		`- "yarn": "1.22.5"`
	`94`	`+ "extends": "../../package.json"`
`97`	`95`	`}`
`98`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@`
`12`	`12`	`"mocha": "^8.2.1"`
`13`	`13`	`},`
`14`	`14`	`"volta": {`
`15`		`- "node": "12.19.0",`
`16`		`- "yarn": "1.22.5"`
	`15`	`+ "extends": "../../package.json"`
`17`	`16`	`}`
`18`	`17`	`}`