gkalpak · Nov 28, 2017 · May 2, 2018 · May 24, 2018 · May 24, 2018 · Apr 18, 2018
diff --git a/aio/README.md b/aio/README.md
@@ -22,8 +22,8 @@ Here are the most important tasks you might need to use:
 * `yarn start` - run a development web server that watches the files; then builds the doc-viewer and reloads the page, as necessary.
 * `yarn serve-and-sync` - run both the `docs-watch` and `start` in the same console.
 * `yarn lint` - check that the doc-viewer code follows our style rules.
-* `yarn test` - run all the unit tests once.
-* `yarn test --watch` - watch all the source files, for the doc-viewer, and run all the unit tests when any change.
+* `yarn test` - watch all the source files, for the doc-viewer, and run all the unit tests when any change.
+* `yarn test --watch=false` - run all the unit tests once.
 * `yarn e2e` - run all the e2e tests for the doc-viewer.
 
 * `yarn docs` - generate all the docs from the source files.
@@ -56,14 +56,9 @@ It's necessary to remove the temporary files, because otherwise they're displaye
 
 ## Using ServiceWorker locally
 
-Since abb36e3cb, running `yarn start --prod` will no longer set up the ServiceWorker, which
-would require manually running `yarn sw-manifest` and `yarn sw-copy` (something that is not possible
-with webpack serving the files from memory).
-
-If you want to test ServiceWorker locally, you can use `yarn build` and serve the files in `dist/`
-with `yarn http-server dist -p 4200`.
-
-For more details see #16745.
+Running `yarn start` (even when explicitly targeting production mode) does not set up the
+ServiceWorker. If you want to test the ServiceWorker locally, you can use `yarn build` and then
+serve the files in `dist/` with `yarn http-server dist -p 4200`.
 
 
 ## Guide to authoring

diff --git a/aio/angular.json b/aio/angular.json
@@ -33,7 +33,6 @@
               "src/assets",
               "src/generated",
               "src/app/search/search-worker.js",
-              "src/favicon.ico",
               "src/pwa-manifest.json",
               "src/google385281288605d160.html",
               {
@@ -62,23 +61,26 @@
                   "src": "src/environments/environment.ts",
                   "replaceWith": "src/environments/environment.next.ts"
                 }
-              ]
+              ],
+              "serviceWorker": true
             },
             "stable": {
               "fileReplacements": [
                 {
                   "src": "src/environments/environment.ts",
                   "replaceWith": "src/environments/environment.stable.ts"
                 }
-              ]
+              ],
+              "serviceWorker": true
             },
             "archive": {
               "fileReplacements": [
                 {
                   "src": "src/environments/environment.ts",
                   "replaceWith": "src/environments/environment.archive.ts"
                 }
-              ]
+              ],
+              "serviceWorker": true
             }
           }
         },
@@ -123,7 +125,6 @@
               "src/assets",
               "src/generated",
               "src/app/search/search-worker.js",
