fix(cli): remove stylelint-config-prettier

.stylelintrc

@@ -1,8 +1,7 @@
 {
   "extends": [
     "stylelint-config-standard",
-    "stylelint-config-rational-order",
-    "stylelint-config-prettier"
+    "stylelint-config-rational-order"
   ],
   "customSyntax": "postcss-less",
   "plugins": [
@@ -53,7 +52,6 @@
       }
     ],
     "no-invalid-double-slash-comments": null,
-    "indentation": [ 2 ],
     "import-notation": "string",
     "media-feature-range-notation": "prefix"
   }

package.json

@@ -144,7 +144,6 @@
     "readline-sync": "^1.4.10",
     "stream": "0.0.2",
     "stylelint": "^15.6.2",
-    "stylelint-config-prettier": "^9.0.5",
     "stylelint-config-rational-order": "^0.1.2",
     "stylelint-config-standard": "^33.0.0",
     "stylelint-declaration-block-no-ignored-properties": "^2.7.0",

packages/abc/page-header/style/index.less

@@ -97,16 +97,19 @@
     min-width: 242px;
     margin-left: 88px;
   }
+
   @media screen and (max-width: @screen-xl) {
     &__extra {
       margin-left: 44px;
     }
   }
+
   @media screen and (max-width: @screen-lg) {
     &__extra {
       margin-left: 20px;
     }
   }
+
   @media screen and (max-width: @screen-md) {
     &__row {
       display: block;
@@ -118,11 +121,13 @@
       margin-left: 0;
     }
   }
+
   @media screen and (max-width: @screen-sm) {
     &__detail {
       display: block;
     }
   }
+
   @media screen and (max-width: @screen-xs) {
     &__action {
       .@{ant-prefix}-btn-group,

packages/abc/page-header/style/rtl.less

@@ -22,12 +22,14 @@
       margin-right: 88px;
       margin-left: 0;
     }
+
     @media screen and (max-width: @screen-xl) {
       &__extra {
         margin-right: 44px;
         margin-left: 0;
       }
     }
+
     @media screen and (max-width: @screen-lg) {
       &__extra {
         margin-right: 20px;

packages/form/src/style/index.less

@@ -86,6 +86,7 @@
         }
       }
     }
+
     @media (max-width: @mobile-max) {
       > .@{ant-prefix}-form-item {
         > .@{ant-prefix}-form-item-label,
@@ -180,6 +181,7 @@
         margin-right: 0;
       }
     }
