refactor: remove support for Angular 2 and 4

Author: clydin

package.json

@@ -56,7 +56,6 @@
     "copy-webpack-plugin": "~4.4.1",
     "core-object": "^3.1.0",
     "ember-cli-string-utils": "^1.0.0",
-    "enhanced-resolve": "^3.4.1",
     "extract-text-webpack-plugin": "^3.0.2",
     "file-loader": "^1.1.5",
     "fs-extra": "^4.0.0",

packages/@angular/cli/models/webpack-configs/production.ts

@@ -1,20 +1,16 @@
-import * as path from 'path';
 import * as webpack from 'webpack';
 import * as fs from 'fs';
 import * as semver from 'semver';
 import { stripIndent } from 'common-tags';
 import { LicenseWebpackPlugin } from 'license-webpack-plugin';
 import { PurifyPlugin } from '@angular-devkit/build-optimizer';
 import { BundleBudgetPlugin } from '../../plugins/bundle-budget';
-import { StaticAssetPlugin } from '../../plugins/static-asset';
-import { GlobCopyWebpackPlugin } from '../../plugins/glob-copy-webpack-plugin';
 import { WebpackConfigOptions } from '../webpack-config';
 import { resolveProjectModule } from '../../utilities/require-project-module';
 import { NEW_SW_VERSION } from '../../utilities/service-worker';
 
 const UglifyJSPlugin = require('uglifyjs-webpack-plugin');
 
