@@ -43,10 +43,9 @@ export class MigrateController extends UpdateControllerBase implements IMigrateC
43
43
{ packageName : "tns-platform-declarations" , isDev : true , verifiedVersion : "6.0.0-rc-2019-06-28-175837-02" } ,
44
44
{ packageName : "node-sass" , isDev : true , verifiedVersion : "4.12.0" } ,
45
45
{ packageName : "typescript" , isDev : true , verifiedVersion : "3.4.1" } ,
46
- { packageName : "less" , isDev : true , verifiedVersion : "3.9.0" } ,
47
46
{ packageName : "nativescript-dev-sass" , isDev : true , replaceWith : "node-sass" } ,
48
47
{ packageName : "nativescript-dev-typescript" , isDev : true , replaceWith : "typescript" } ,
49
- { packageName : "nativescript-dev-less" , isDev : true , replaceWith : "less " } ,
48
+ { packageName : "nativescript-dev-less" , isDev : true , remove : true , warning : "LESS CSS is not supported out of the box. In order to enable it, follow the steps in this feature request: https://github.com/NativeScript/nativescript-dev-webpack/issues/967 " } ,
50
49
{ packageName : constants . WEBPACK_PLUGIN_NAME , isDev : true , shouldAddIfMissing : true , verifiedVersion : "1.0.0-rc-2019-07-02-161545-02" } ,
51
50
{ packageName : "nativescript-camera" , verifiedVersion : "4.5.0" } ,
52
51
{ packageName : "nativescript-geolocation" , verifiedVersion : "5.1.0" } ,
@@ -134,7 +133,7 @@ export class MigrateController extends UpdateControllerBase implements IMigrateC
134
133
return true ;
135
134
}
136
135
137
- if ( hasDependency && dependency . replaceWith ) {
136
+ if ( hasDependency && ( dependency . replaceWith || dependency . remove ) ) {
138
137
return true ;
139
138
}
140
139
@@ -259,15 +258,21 @@ export class MigrateController extends UpdateControllerBase implements IMigrateC
259
258
260
259
private async migrateDependency ( dependency : IMigrationDependency , projectData : IProjectData ) : Promise < void > {
261
260
const hasDependency = this . hasDependency ( dependency , projectData ) ;
261
+ if ( dependency . warning ) {
262
+ this . $logger . warn ( dependency . warning ) ;
263
+ }
262
264
263
- if ( hasDependency && dependency . replaceWith ) {
265
+ if ( hasDependency && ( dependency . replaceWith || dependency . remove ) ) {
264
266
this . $pluginsService . removeFromPackageJson ( dependency . packageName , projectData . projectDir ) ;
265
- const replacementDep = _ . find ( this . migrationDependencies , migrationPackage => migrationPackage . packageName === dependency . replaceWith ) ;
266
- if ( ! replacementDep ) {
267
- this . $errors . failWithoutHelp ( "Failed to find replacement dependency." ) ;
267
+ if ( dependency . replaceWith ) {
268
+ const replacementDep = _ . find ( this . migrationDependencies , migrationPackage => migrationPackage . packageName === dependency . replaceWith ) ;
269
+ if ( ! replacementDep ) {
270
+ this . $errors . failWithoutHelp ( "Failed to find replacement dependency." ) ;
271
+ }
272
+ this . $logger . info ( `Replacing '${ dependency . packageName } ' with '${ replacementDep . packageName } '.` ) ;
273
+ this . $pluginsService . addToPackageJson ( replacementDep . packageName , replacementDep . verifiedVersion , replacementDep . isDev , projectData . projectDir ) ;
268
274
}
269
- this . $logger . info ( `Replacing '${ dependency . packageName } ' with '${ replacementDep . packageName } '.` ) ;
270
- this . $pluginsService . addToPackageJson ( replacementDep . packageName , replacementDep . verifiedVersion , replacementDep . isDev , projectData . projectDir ) ;
275
+
271
276
return ;
272
277
}
273
278
0 commit comments