+
     @media (max-width: @mobile-max) {
       @{sf-prefix}__item {
         display: block;
@@ -207,6 +209,7 @@
       overflow: hidden;
       text-overflow: ellipsis;
     }
+
     @media (max-width: @mobile-max) {
       .@{ant-prefix}-form-item-label > label {
         justify-content: flex-start;

packages/theme/default.less

@@ -1,5 +1,4 @@
 @import './theme-default.less';
-
 @import './system/index.less';
 @import './layout-default/style/index.less';
 @import './layout-blank/style/index.less';

packages/theme/layout-blank/style/index.less

@@ -1,4 +1,3 @@
 @import './theme-default.less';
-
 @import './_layout.less';
 @import './fix/index.less';

packages/theme/layout-default/style/_aside.less

@@ -98,6 +98,7 @@
         left: 0;
       }
     }
+
     @media (max-width: @mobile-max) {
       @{alain-default-prefix}__content {
         transform: translate3d(-@alain-default-aside-wd, 0, 0);

packages/theme/layout-default/style/_layout.less

@@ -27,6 +27,7 @@ body {
   &__unwrap {
     margin-right: -@alain-default-content-padding;
     margin-left: -@alain-default-content-padding;
+
     @media (max-width: @mobile-max) {
       margin-right: 0;
       margin-left: 0;

packages/theme/layout-default/style/fix/_sidebar-nav.less

@@ -285,6 +285,7 @@
         left: @layout-gutter * 2;
       }
     }
+
     @media (min-width: @mobile-min) {
       @{alain-default-prefix}__collapsed {
         @{sidebar-nav-prefix}:not(@{sidebar-nav-prefix}__sub) {

packages/theme/layout-default/style/index.less

@@ -1,11 +1,11 @@
 @import './theme-default.less';
-
+// Layout
 @import './_layout.less';
 @import './_header.less';
 @import './_aside.less';
-
+// Widgets
 @import './_progress-bar.less';
 @import './fix/index.less';
 @import './widgets/index.less';
-
+// Fix
 @import './_fixed.less';

packages/theme/layout-default/style/widgets/_user.less

@@ -51,6 +51,7 @@
         margin-left: @layout-gutter;
       }
     }
+
     @media (min-width: @mobile-min) {
       @{alain-default-prefix}__collapsed {
         @{alain-default-prefix}__aside-user {

packages/theme/system/antd/_drawer.less

@@ -7,6 +7,7 @@
         max-width: @drawer-sm;
       }
     }
+
     @media (max-width: (@drawer-sm - 1)) {
       .drawer-sm {
         width: 100% !important;
@@ -19,6 +20,7 @@
         max-width: @drawer-md;
       }
     }
+
     @media (max-width: (@drawer-md - 1)) {
       .drawer-md {
         width: 100% !important;
@@ -31,6 +33,7 @@
         max-width: @drawer-lg;
       }
     }
+
     @media (max-width: (@drawer-lg - 1)) {
       .drawer-lg {
         width: 100% !important;
@@ -43,6 +46,7 @@
         max-width: @drawer-xl;
       }
     }
+
     @media (max-width: (@drawer-xl - 1)) {
       .drawer-xl {
         width: 100% !important;
@@ -58,6 +62,7 @@
         max-height: @drawer-sm-height;
       }
     }
+
     @media (max-height: (@drawer-sm-height - 1)) {
       .drawer-sm {
         height: 100% !important;
@@ -70,6 +75,7 @@
         max-height: @drawer-md-height;
       }
     }
+
     @media (max-height: (@drawer-md-height - 1)) {
       .drawer-md {
         height: 100% !important;
@@ -82,6 +88,7 @@
         max-height: @drawer-lg-height;
       }
     }
+
     @media (max-height: (@drawer-lg-height - 1)) {
       .drawer-lg {
         height: 100% !important;
@@ -94,6 +101,7 @@
         max-height: @drawer-xl-height;
       }
     }
+
     @media (max-height: (@drawer-xl-height - 1)) {
       .drawer-xl {
         height: 100% !important;

packages/theme/system/antd/index.less

@@ -1,5 +1,4 @@
 @import './_link.less';
-
 @import './_input-number.less';
 @import './_card.less';
 @import './_drawer.less';

schematics/application/index.ts

@@ -187,7 +187,6 @@ function addCodeStylesToPackageJson(): Rule {
         `[email protected]`,
         `[email protected]`,
         `[email protected]`,
-        `[email protected]`,
         `[email protected]`,
         `[email protected]`,
         `stylelint-declaration-block-no-ignored-properties@DEP-0.0.0-PLACEHOLDER`,

schematics/ng-update/upgrade-rules/v16/index.spec.ts

@@ -1,3 +1,4 @@
+import { JsonObject } from '@angular-devkit/core';
 import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
 
 import { createAlainApp, migrationCollection } from '../../../utils/testing';
@@ -17,4 +18,15 @@ describe('Schematic: ng-update: v16Rule', () => {
     runner.logger.subscribe(e => logs.push(e.message));
     await runner.runSchematic('migration-v16', {}, tree);
   }
+
+  it('should be remote stylelint-config-prettier', async () => {
+    const filePath = 'package.json';
+    let json = tree.readJson(filePath) as JsonObject;
+    const key = 'stylelint-config-prettier';
+    json['devDependencies']!![key] = '*';
+    tree.overwrite(filePath, JSON.stringify(json));
+    await runMigration();
+    const migrationPackageJson = tree.readJson(filePath) as JsonObject;
+    expect(migrationPackageJson['devDependencies']!![key]).not.toBeDefined();
+  });
 });

schematics/ng-update/upgrade-rules/v16/index.ts

@@ -2,9 +2,35 @@ import { chain, Rule, SchematicContext, Tree } from '@angular-devkit/schematics'
 import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
 import * as colors from 'ansi-colors';
 
-import { logStart } from '../../../utils';
+import { logStart, readJSON, readPackage, writeJSON, writePackage } from '../../../utils';
 import { UpgradeMainVersions } from '../../../utils/versions';
 
+function removeStylelintConfigPrettier(): Rule {
+  return (tree: Tree, context: SchematicContext) => {
+    const key = `stylelint-config-prettier`;
+    context.logger.info(colors.yellow(` ${key} have been deprecated`));
+    // remove package.json
+    const packageJson = readPackage(tree);
+    if (packageJson != null) {
+      delete packageJson.devDependencies[key];
+      writePackage(tree, packageJson);
+    }
+
+    // remote .stylelintrc
+    const stylelintrcFilePath = '.stylelintrc';
+    const stylelintrcjson = readJSON(tree, stylelintrcFilePath);
+    if (stylelintrcjson != null) {
+      if (!Array.isArray(stylelintrcjson.extends)) stylelintrcjson.extends = [];
+      const arr: string[] = stylelintrcjson.extends;
+      const idx = arr.indexOf(key);
+      if (idx !== -1) {
+        arr.splice(idx, 1);
+        writeJSON(tree, stylelintrcFilePath, stylelintrcjson);
+      }
+    }
+  };
+}
+
 function finished(): Rule {
   return (_tree: Tree, context: SchematicContext) => {
     context.addTask(new NodePackageInstallTask());
@@ -21,6 +47,6 @@ export function v16Rule(): Rule {
   return async (tree: Tree, context: SchematicContext) => {
     logStart(context, `Upgrade @delon/* version number`);
     UpgradeMainVersions(tree);
-    return chain([finished()]);
+    return chain([removeStylelintConfigPrettier(), finished()]);
   };
 }

schematics/test.ts

@@ -13,7 +13,7 @@ const Jasmine = require('jasmine');
 const runner = new Jasmine({ projectBaseDir });
 
 // const files = `schematics/**/*.spec.ts`;
-const files = `schematics/ng-add/index.spec.ts`;
+const files = `schematics/ng-update/upgrade-rules/v16/index.spec.ts`;
 
 const tests = glob.sync(files).map(p => relative(projectBaseDir, p));
 

scripts/ci/utils.sh

@@ -18,7 +18,6 @@ DEPENDENCIES=$(node -p "
     'ajv',
     'ajv-formats',
     'screenfull',
-    'stylelint-config-prettier',
     'stylelint-config-rational-order',
     'stylelint-config-standard',
     'stylelint-declaration-block-no-ignored-properties',