-const OLD_SW_VERSION = '>= 1.0.0-beta.5 < 2.0.0';
 
 /**
  * license-webpack-plugin has a peer dependency on webpack-sources, list it in a comment to
@@ -28,7 +24,6 @@ export function getProdConfig(wco: WebpackConfigOptions) {
   const { projectRoot, buildOptions, appConfig } = wco;
 
   let extraPlugins: any[] = [];
-  let entryPoints: { [key: string]: string[] } = {};
 
   if (appConfig.serviceWorker) {
     let swPackageJsonPath;
@@ -48,70 +43,15 @@ export function getProdConfig(wco: WebpackConfigOptions) {
     // expected version.
     const swPackageJson = fs.readFileSync(swPackageJsonPath).toString();
     const swVersion = JSON.parse(swPackageJson)['version'];
-
-    const isLegacySw = semver.satisfies(swVersion, OLD_SW_VERSION);
     const isModernSw = semver.gte(swVersion, NEW_SW_VERSION);
 
-    if (!isLegacySw && !isModernSw) {
+    if (!isModernSw) {
       throw new Error(stripIndent`
         The installed version of @angular/service-worker is ${swVersion}. This version of the CLI
-        requires the @angular/service-worker version to satisfy ${OLD_SW_VERSION}. Please upgrade
+        requires the @angular/service-worker version to satisfy ${NEW_SW_VERSION}. Please upgrade
         your service worker version.
       `);
     }
-
-    if (isLegacySw) {
-      // Path to the @angular/service-worker package
-      const swModule = path.dirname(swPackageJsonPath);
-
-      // Path to the worker script itself.
-      const workerPath = path.resolve(swModule, 'bundles/worker-basic.min.js');
-
-      // Path to a small script to register a service worker.
-      const registerPath = path.resolve(swModule, 'build/assets/register-basic.min.js');
-
-      // Sanity check - both of these files should be present in @angular/service-worker.
-      if (!fs.existsSync(workerPath) || !fs.existsSync(registerPath)) {
-        throw new Error(stripIndent`
-          The installed version of @angular/service-worker isn't supported by the CLI.
-          Please install a supported version. The following files should exist:
-          - ${registerPath}
-          - ${workerPath}
-        `);
-      }
-
-      // CopyWebpackPlugin replaces GlobCopyWebpackPlugin, but AngularServiceWorkerPlugin depends
-      // on specific behaviour from latter.
-      // AngularServiceWorkerPlugin expects the ngsw-manifest.json to be present in the 'emit' phase
-      // but with CopyWebpackPlugin it's only there on 'after-emit'.
-      // So for now we keep it here, but if AngularServiceWorkerPlugin changes we remove it.
-      extraPlugins.push(new GlobCopyWebpackPlugin({
-        patterns: [
-          'ngsw-manifest.json',
-          { glob: 'ngsw-manifest.json',
-            input: path.resolve(projectRoot, appConfig.root), output: '' }
-        ],
-        globOptions: {
-          cwd: projectRoot,
-          optional: true,
-        },
-      }));
-
-      // Load the Webpack plugin for manifest generation and install it.
-      const AngularServiceWorkerPlugin = require('@angular/service-worker/build/webpack')
-        .AngularServiceWorkerPlugin;
-      extraPlugins.push(new AngularServiceWorkerPlugin({
-        baseHref: buildOptions.baseHref || '/',
-      }));
-
-      // Copy the worker script into assets.
-      const workerContents = fs.readFileSync(workerPath).toString();
-      extraPlugins.push(new StaticAssetPlugin('worker-basic.min.js', workerContents));
-
-      // Add a script to index.html that registers the service worker.
-      // TODO(alxhub): inline this script somehow.
-      entryPoints['sw-register'] = [registerPath];
-    }
   }
 
   extraPlugins.push(new BundleBudgetPlugin({
@@ -145,7 +85,6 @@ export function getProdConfig(wco: WebpackConfigOptions) {
   }
 
   return {
-    entry: entryPoints,
     plugins: [
       new webpack.EnvironmentPlugin({
         'NODE_ENV': 'production'

packages/@angular/cli/models/webpack-configs/typescript.ts

@@ -1,8 +1,6 @@
 import * as path from 'path';
 import { stripIndent } from 'common-tags';
 import {
-  AotPlugin,
-  AotPluginOptions,
   AngularCompilerPlugin,
   AngularCompilerPluginOptions,
   PLATFORM
@@ -80,47 +78,31 @@ function _createAotPlugin(wco: WebpackConfigOptions, options: any, useMain = tru
     };
   }
 
-  if (AngularCompilerPlugin.isSupported()) {
-    const additionalLazyModules: { [module: string]: string } = {};
-    if (appConfig.lazyModules) {
-      for (const lazyModule of appConfig.lazyModules) {
-        additionalLazyModules[lazyModule] = path.resolve(
-          projectRoot,
-          appConfig.root,
-          lazyModule,
-        );
-      }
+  const additionalLazyModules: { [module: string]: string } = {};
+  if (appConfig.lazyModules) {
+    for (const lazyModule of appConfig.lazyModules) {
+      additionalLazyModules[lazyModule] = path.resolve(
+        projectRoot,
+        appConfig.root,
+        lazyModule,
+      );
     }
-
-    const pluginOptions: AngularCompilerPluginOptions = Object.assign({}, {
-      mainPath: useMain ? path.join(projectRoot, appConfig.root, appConfig.main) : undefined,
-      i18nInFile: buildOptions.i18nFile,
-      i18nInFormat: buildOptions.i18nFormat,
-      i18nOutFile: buildOptions.i18nOutFile,
-      i18nOutFormat: buildOptions.i18nOutFormat,
-      locale: buildOptions.locale,
-      platform: appConfig.platform === 'server' ? PLATFORM.Server : PLATFORM.Browser,
-      missingTranslation: buildOptions.missingTranslation,
-      hostReplacementPaths,
-      sourceMap: buildOptions.sourcemaps,
-      additionalLazyModules,
-    }, options);
-    return new AngularCompilerPlugin(pluginOptions);
-  } else {
-    const pluginOptions: AotPluginOptions = Object.assign({}, {
-      mainPath: path.join(projectRoot, appConfig.root, appConfig.main),
-      i18nFile: buildOptions.i18nFile,
-      i18nFormat: buildOptions.i18nFormat,
-      locale: buildOptions.locale,
-      replaceExport: appConfig.platform === 'server',
-      missingTranslation: buildOptions.missingTranslation,
-      hostReplacementPaths,
-      sourceMap: buildOptions.sourcemaps,
-      // If we don't explicitely list excludes, it will default to `['**/*.spec.ts']`.
-      exclude: []
-    }, options);
-    return new AotPlugin(pluginOptions);
   }
