refactor: remove {N} extend of AngularCompilerPlugin

Author: sis0k0

index.js

@@ -4,19 +4,12 @@ const { existsSync } = require("fs");
 const { ANDROID_APP_PATH } = require("./androidProjectHelpers");
 const {
     getPackageJson,
-    isAngular,
     isAndroid,
     isIos,
 } = require("./projectHelpers");
 
 Object.assign(exports, require('./plugins'));
 
-exports.loadAdditionalPlugins = function (projectSettings) {
-    if (isAngular(projectSettings)) {
-        Object.assign(exports, require('./plugins/angular')(projectSettings.projectDir));
-    }
-}
-
 exports.getAotEntryModule = function (appDirectory) {
 	verifyEntryModuleDirectory(appDirectory);
 

package.json

@@ -77,7 +77,6 @@
     "tapable": "1.0.0"
   },
   "devDependencies": {
-    "@ngtools/webpack": "~6.0.3",
     "@types/node": "^8.0.0",
     "conventional-changelog-cli": "^1.3.22",
     "source-map-support": "^0.5.0",

plugins/NativeScriptAngularCompilerPlugin.ts

@@ -8,6 +8,7 @@ const CopyWebpackPlugin = require("copy-webpack-plugin");
 const { BundleAnalyzerPlugin } = require("webpack-bundle-analyzer");
 const { NativeScriptWorkerPlugin } = require("nativescript-worker-loader/NativeScriptWorkerPlugin");
 const UglifyJsPlugin = require("uglifyjs-webpack-plugin");
+const { AngularCompilerPlugin } = require("@ngtools/webpack");
 
 module.exports = env => {
     // Add your custom Activities, Services and other Android app components here.
@@ -21,9 +22,7 @@ module.exports = env => {
         throw new Error("You need to provide a target platform!");
     }
 
-    const platforms = ["ios", "android"];
     const projectRoot = __dirname;
-    nsWebpack.loadAdditionalPlugins({ projectDir: projectRoot });
 
     // Default destination inside platforms/<platform>/...
     const dist = resolve(projectRoot, nsWebpack.getAppPath(platform, projectRoot));
@@ -220,15 +219,11 @@ module.exports = env => {
             // For instructions on how to set up workers with webpack
             // check out https://github.com/nativescript/worker-loader
             new NativeScriptWorkerPlugin(),
-            // AngularCompilerPlugin with augmented NativeScript filesystem to handle platform specific resource resolution.
-            new nsWebpack.NativeScriptAngularCompilerPlugin({
+
+            new AngularCompilerPlugin({
                 entryModule: resolve(appPath, "app.module#AppModule"),
                 tsConfigPath: join(__dirname, "tsconfig.esm.json"),
                 skipCodeGeneration: !aot,
-                platformOptions: {
-                    platform,
-                    platforms,
-                },
             }),
             // Does IPC communication with the {N} CLI to notify events when running in watch mode.
             new nsWebpack.WatchStateLoggerPlugin(),

plugins/angular.js

@@ -23,7 +23,6 @@ module.exports = env => {
 
     const platforms = ["ios", "android"];
     const projectRoot = __dirname;
-    nsWebpack.loadAdditionalPlugins({ projectDir: projectRoot });
 
     // Default destination inside platforms/<platform>/...
     const dist = resolve(projectRoot, nsWebpack.getAppPath(platform, projectRoot));

templates/webpack.angular.js

@@ -23,7 +23,6 @@ module.exports = env => {
 
     const platforms = ["ios", "android"];
     const projectRoot = __dirname;
-    nsWebpack.loadAdditionalPlugins({ projectDir: projectRoot });
 
     // Default destination inside platforms/<platform>/...
     const dist = resolve(projectRoot, nsWebpack.getAppPath(platform, projectRoot));

templates/webpack.javascript.js

@@ -8,8 +8,7 @@
         "skipLibCheck": true
     },
     "files": [
-        "plugins/NativeScriptAngularCompilerPlugin.ts",
         "plugins/PlatformFSPlugin.ts",
         "plugins/WatchStateLoggerPlugin.ts"
     ]
-}
+}