feat(angular): update to 9 official

NathanWalker · NathanWalker · commit e4dc30115de5 · 2020-02-17T12:57:37.000-08:00
diff --git a/e2e/ivy-sample/package.json b/e2e/ivy-sample/package.json
@@ -5,29 +5,30 @@
       "version": "6.2.0"
     },
     "tns-ios": {
-      "version": "6.2.0"
+      "version": "6.3.0-2020-01-07-173547-01"
     }
   },
   "description": "NativeScript Application",
   "license": "SEE LICENSE IN <your-license-filename>",
   "repository": "<fill-your-repository-here>",
   "dependencies": {
-    "@angular/animations": "9.0.0-rc.3",
-    "@angular/common": "9.0.0-rc.3",
-    "@angular/compiler": "9.0.0-rc.3",
-    "@angular/core": "9.0.0-rc.3",
-    "@angular/forms": "9.0.0-rc.3",
-    "@angular/platform-browser": "9.0.0-rc.3",
-    "@angular/platform-browser-dynamic": "9.0.0-rc.3",
-    "@angular/router": "9.0.0-rc.3",
+    "@angular/animations": "~9.0.1",
+    "@angular/common": "~9.0.1",
+    "@angular/compiler": "~9.0.1",
+    "@angular/compiler-cli": "~9.0.1",
+    "@angular/core": "~9.0.1",
+    "@angular/forms": "~9.0.1",
+    "@angular/platform-browser": "~9.0.1",
+    "@angular/platform-browser-dynamic": "~9.0.1",
+    "@angular/router": "~9.0.1",
     "@nativescript/theme": "~2.2.0",
     "kinvey-nativescript-sdk": "~4.2.5",
-    "nativescript-angular": "file:../../dist/nativescript-angular-compat.tgz",
+    "@nativescript/angular": "file:../../nativescript-angular/nativescript-angular-9.0.0.tgz",
     "nativescript-background-http": "~4.2.1",
     "nativescript-bottom-navigation": "~2.0.5",
     "nativescript-brightness": "~1.0.1",
     "nativescript-camera": "~4.5.0",
-    "nativescript-cloud": "~1.19.3",
+    "nativescript-cloud": "~1.20.0",
     "nativescript-directions": "~1.3.1",
     "nativescript-downloader": "~2.1.5",
     "nativescript-drop-down": "~5.0.4",
@@ -51,14 +52,14 @@
     "nativescript-ui-listview": "~8.0.1",
     "nativescript-ui-sidedrawer": "~8.0.0",
     "reflect-metadata": "~0.1.12",
-    "rxjs": "^6.4.0",
+    "rxjs": "^6.5.0",
     "tns-core-modules": "~6.3.0",
     "tslib": "~1.10.0",
     "zone.js": "~0.10.2"
   },
   "devDependencies": {
-    "@angular/compiler-cli": "next",
-    "@ngtools/webpack": "next",
+    "@angular/compiler-cli": "~9.0.1",
+    "@ngtools/webpack": "~9.0.1",
     "nativescript-dev-webpack": "~1.4.0",
     "typescript": "~3.6.4"
   },
diff --git a/e2e/ivy-sample/src/app/app-routing.module.ts b/e2e/ivy-sample/src/app/app-routing.module.ts
@@ -1,5 +1,5 @@
 import { NgModule } from "@angular/core";
-import { NativeScriptRouterModule } from "nativescript-angular/router";
+import { NativeScriptRouterModule } from "@nativescript/angular";
 import { Routes } from "@angular/router";
 
 import { ItemsComponent } from "./item/items.component";
diff --git a/e2e/ivy-sample/src/app/app.module.ts b/e2e/ivy-sample/src/app/app.module.ts
@@ -1,5 +1,5 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
-import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { NativeScriptModule } from "@nativescript/angular";
 
 import { AppRoutingModule } from "./app-routing.module";
 import { AppComponent } from "./app.component";
diff --git a/e2e/ivy-sample/src/main.ts b/e2e/ivy-sample/src/main.ts
@@ -1,5 +1,5 @@
 // this import should be first in order to load some required settings (like globals and reflect-metadata)