+
+  const pluginOptions: AngularCompilerPluginOptions = Object.assign({}, {
+    mainPath: useMain ? path.join(projectRoot, appConfig.root, appConfig.main) : undefined,
+    i18nInFile: buildOptions.i18nFile,
+    i18nInFormat: buildOptions.i18nFormat,
+    i18nOutFile: buildOptions.i18nOutFile,
+    i18nOutFormat: buildOptions.i18nOutFormat,
+    locale: buildOptions.locale,
+    platform: appConfig.platform === 'server' ? PLATFORM.Server : PLATFORM.Browser,
+    missingTranslation: buildOptions.missingTranslation,
+    hostReplacementPaths,
+    sourceMap: buildOptions.sourcemaps,
+    additionalLazyModules,
+  }, options);
+  return new AngularCompilerPlugin(pluginOptions);
 }
 
 export function getNonAotConfig(wco: WebpackConfigOptions) {
@@ -136,67 +118,34 @@ export function getNonAotConfig(wco: WebpackConfigOptions) {
 export function getAotConfig(wco: WebpackConfigOptions) {
   const { projectRoot, buildOptions, appConfig } = wco;
   const tsConfigPath = path.resolve(projectRoot, appConfig.root, appConfig.tsconfig);
-  const testTsConfigPath = path.resolve(projectRoot, appConfig.root, appConfig.testTsconfig);
 
-  let pluginOptions: any = { tsConfigPath };
-
-  // Fallback to exclude spec files from AoT compilation on projects using a shared tsconfig.
-  if (testTsConfigPath === tsConfigPath) {
-    let exclude = [ '**/*.spec.ts' ];
-    if (appConfig.test) {
-      exclude.push(path.join(projectRoot, appConfig.root, appConfig.test));
-    }
-    pluginOptions.exclude = exclude;
-  }
-
-  let boLoader: any = [];
+  const loaders: any[] = [ webpackLoader ];
   if (buildOptions.buildOptimizer) {
-    boLoader = [{
+    loaders.unshift({
       loader: '@angular-devkit/build-optimizer/webpack-loader',
       options: { sourceMap: buildOptions.sourcemaps }
-    }];
+    });
   }
 
-  const test = AngularCompilerPlugin.isSupported()
-    ? /(?:\.ngfactory\.js|\.ngstyle\.js|\.ts)$/
-    : /\.ts$/;
+  const test = /(?:\.ngfactory\.js|\.ngstyle\.js|\.ts)$/;
 
   return {
-    module: { rules: [{ test, use: [...boLoader, webpackLoader] }] },
-    plugins: [ _createAotPlugin(wco, pluginOptions) ]
+    module: { rules: [{ test, use: loaders }] },
+    plugins: [ _createAotPlugin(wco, { tsConfigPath }) ]
   };
 }
 
 export function getNonAotTestConfig(wco: WebpackConfigOptions) {
   const { projectRoot, appConfig } = wco;
   const tsConfigPath = path.resolve(projectRoot, appConfig.root, appConfig.testTsconfig);
-  const appTsConfigPath = path.resolve(projectRoot, appConfig.root, appConfig.tsconfig);
 
   let pluginOptions: any = { tsConfigPath, skipCodeGeneration: true };
 
-  if (AngularCompilerPlugin.isSupported()) {
-    if (appConfig.polyfills) {
-      // TODO: remove singleFileIncludes for 2.0, this is just to support old projects that did not
-      // include 'polyfills.ts' in `tsconfig.spec.json'.
-      const polyfillsPath = path.resolve(projectRoot, appConfig.root, appConfig.polyfills);
-      pluginOptions.singleFileIncludes = [polyfillsPath];
-    }
-  } else {
-    // The options below only apply to AoTPlugin.
-    // Force include main and polyfills.
-    // This is needed for AngularCompilerPlugin compatibility with existing projects,
-    // since TS compilation there is stricter and tsconfig.spec.ts doesn't include them.
-    const include = [appConfig.main, appConfig.polyfills, '**/*.spec.ts'];
-    if (appConfig.test) {
-      include.push(appConfig.test);
-    }
-
-    pluginOptions.include = include;
-
-    // Fallback to correct module format on projects using a shared tsconfig.
-    if (tsConfigPath === appTsConfigPath) {
-      pluginOptions.compilerOptions = { module: 'commonjs' };
-    }
+  if (appConfig.polyfills) {
+    // TODO: remove singleFileIncludes for 2.0, this is just to support old projects that did not
+    // include 'polyfills.ts' in `tsconfig.spec.json'.
+    const polyfillsPath = path.resolve(projectRoot, appConfig.root, appConfig.polyfills);
+    pluginOptions.singleFileIncludes = [polyfillsPath];
   }
 
   return {

packages/@angular/cli/plugins/glob-copy-webpack-plugin.ts

@@ -1,7 +1,6 @@
 // Exports the webpack plugins we use internally.
 export { BaseHrefWebpackPlugin } from '../lib/base-href-webpack/base-href-webpack-plugin';
 export { CleanCssWebpackPlugin, CleanCssWebpackPluginOptions } from './cleancss-webpack-plugin';
-export { GlobCopyWebpackPlugin, GlobCopyWebpackPluginOptions } from './glob-copy-webpack-plugin';
 export { BundleBudgetPlugin, BundleBudgetPluginOptions } from './bundle-budget';
 export { NamedLazyChunksWebpackPlugin } from './named-lazy-chunks-webpack-plugin';
 export { ScriptsWebpackPlugin, ScriptsWebpackPluginOptions } from './scripts-webpack-plugin';