-              "src/favicon.ico",
               "src/pwa-manifest.json",
               "src/google385281288605d160.html",
               {

diff --git a/...images/logos/concept-icons/animations.png → ...es/marketing/concept-icons/animations.png b/...images/logos/concept-icons/animations.png → ...es/marketing/concept-icons/animations.png
diff --git a/...images/logos/concept-icons/animations.svg → ...es/marketing/concept-icons/animations.svg b/...images/logos/concept-icons/animations.svg → ...es/marketing/concept-icons/animations.svg
diff --git a/...ets/images/logos/concept-icons/augury.png → ...images/marketing/concept-icons/augury.png b/...ets/images/logos/concept-icons/augury.png → ...images/marketing/concept-icons/augury.png
diff --git a/...ets/images/logos/concept-icons/augury.svg → ...images/marketing/concept-icons/augury.svg b/...ets/images/logos/concept-icons/augury.svg → ...images/marketing/concept-icons/augury.svg
diff --git a/...assets/images/logos/concept-icons/cdk.png → ...nt/images/marketing/concept-icons/cdk.png b/...assets/images/logos/concept-icons/cdk.png → ...nt/images/marketing/concept-icons/cdk.png
diff --git a/...assets/images/logos/concept-icons/cdk.svg → ...nt/images/marketing/concept-icons/cdk.svg b/...assets/images/logos/concept-icons/cdk.svg → ...nt/images/marketing/concept-icons/cdk.svg
diff --git a/...assets/images/logos/concept-icons/cli.png → ...nt/images/marketing/concept-icons/cli.png b/...assets/images/logos/concept-icons/cli.png → ...nt/images/marketing/concept-icons/cli.png
diff --git a/...assets/images/logos/concept-icons/cli.svg → ...nt/images/marketing/concept-icons/cli.svg b/...assets/images/logos/concept-icons/cli.svg → ...nt/images/marketing/concept-icons/cli.svg
diff --git a/...s/images/logos/concept-icons/compiler.png → ...ages/marketing/concept-icons/compiler.png b/...s/images/logos/concept-icons/compiler.png → ...ages/marketing/concept-icons/compiler.png
diff --git a/...s/images/logos/concept-icons/compiler.svg → ...ages/marketing/concept-icons/compiler.svg b/...s/images/logos/concept-icons/compiler.svg → ...ages/marketing/concept-icons/compiler.svg
diff --git a/...images/logos/concept-icons/components.png → ...es/marketing/concept-icons/components.png b/...images/logos/concept-icons/components.png → ...es/marketing/concept-icons/components.png
diff --git a/...images/logos/concept-icons/components.svg → ...es/marketing/concept-icons/components.svg b/...images/logos/concept-icons/components.svg → ...es/marketing/concept-icons/components.svg
diff --git a/...os/concept-icons/dependency-injection.png → ...ng/concept-icons/dependency-injection.png b/...os/concept-icons/dependency-injection.png → ...ng/concept-icons/dependency-injection.png
diff --git a/...os/concept-icons/dependency-injection.svg → ...ng/concept-icons/dependency-injection.svg b/...os/concept-icons/dependency-injection.svg → ...ng/concept-icons/dependency-injection.svg
diff --git a/...sets/images/logos/concept-icons/forms.png → .../images/marketing/concept-icons/forms.png b/...sets/images/logos/concept-icons/forms.png → .../images/marketing/concept-icons/forms.png
diff --git a/...sets/images/logos/concept-icons/forms.svg → .../images/marketing/concept-icons/forms.svg b/...sets/images/logos/concept-icons/forms.svg → .../images/marketing/concept-icons/forms.svg
diff --git a/...ssets/images/logos/concept-icons/http.png → ...t/images/marketing/concept-icons/http.png b/...ssets/images/logos/concept-icons/http.png → ...t/images/marketing/concept-icons/http.png
diff --git a/...ssets/images/logos/concept-icons/http.svg → ...t/images/marketing/concept-icons/http.svg b/...ssets/images/logos/concept-icons/http.svg → ...t/images/marketing/concept-icons/http.svg
diff --git a/...ssets/images/logos/concept-icons/i18n.png → ...t/images/marketing/concept-icons/i18n.png b/...ssets/images/logos/concept-icons/i18n.png → ...t/images/marketing/concept-icons/i18n.png
diff --git a/...ssets/images/logos/concept-icons/i18n.svg → ...t/images/marketing/concept-icons/i18n.svg b/...ssets/images/logos/concept-icons/i18n.svg → ...t/images/marketing/concept-icons/i18n.svg
diff --git a/...sets/images/logos/concept-icons/karma.png → .../images/marketing/concept-icons/karma.png b/...sets/images/logos/concept-icons/karma.png → .../images/marketing/concept-icons/karma.png
diff --git a/...sets/images/logos/concept-icons/karma.svg → .../images/marketing/concept-icons/karma.svg b/...sets/images/logos/concept-icons/karma.svg → .../images/marketing/concept-icons/karma.svg
diff --git a/...ssets/images/logos/concept-icons/labs.png → ...t/images/marketing/concept-icons/labs.png b/...ssets/images/logos/concept-icons/labs.png → ...t/images/marketing/concept-icons/labs.png
diff --git a/...ssets/images/logos/concept-icons/labs.svg → ...t/images/marketing/concept-icons/labs.svg b/...ssets/images/logos/concept-icons/labs.svg → ...t/images/marketing/concept-icons/labs.svg
diff --git a/...logos/concept-icons/language-services.png → ...eting/concept-icons/language-services.png b/...logos/concept-icons/language-services.png → ...eting/concept-icons/language-services.png
diff --git a/...logos/concept-icons/language-services.svg → ...eting/concept-icons/language-services.svg b/...logos/concept-icons/language-services.svg → ...eting/concept-icons/language-services.svg
diff --git a/...ages/logos/concept-icons/lazy-loading.png → .../marketing/concept-icons/lazy-loading.png b/...ages/logos/concept-icons/lazy-loading.png → .../marketing/concept-icons/lazy-loading.png
diff --git a/...ages/logos/concept-icons/lazy-loading.svg → .../marketing/concept-icons/lazy-loading.svg b/...ages/logos/concept-icons/lazy-loading.svg → .../marketing/concept-icons/lazy-loading.svg
diff --git a/.../images/logos/concept-icons/libraries.png → ...ges/marketing/concept-icons/libraries.png b/.../images/logos/concept-icons/libraries.png → ...ges/marketing/concept-icons/libraries.png
diff --git a/.../images/logos/concept-icons/libraries.svg → ...ges/marketing/concept-icons/libraries.svg b/.../images/logos/concept-icons/libraries.svg → ...ges/marketing/concept-icons/libraries.svg
diff --git a/...s/images/logos/concept-icons/material.png → ...ages/marketing/concept-icons/material.png b/...s/images/logos/concept-icons/material.png → ...ages/marketing/concept-icons/material.png
diff --git a/...s/images/logos/concept-icons/material.svg → ...ages/marketing/concept-icons/material.svg b/...s/images/logos/concept-icons/material.svg → ...ages/marketing/concept-icons/material.svg
diff --git a/...mages/logos/concept-icons/performance.png → ...s/marketing/concept-icons/performance.png b/...mages/logos/concept-icons/performance.png → ...s/marketing/concept-icons/performance.png
diff --git a/...mages/logos/concept-icons/performance.svg → ...s/marketing/concept-icons/performance.svg b/...mages/logos/concept-icons/performance.svg → ...s/marketing/concept-icons/performance.svg
diff --git a/...images/logos/concept-icons/protractor.png → ...es/marketing/concept-icons/protractor.png b/...images/logos/concept-icons/protractor.png → ...es/marketing/concept-icons/protractor.png
diff --git a/...images/logos/concept-icons/protractor.svg → ...es/marketing/concept-icons/protractor.svg b/...images/logos/concept-icons/protractor.svg → ...es/marketing/concept-icons/protractor.svg
diff --git a/...assets/images/logos/concept-icons/pwa.png → ...nt/images/marketing/concept-icons/pwa.png b/...assets/images/logos/concept-icons/pwa.png → ...nt/images/marketing/concept-icons/pwa.png
diff --git a/...assets/images/logos/concept-icons/pwa.svg → ...nt/images/marketing/concept-icons/pwa.svg b/...assets/images/logos/concept-icons/pwa.svg → ...nt/images/marketing/concept-icons/pwa.svg
diff --git a/...ets/images/logos/concept-icons/router.png → ...images/marketing/concept-icons/router.png b/...ets/images/logos/concept-icons/router.png → ...images/marketing/concept-icons/router.png
diff --git a/...ets/images/logos/concept-icons/router.svg → ...images/marketing/concept-icons/router.svg b/...ets/images/logos/concept-icons/router.svg → ...images/marketing/concept-icons/router.svg
diff --git a/.../images/logos/concept-icons/templates.png → ...ges/marketing/concept-icons/templates.png b/.../images/logos/concept-icons/templates.png → ...ges/marketing/concept-icons/templates.png
diff --git a/.../images/logos/concept-icons/templates.svg → ...ges/marketing/concept-icons/templates.svg b/.../images/logos/concept-icons/templates.svg → ...ges/marketing/concept-icons/templates.svg
diff --git a/.../images/logos/concept-icons/universal.png → ...ges/marketing/concept-icons/universal.png b/.../images/logos/concept-icons/universal.png → ...ges/marketing/concept-icons/universal.png
diff --git a/.../images/logos/concept-icons/universal.svg → ...ges/marketing/concept-icons/universal.svg b/.../images/logos/concept-icons/universal.svg → ...ges/marketing/concept-icons/universal.svg
diff --git a/aio/content/images/marketing/home/ng-atl.png b/aio/content/images/marketing/home/ng-atl.png
diff --git a/aio/content/images/marketing/home/ng-conf.png b/aio/content/images/marketing/home/ng-conf.png
diff --git a/aio/content/marketing/presskit.html b/aio/content/marketing/presskit.html
diff --git a/aio/firebase.json b/aio/firebase.json
@@ -9,7 +9,7 @@
       //////////////////////////////////////////////////////////////////////////////////////////////
       // README:
       //   Redirects must also be handled by the ServiceWorker. If you add a redirect rule here,
-      //   make sure the routing RegExp in `ngsw-manifest.json` is updated accordingly.
+      //   make sure it is compatible with the configuration in `ngsw-config.json`.
       //////////////////////////////////////////////////////////////////////////////////////////////
 
       // A random bad indexed page that used `api/api`
@@ -104,7 +104,12 @@
       {"type": 301, "source": "/guide/ngmodule", "destination": "/guide/ngmodules"},
       {"type": 301, "source": "/guide/learning-angular*", "destination": "/guide/quickstart"},
       {"type": 301, "source": "/testing", "destination": "/guide/testing"},
-      {"type": 301, "source": "/testing/**", "destination": "/guide/testing"}
+      {"type": 301, "source": "/testing/**", "destination": "/guide/testing"},
+
+      // Strip off the `.html` extension, because Firebase will not do this automatically any more
+      // (unless the new URL points to an existing file, which is not necessarily the case here).
+      {"type": 301, "source": "/:somePath*/:file.html", "destination": "/:somePath*/:file"},
+      {"type": 301, "source": "/:topLevelFile.html", "destination": "/:topLevelFile"}
     ],
     "rewrites": [
       {

diff --git a/aio/ngsw-config.json b/aio/ngsw-config.json
@@ -0,0 +1,128 @@
+{
+  "index": "/index.html",
+  "assetGroups": [
+    {
+      "name": "app-shell",
+      "installMode": "prefetch",
+      "updateMode": "prefetch",
+      "resources": {
+        "files": [
+          "/index.html",
+          "/pwa-manifest.json",
+          "/app/search/search-worker.js",
+          "/assets/images/favicons/favicon.ico",
+          "/assets/js/*.js",
+          "/*.css",
+          "/*.js"
+        ],
+        "urls": [
+          "https://fonts.googleapis.com/**",
+          "https://fonts.gstatic.com/s/**",
+          "https://maxcdn.bootstrapcdn.com/**"
+        ]
+      }
+    }, {
+      "name": "assets-eager",
+      "installMode": "prefetch",
+      "updateMode": "prefetch",
+      "resources": {
+        "files": [
+          "/assets/images/**",
+          "/generated/images/marketing/**",
+          "!/assets/images/favicons/**",
+          "!/**/_unused/**"
+        ]
+      }
+    }, {
+      "name": "assets-lazy",
+      "installMode": "lazy",
+      "updateMode": "prefetch",
+      "resources": {
+        "files": [
+          "/assets/images/favicons/**",
+          "/generated/ie-polyfills.min.js",
+          "!/**/_unused/**"
+        ]
+      }
+    }, {
+      "name": "docs-index",
+      "installMode": "prefetch",
+      "updateMode": "prefetch",
+      "resources": {
+        "files": [
+          "/generated/*.json",
+          "/generated/docs/*.json",
+          "/generated/docs/api/api-list.json",
+          "/generated/docs/app/search-data.json"
+        ]
+      }
+    }, {
+      "name": "docs-lazy",
+      "installMode": "lazy",
+      "updateMode": "lazy",
+      "resources": {
+        "files": [
+          "/generated/docs/**/*.json",
+          "/generated/images/**",
+          "!/**/_unused/**"
+        ]
+      }
+    }
+  ],
+  "navigationUrls": [
+    "/**",
+    "!/**/*.*",
+    "!/**/*__*",
+    "!/**/*__*/**",
+    "!/**/stackblitz",
+    "!/**/stackblitz.html",
+    "!/api/*/**/*-*",
+    "!/api/**/AnimationStateDeclarationMetadata*",
+    "!/api/**/CORE_DIRECTIVES*",
+    "!/api/**/DirectiveMetadata*",
+    "!/api/**/HTTP_PROVIDERS*",
+    "!/api/**/NgFor",
+    "!/api/**/NgFor-*",
+    "!/api/**/PLATFORM_PIPES*",
+    "!/api/animate/**",
+    "!/api/api/**",
+    "!/api/common/Control*",
+    "!/api/common/MaxLengthValidator*",
+    "!/api/common/NgModel*",
+    "!/api/platform-browser/AnimationDriver*",
+    "!/api/testing/**",
+    "!/docs/?*",
+    "!/docs/*/**",
+    "!/guide/cli-quickstart",
+    "!/guide/cli-quickstart.html",
+    "!/guide/cli-quickstart/",
+    "!/guide/learning-angular",
+    "!/guide/learning-angular.html",
+    "!/guide/learning-angular/",
+    "!/guide/metadata",
+    "!/guide/metadata.html",
+    "!/guide/metadata/",
+    "!/guide/ngmodule",
+    "!/guide/ngmodule.html",
+    "!/guide/ngmodule/",
+    "!/guide/service-worker-getstart",
+    "!/guide/service-worker-getstart.html",
+    "!/guide/service-worker-getstart/",
+    "!/guide/service-worker-comm",
+    "!/guide/service-worker-comm.html",
+    "!/guide/service-worker-comm/",
+    "!/guide/service-worker-configref",
+    "!/guide/service-worker-configref.html",
+    "!/guide/service-worker-configref/",
+    "!/guide/webpack",
+    "!/guide/webpack.html",
+    "!/guide/webpack/",
+    "!/news",
+    "!/news.html",
+    "!/news/",
+    "!/styleguide",
+    "!/styleguide/**",
+    "!/testing",
+    "!/testing/**"
+  ]
+}
diff --git a/aio/ngsw-manifest.json b/aio/ngsw-manifest.json
diff --git a/aio/package.json b/aio/package.json
@@ -8,7 +8,7 @@
   "scripts": {
     "preinstall": "node ../tools/yarn/check-yarn.js",
     "postinstall": "node tools/cli-patches/patch.js && uglifyjs node_modules/lunr/lunr.js -c -m -o src/assets/js/lunr.min.js --source-map",
-    "aio-use-local": "node tools/ng-packages-installer overwrite . --debug --ignore-packages @angular/service-worker",
+    "aio-use-local": "node tools/ng-packages-installer overwrite . --debug",
     "aio-use-npm": "node tools/ng-packages-installer restore .",
     "aio-check-local": "node tools/ng-packages-installer check .",
     "ng": "yarn check-env && ng",
@@ -56,52 +56,45 @@
     "boilerplate:test": "node tools/examples/test.js",
     "generate-stackblitz": "node ./tools/stackblitz-builder/generateStackblitz",
     "generate-zips": "node ./tools/example-zipper/generateZips",
-    "sw-manifest": "ngu-sw-manifest --dist dist --in ngsw-manifest.json --out dist/ngsw-manifest.json",
-    "sw-copy": "cp node_modules/@angular/service-worker/bundles/worker-basic.min.js dist/",
     "build-404-page": "node scripts/build-404-page",
     "build-ie-polyfills": "yarn webpack-cli src/ie-polyfills.js -o src/generated/ie-polyfills.min.js --mode production",
     "update-webdriver": "webdriver-manager update --standalone false --gecko false $CHROMEDRIVER_VERSION_ARG",
     "~~check-env": "node scripts/check-environment",
     "~~clean-generated": "node --eval \"require('shelljs').rm('-rf', 'src/generated')\"",
     "~~build": "ng build",
-    "post~~build": "yarn build-404-page && yarn sw-manifest && yarn sw-copy"
+    "post~~build": "yarn build-404-page"
   },
   "engines": {
     "node": ">=10.9.0 <11.0.0",
     "yarn": ">=1.9.2 <2.0.0"
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "6.0.0",
-    "@angular/cdk": "6.0.0",
-    "@angular/common": "6.0.0",
-    "@angular/core": "6.0.0",
-    "@angular/elements": "6.0.0",
-    "@angular/forms": "6.0.0",
-    "@angular/http": "6.0.0",
-    "@angular/material": "6.0.0",
-    "@angular/platform-browser": "6.0.0",
-    "@angular/platform-browser-dynamic": "6.0.0",
-    "@angular/platform-server": "6.0.0",
-    "@angular/router": "6.0.0",
-    "@angular/service-worker": "^1.0.0-beta.16",
+    "@angular/animations": "^7.0.0-beta.7",
+    "@angular/cdk": "6.0.2",
+    "@angular/common": "^7.0.0-beta.7",
+    "@angular/core": "^7.0.0-beta.7",
+    "@angular/elements": "^7.0.0-beta.7",
+    "@angular/forms": "^7.0.0-beta.7",
+    "@angular/material": "6.0.2",
+    "@angular/platform-browser": "^7.0.0-beta.7",
+    "@angular/platform-browser-dynamic": "^7.0.0-beta.7",
+    "@angular/router": "^7.0.0-beta.7",
+    "@angular/service-worker": "^7.0.0-beta.7",
     "@webcomponents/custom-elements": "^1.2.0",
     "classlist.js": "^1.1.20150312",
     "core-js": "^2.4.1",
-    "jasmine": "^2.6.0",
-    "ng-pwa-tools": "^0.0.10",
-    "rxjs": "6.0.0-uncanny-rc.7",
-    "rxjs-compat": "6.0.0-uncanny-rc.7",
+    "rxjs": "6.2.2",
     "tslib": "^1.9.0",
     "web-animations-js": "^2.2.5",
     "zone.js": "^0.8.26"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^0.6.0",
-    "@angular/cli": "^6.0.0",
-    "@angular/compiler": "6.0.0",
-    "@angular/compiler-cli": "6.0.0",
-    "@angular/language-service": "6.0.0",
+    "@angular-devkit/build-angular": "^0.8.3",
+    "@angular/cli": "^6.2.3",
+    "@angular/compiler": "^7.0.0-beta.7",
+    "@angular/compiler-cli": "^7.0.0-beta.7",
+    "@angular/language-service": "^7.0.0-beta.7",
     "@types/jasmine": "^2.5.52",
     "@types/jasminewd2": "^2.0.3",
     "@types/node": "~6.0.60",
@@ -127,6 +120,7 @@
     "http-server": "^0.9.0",
     "ignore": "^3.3.3",
     "image-size": "^0.5.1",
+    "jasmine": "^2.6.0",
     "jasmine-core": "^2.8.0",
     "jasmine-marbles": "^0.3.1",
     "jasmine-spec-reporter": "^4.1.0",
@@ -152,7 +146,7 @@
     "tree-kill": "^1.1.0",
     "ts-node": "^3.3.0",
     "tslint": "~5.9.1",
-    "typescript": "~2.7.2",
+    "typescript": "3.0",
     "uglify-js": "^3.0.15",
     "unist-util-filter": "^0.2.1",
     "unist-util-source": "^1.0.1",

diff --git a/aio/scripts/_payload-limits.json b/aio/scripts/_payload-limits.json
@@ -2,11 +2,11 @@
   "aio": {
     "master": {
       "uncompressed": {
-        "runtime": 2768,
-        "main": 476338,
-        "polyfills": 53922,
+        "runtime": 3173,
+        "main": 483270,
+        "polyfills": 53920,
         "prettify": 14913
       }
     }
   }
-}
+}