-import { platformNativeScriptDynamic } from "nativescript-angular/platform";
+import { platformNativeScriptDynamic } from '@nativescript/angular/platform';
 
 import { AppModule } from "./app/app.module";
 
diff --git a/e2e/ivy-sample/webpack.config.js b/e2e/ivy-sample/webpack.config.js
@@ -7,7 +7,7 @@ const { nsReplaceBootstrap } = require("nativescript-dev-webpack/transformers/ns
 const { nsReplaceLazyLoader } = require("nativescript-dev-webpack/transformers/ns-replace-lazy-loader");
 const { nsSupportHmrNg } = require("nativescript-dev-webpack/transformers/ns-support-hmr-ng");
 const { getMainModulePath } = require("nativescript-dev-webpack/utils/ast-utils");
-const { getNoEmitOnErrorFromTSConfig } = require("nativescript-dev-webpack/utils/tsconfig-utils");
+const { getNoEmitOnErrorFromTSConfig, getCompilerOptionsFromTSConfig } = require("nativescript-dev-webpack/utils/tsconfig-utils");
 const CleanWebpackPlugin = require("clean-webpack-plugin");
 const CopyWebpackPlugin = require("copy-webpack-plugin");
 const { BundleAnalyzerPlugin } = require("webpack-bundle-analyzer");
@@ -60,8 +60,28 @@ module.exports = env => {
     const isAnySourceMapEnabled = !!sourceMap || !!hiddenSourceMap;
     const externals = nsWebpack.getConvertedExternals(env.externals);
     const appFullPath = resolve(projectRoot, appPath);
-    const appResourcesFullPath = resolve(projectRoot, appResourcesPath);
     const tsConfigName = "tsconfig.tns.json";
+    const tsConfigPath = join(__dirname, tsConfigName);
+    const hasRootLevelScopedModules = nsWebpack.hasRootLevelScopedModules({ projectDir: projectRoot });
+    const hasRootLevelScopedAngular = nsWebpack.hasRootLevelScopedAngular({ projectDir: projectRoot });
+    let coreModulesPackageName = "tns-core-modules";
+    const alias = {
+        '~': appFullPath
+    };
+
+    const compilerOptions = getCompilerOptionsFromTSConfig(tsConfigPath);
+    if (hasRootLevelScopedModules) {
+        coreModulesPackageName = "@nativescript/core";
+        alias["tns-core-modules"] = coreModulesPackageName;
+        nsWebpack.processTsPathsForScopedModules({ compilerOptions });
+    }
+
+    if (hasRootLevelScopedAngular) {
+        alias["nativescript-angular"] = "@nativescript/angular";
+        nsWebpack.processTsPathsForScopedAngular({ compilerOptions });
+    }
+
+    const appResourcesFullPath = resolve(projectRoot, appResourcesPath);
     const entryModule = `${nsWebpack.getEntryModule(appFullPath, platform)}.ts`;
     const entryPath = `.${sep}${entryModule}`;
     const entries = { bundle: entryPath };
@@ -98,10 +118,11 @@ module.exports = env => {
         hostReplacementPaths: nsWebpack.getResolver([platform, "tns"]),
         platformTransformers: ngCompilerTransformers.map(t => t(() => ngCompilerPlugin, resolve(appFullPath, entryModule), projectRoot)),
         mainPath: join(appFullPath, entryModule),
-        tsConfigPath: join(__dirname, tsConfigName),
+        tsConfigPath,
         skipCodeGeneration: !aot,
         sourceMap: !!isAnySourceMapEnabled,
-        additionalLazyModuleResources: additionalLazyModuleResources
+        additionalLazyModuleResources: additionalLazyModuleResources,
+        compilerOptions: { paths: compilerOptions.paths }
     });
 
     let sourceMapFilename = nsWebpack.getSourceMapFilename(hiddenSourceMap, __dirname, dist);
@@ -141,14 +162,12 @@ module.exports = env => {
             extensions: [".ts", ".js", ".scss", ".css"],
             // Resolve {N} system modules from tns-core-modules
             modules: [
-                resolve(__dirname, "node_modules/tns-core-modules"),
+                resolve(__dirname, `node_modules/${coreModulesPackageName}`),
                 resolve(__dirname, "node_modules"),
-                "node_modules/tns-core-modules",
+                `node_modules/${coreModulesPackageName}`,
                 "node_modules",
             ],
-            alias: {
-                '~': appFullPath
-            },
+            alias,
             symlinks: true
         },
         resolveLoader: {
diff --git a/nativescript-angular-package/package.json b/nativescript-angular-package/package.json
@@ -26,17 +26,17 @@
         "@nativescript/angular": "../dist/nativescript-angular-scoped.tgz"
     },
     "devDependencies": {
-        "@angular/animations": "9.0.0-rc.3",
-        "@angular/common": "9.0.0-rc.3",
-        "@angular/compiler": "9.0.0-rc.3",
-        "@angular/compiler-cli": "9.0.0-rc.3",
-        "@angular/core": "9.0.0-rc.3",
-        "@angular/forms": "9.0.0-rc.3",
-        "@angular/platform-browser": "9.0.0-rc.3",
-        "@angular/platform-browser-dynamic": "9.0.0-rc.3",
-        "@angular/router": "9.0.0-rc.3",
-        "rxjs": "^6.4.0",
-        "tns-core-modules": "next",
+        "@angular/animations": "~9.0.1",
+        "@angular/common": "~9.0.1",
+        "@angular/compiler": "~9.0.1",
+        "@angular/compiler-cli": "~9.0.1",
+        "@angular/core": "~9.0.1",
+        "@angular/forms": "~9.0.1",
+        "@angular/platform-browser": "~9.0.1",
+        "@angular/platform-browser-dynamic": "~9.0.1",
+        "@angular/router": "~9.0.1",
+        "rxjs": "^6.5.0",
+        "tns-core-modules": "~6.3.0",
         "typescript": "~3.6.4",
         "zone.js": "~0.10.2"
     },
diff --git a/nativescript-angular/package.json b/nativescript-angular/package.json
@@ -42,33 +42,33 @@
     "reflect-metadata": "^0.1.8"
   },
   "peerDependencies": {
-    "@angular/platform-browser-dynamic": "9.0.0-rc.3",
-    "@angular/common": "9.0.0-rc.3",
-    "@angular/compiler": "9.0.0-rc.3",
-    "@angular/core": "9.0.0-rc.3",
-    "@angular/forms": "9.0.0-rc.3",
-    "@angular/platform-browser": "9.0.0-rc.3",
-    "@angular/router": "9.0.0-rc.3",
+    "@angular/platform-browser-dynamic": "~9.0.0",
+    "@angular/common": "~9.0.0",
+    "@angular/compiler": "~9.0.0",
+    "@angular/core": "~9.0.0",
+    "@angular/forms": "~9.0.0",
+    "@angular/platform-browser": "~9.0.0",
+    "@angular/router": "~9.0.0",
     "rxjs": "^6.4.0",
     "tns-core-modules": "^6.2.0 || >6.3.0-",
     "typescript": "~3.6.4",
     "tslib": "~1.10.0",
     "zone.js": "~0.10.2"
   },
   "devDependencies": {
-    "@angular/animations": "9.0.0-rc.3",
-    "@angular/common": "9.0.0-rc.3",
-    "@angular/compiler": "9.0.0-rc.3",
-    "@angular/compiler-cli": "9.0.0-rc.3",
-    "@angular/core": "9.0.0-rc.3",
-    "@angular/forms": "9.0.0-rc.3",
-    "@angular/platform-browser": "9.0.0-rc.3",
-    "@angular/platform-browser-dynamic": "9.0.0-rc.3",
-    "@angular/router": "9.0.0-rc.3",
-    "codelyzer": "^5.1.0",
+    "@angular/animations": "~9.0.1",
+    "@angular/common": "~9.0.1",
+    "@angular/compiler": "~9.0.1",
+    "@angular/compiler-cli": "~9.0.1",
+    "@angular/core": "~9.0.1",
+    "@angular/forms": "~9.0.1",
+    "@angular/platform-browser": "~9.0.1",
+    "@angular/platform-browser-dynamic": "~9.0.1",
+    "@angular/router": "~9.0.1",
+    "codelyzer": "^5.2.0",
     "conventional-changelog-cli": "^1.3.22",
-    "rxjs": "^6.4.0",
-    "tns-core-modules": "next",
+    "rxjs": "^6.5.0",
+    "tns-core-modules": "~6.3.0",
     "tslint": "^5.5.0",
     "typescript": "~3.6.4",
     "zone.js": "~0.10.2",
diff --git a/nativescript-angular/testing/src/util.ts b/nativescript-angular/testing/src/util.ts
@@ -91,23 +91,29 @@ export function nsTestBedBeforeEach(
     entryComponents: any[] = []) {
     return (done) => {
         activeTestFixtures.push([]);
+        imports.unshift(NativeScriptModule);
         // If there are no entry components we can take the simple path.
         if (entryComponents.length === 0) {
             TestBed.configureTestingModule({
-                declarations: [...components],
-                providers: [...providers],
-                imports: [NativeScriptModule, ...imports]
+                declarations: components,
+                providers: providers,
+                imports: imports
             });
         } else {
             // If there are entry components, we have to reset the testing platform.
             //
             // There's got to be a better way... (o_O)
             TestBed.resetTestEnvironment();
-            @NgModule({
-                declarations: entryComponents,
-                exports: entryComponents,
-                entryComponents: entryComponents
-            })
+            // TODO: this currently causes:
+            /**
+             * ../nativescript-angular/testing/src/util.ts:108:31 - error NG1010: Expected array when reading the NgModule.declarations of EntryComponentsTestModule
+                   declarations: entryComponents,
+             */
+            // @NgModule({
+            //     declarations: entryComponents,
+            //     exports: entryComponents,
+            //     entryComponents: entryComponents
+            // })
             class EntryComponentsTestModule {
             }
             TestBed.initTestEnvironment(
diff --git a/tests/package.json b/tests/package.json
@@ -19,24 +19,24 @@
   ],
   "homepage": "http://nativescript.org",
   "dependencies": {
-    "@angular/animations": "~8.2.0",
-    "@angular/common": "~8.2.0",
-    "@angular/compiler": "~8.2.0",
-    "@angular/core": "~8.2.0",
-    "@angular/forms": "~8.2.0",
-    "@angular/platform-browser": "~8.2.0",
-    "@angular/platform-browser-dynamic": "~8.2.0",
-    "@angular/router": "~8.2.0",
+    "@angular/animations": "~9.0.1",
+    "@angular/common": "~9.0.1",
+    "@angular/compiler": "~9.0.1",
+    "@angular/core": "~9.0.1",
+    "@angular/forms": "~9.0.1",
+    "@angular/platform-browser": "~9.0.1",
+    "@angular/platform-browser-dynamic": "~9.0.1",
+    "@angular/router": "~9.0.1",
     "nativescript-angular": "../nativescript-angular-package",
     "nativescript-unit-test-runner": "0.7.0",
-    "rxjs": "^6.4.0",
-    "tns-core-modules": "next",
+    "rxjs": "^6.5.0",
+    "tns-core-modules": "~6.3.0",
     "tslib": "~1.10.0",
     "zone.js": "~0.10.2"
   },
   "devDependencies": {
-    "@angular/compiler-cli": "8.0.0",
-    "@ngtools/webpack": "8.0.0",
+    "@angular/compiler-cli": "~9.0.1",
+    "@ngtools/webpack": "~9.0.1",
     "@types/chai": "^4.1.4",
     "@types/karma-chai": "0.1.1",
     "@types/mocha": "5.2.7",
@@ -54,7 +54,7 @@
     "karma-webpack": "3.0.5",
     "lazy": "1.0.11",
     "mocha": "6.1.4",
-    "nativescript-dev-webpack": "next",
+    "nativescript-dev-webpack": "~1.4.0",
     "remove-strict-webpack-plugin": "~0.1.2",
     "sinon": "^7.3.2",
     "tslint": "^4.5.1",
