From b53a85a7b8b862627f0322ca9daf7411904bc14c Mon Sep 17 00:00:00 2001 From: SvetoslavTsenov Date: Thu, 6 Jun 2019 19:44:16 +0300 Subject: [PATCH 1/3] chore: create release branch --- demo-angular/package.json | 10 +++++----- demo-angular/webpack.config.js | 15 ++++++++++++--- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/demo-angular/package.json b/demo-angular/package.json index 0577e72..a52cb31 100644 --- a/demo-angular/package.json +++ b/demo-angular/package.json @@ -6,10 +6,10 @@ "nativescript": { "id": "org.nativescript.webworkerdemo", "tns-ios": { - "version": "next" + "version": "latest" }, "tns-android": { - "version": "next" + "version": "latest" } }, "dependencies": { @@ -22,11 +22,11 @@ "@angular/platform-browser": "8.0.0", "@angular/platform-browser-dynamic": "8.0.0", "@angular/router": "8.0.0", - "nativescript-angular": "next", + "nativescript-angular": "latest", "nativescript-theme-core": "~1.0.2", "reflect-metadata": "~0.1.8", "rxjs": "^6.3.3", - "tns-core-modules": "next", + "tns-core-modules": "latest", "zone.js": "^0.8.4" }, "devDependencies": { @@ -46,7 +46,7 @@ "nativescript-css-loader": "~0.26.0", "nativescript-dev-appium": "next", "nativescript-dev-typescript": "next", - "nativescript-dev-webpack": "next", + "nativescript-dev-webpack": "latest", "ts-loader": "^5.3.0", "typescript": "~3.4.5" }, diff --git a/demo-angular/webpack.config.js b/demo-angular/webpack.config.js index 309ff73..a57f5cf 100644 --- a/demo-angular/webpack.config.js +++ b/demo-angular/webpack.config.js @@ -234,14 +234,13 @@ module.exports = env => { { test: /(?:\.ngfactory\.js|\.ngstyle\.js|\.ts)$/, - exclude: /.worker.ts$/, use: [ "nativescript-dev-webpack/moduleid-compat-loader", "nativescript-dev-webpack/lazy-ngmodule-hot-loader", "@ngtools/webpack", ] }, - { test: /\.worker.ts$/, loader: "ts-loader" }, + // Mark files inside `@angular/core` as using SystemJS style dynamic imports. // Removing this will cause deprecation warnings to appear. { @@ -264,7 +263,17 @@ module.exports = env => { { from: { glob: "**/*.jpg" } }, { from: { glob: "**/*.png" } }, ], { ignore: [`${relative(appPath, appResourcesFullPath)}/**`] }), - new nsWebpack.GenerateNativeScriptEntryPointsPlugin("bundle"), + // Generate a bundle starter script and activate it in package.json + new nsWebpack.GenerateBundleStarterPlugin( + // Don't include `runtime.js` when creating a snapshot. The plugin + // configures the WebPack runtime to be generated inside the snapshot + // module and no `runtime.js` module exist. + (snapshot ? [] : ["./runtime"]) + .concat([ + "./vendor", + "./bundle", + ]) + ), // For instructions on how to set up workers with webpack // check out https://github.com/nativescript/worker-loader new NativeScriptWorkerPlugin(), From 99954225aeb2286ef1797beb8c63d78c7dad1fa5 Mon Sep 17 00:00:00 2001 From: SvetoslavTsenov Date: Thu, 6 Jun 2019 21:00:31 +0300 Subject: [PATCH 2/3] chore: revert config --- demo-angular/webpack.config.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/demo-angular/webpack.config.js b/demo-angular/webpack.config.js index a57f5cf..e0bb0d3 100644 --- a/demo-angular/webpack.config.js +++ b/demo-angular/webpack.config.js @@ -234,13 +234,14 @@ module.exports = env => { { test: /(?:\.ngfactory\.js|\.ngstyle\.js|\.ts)$/, + exclude: /.worker.ts$/, use: [ "nativescript-dev-webpack/moduleid-compat-loader", "nativescript-dev-webpack/lazy-ngmodule-hot-loader", "@ngtools/webpack", ] }, - + { test: /\.worker.ts$/, loader: "ts-loader" }, // Mark files inside `@angular/core` as using SystemJS style dynamic imports. // Removing this will cause deprecation warnings to appear. { From ef8c859430398f51eff860d9da4ec0de22d221d8 Mon Sep 17 00:00:00 2001 From: SvetoslavTsenov Date: Mon, 22 Jul 2019 16:16:31 +0300 Subject: [PATCH 3/3] remove ns-dev-typescript --- demo-angular/package.json | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/demo-angular/package.json b/demo-angular/package.json index a52cb31..ba4572c 100644 --- a/demo-angular/package.json +++ b/demo-angular/package.json @@ -13,21 +13,21 @@ } }, "dependencies": { - "@angular/animations": "8.0.0", - "@angular/common": "8.0.0", - "@angular/compiler": "8.0.0", - "@angular/core": "8.0.0", - "@angular/forms": "8.0.0", + "@angular/animations": "~8.0.0", + "@angular/common": "~8.0.0", + "@angular/compiler": "~8.0.0", + "@angular/core": "~8.0.0", + "@angular/forms": "~8.0.0", "@angular/http": "8.0.0-beta.10", - "@angular/platform-browser": "8.0.0", - "@angular/platform-browser-dynamic": "8.0.0", - "@angular/router": "8.0.0", + "@angular/platform-browser": "~8.0.0", + "@angular/platform-browser-dynamic": "~8.0.0", + "@angular/router": "~8.0.0", "nativescript-angular": "latest", "nativescript-theme-core": "~1.0.2", "reflect-metadata": "~0.1.8", "rxjs": "^6.3.3", "tns-core-modules": "latest", - "zone.js": "^0.8.4" + "zone.js": "^0.9.1" }, "devDependencies": { "@angular/compiler-cli": "8.0.0", @@ -45,7 +45,6 @@ "mochawesome": "~3.1.2", "nativescript-css-loader": "~0.26.0", "nativescript-dev-appium": "next", - "nativescript-dev-typescript": "next", "nativescript-dev-webpack": "latest", "ts-loader": "^5.3.0", "typescript": "~3.4.5"