Merge pull request ant-design#200 from ant-design/next-v4

merge next v4 into master

.travis.yml

@@ -17,3 +17,4 @@ branches:
   only:
     - master
     - dev
+    - /^next-.*$/

packages/icons-angular/.gitignore

@@ -24,20 +24,19 @@ yarn-error.log*
 # assets
 dist/
 
-lib/manifest.ts
-lib/types.ts
-
-lib/icons/fill/*.ts
-lib/icons/outline/*.ts
-lib/icons/twotone/*.ts
-lib/icons/public_api.ts
-
-lib/inline-svg/fill/*.svg
-lib/inline-svg/outline/*.svg
-lib/inline-svg/twotone/*.svg
-lib/inline-svg/fill/*.js
-lib/inline-svg/outline/*.js
-lib/inline-svg/twotone/*.js
+src/manifest.ts
+
+src/icons/fill/*.ts
+src/icons/outline/*.ts
+src/icons/twotone/*.ts
+src/icons/public_api.ts
+
+src/inline-svg/fill/*.svg
+src/inline-svg/outline/*.svg
+src/inline-svg/twotone/*.svg
+src/inline-svg/fill/*.js
+src/inline-svg/outline/*.js
+src/inline-svg/twotone/*.js
 
 # publish
 *.tgz

packages/icons-angular/angular.json

@@ -28,7 +28,7 @@
               },
               {
                 "glob": "**/*",
-                "input": "lib/inline-svg",
+                "input": "src/inline-svg",
                 "output": "/assets/"
               }
             ],
@@ -89,20 +89,20 @@
         "build": {
           "builder": "@angular-devkit/build-ng-packagr:build",
           "options": {
-            "tsConfig": "lib/tsconfig.lib.json",
-            "project": "lib/ng-package.json"
+            "tsConfig": "src/tsconfig.lib.json",
+            "project": "src/ng-package.json"
           },
           "configurations": {
             "production": {
-              "tsConfig": "lib/tsconfig.lib.prod.json"
+              "tsConfig": "src/tsconfig.lib.prod.json"
             }
           }
         },
         "lint": {
           "builder": "@angular-devkit/build-angular:tslint",
           "options": {
             "tsConfig": [
-              "lib/tsconfig.lib.json"
+              "src/tsconfig.lib.json"
             ],
             "exclude": [
               "**/node_modules/**"
@@ -112,15 +112,15 @@
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
-            "main": "lib/test.ts",
-            "karmaConfig": "lib/karma.conf.js",
-            "polyfills": "lib/polyfills.ts",
-            "tsConfig": "lib/tsconfig.spec.json",
+            "main": "src/test.ts",
+            "karmaConfig": "src/karma.conf.js",
+            "polyfills": "src/polyfills.ts",
+            "tsConfig": "src/tsconfig.spec.json",
             "scripts": [],
             "assets": [
               {
                 "glob": "**/*",
-                "input": "lib/inline-svg",
+                "input": "src/inline-svg",
                 "output": "/assets/"
               }
             ]