From 7a13672db10450053db980104172f12bee8313b5 Mon Sep 17 00:00:00 2001 From: Ignacio Le Fluk Date: Thu, 12 Dec 2019 09:55:48 -0300 Subject: [PATCH] v0.0.6 (#7) * add ng-add save option to package.json (#2) Set to false. Don't keep the schematic listed as a dependency. * add author and bugs info (#3) adds author and bugs info to package.json * bump dependencies (#5) * update tailwindcss and custom-webpack versions (minor) (#6) --- CHANGELOG.md | 6 +- package-lock.json | 113 +++++++++++++------------------------- package.json | 29 ++++++---- src/ng-add-setup/index.ts | 8 +-- 4 files changed, 65 insertions(+), 91 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 57cd81f..574928b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,8 @@ ## 0.0.5 -* added support for build-angular ~0.803.0 \ No newline at end of file +* added support for build-angular ~0.803.0 + +## 0.0.6 +* update tailwindcss and custom-webpack versions. +* enable option to remove schematic from dependencies. \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 79003a3..47cccd0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,15 +1,15 @@ { - "name": "tailwind", - "version": "0.0.0", + "name": "@flakolefluk/tailwind-schematics", + "version": "0.0.5", "lockfileVersion": 1, "requires": true, "dependencies": { "@angular-devkit/core": { - "version": "8.1.2", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-8.1.2.tgz", - "integrity": "sha512-sNkqXbkHE9+ObtLOYmDKJL1bOf1zY0AwGVKemgDqCmu1mRUNqhb7CmF13DRscfU3MEcuiJYDjXqBQDjIszrFiw==", + "version": "8.3.20", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-8.3.20.tgz", + "integrity": "sha512-UCfW/BJBJnioJU34QennQhA4o+rLoCXWiSrI2LM7yw8/MEM9I8KbqRETP1My3HjHkQnvP+Qh3noedpcu3Nnt8A==", "requires": { - "ajv": "6.10.0", + "ajv": "6.10.2", "fast-json-stable-stringify": "2.0.0", "magic-string": "0.25.3", "rxjs": "6.4.0", @@ -17,75 +17,38 @@ } }, "@angular-devkit/schematics": { - "version": "8.1.2", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-8.1.2.tgz", - "integrity": "sha512-Di/3vPR4jwdYcMAk13t19sAF0qQUH8KSkFcmO/5E/gECTL1tXNvV690K1Vhn6zpeE17Z1MLB5HwRNcb6nJkD+Q==", + "version": "8.3.20", + "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-8.3.20.tgz", + "integrity": "sha512-sDHZakh4e3A5WenR9zr1x6Va9GNRqQlRhqT3xcbkG88v2M0YqEt7dHB7YwnOhm7zSxiWQM8PdWEQHiQ4iu9NyQ==", "requires": { - "@angular-devkit/core": "8.1.2", + "@angular-devkit/core": "8.3.20", "rxjs": "6.4.0" } }, "@schematics/angular": { - "version": "8.2.2", - "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-8.2.2.tgz", - "integrity": "sha512-0kZoGXwYRDLREwMYT+m0MyGenpPidLEulrWxgYWoLhsJAFKax7lTy2YYljtFTd+AlZYyB3PTpDsDip8uT743tA==", + "version": "8.3.20", + "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-8.3.20.tgz", + "integrity": "sha512-Y20pSJhQ0KQd8Tk2kPQlmpRDNDaoIKMeOOGLT2FgCFrumxZXuIbBgN9fGDgW40iI2sq80bccOeo24RKkn3QpcA==", "dev": true, "requires": { - "@angular-devkit/core": "8.2.2", - "@angular-devkit/schematics": "8.2.2" - }, - "dependencies": { - "@angular-devkit/core": { - "version": "8.2.2", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-8.2.2.tgz", - "integrity": "sha512-qA1lK/OQhNptCxoEGbTryn6yeFS1F/e/EiUTwgU/j4DkBwPyYGE8iqWBd/cgI9AVqQaRSLLhVWXtDPxoNL0TKg==", - "dev": true, - "requires": { - "ajv": "6.10.2", - "fast-json-stable-stringify": "2.0.0", - "magic-string": "0.25.3", - "rxjs": "6.4.0", - "source-map": "0.7.3" - } - }, - "@angular-devkit/schematics": { - "version": "8.2.2", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-8.2.2.tgz", - "integrity": "sha512-wAbP+IriWgTSLR4prezuFlLbxMZMGXiN0FNH2i/v8MfxNXCBiEvD4YtD/8s8YRsZs+IW7sp3bErSD/EIlS4DyQ==", - "dev": true, - "requires": { - "@angular-devkit/core": "8.2.2", - "rxjs": "6.4.0" - } - }, - "ajv": { - "version": "6.10.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz", - "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==", - "dev": true, - "requires": { - "fast-deep-equal": "^2.0.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - } + "@angular-devkit/core": "8.3.20", + "@angular-devkit/schematics": "8.3.20" } }, "@types/jasmine": { - "version": "3.3.16", - "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-3.3.16.tgz", - "integrity": "sha512-Nveep4zKGby8uIvG2AEUyYOwZS8uVeHK9TgbuWYSawUDDdIgfhCKz28QzamTo//Jk7Ztt9PO3f+vzlB6a4GV1Q==" + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-3.5.0.tgz", + "integrity": "sha512-kGCRI9oiCxFS6soGKlyzhMzDydfcPix9PpTkr7h11huxOxhWwP37Tg7DYBaQ18eQTNreZEuLkhpbGSqVNZPnnw==" }, "@types/node": { - "version": "8.10.51", - "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.51.tgz", - "integrity": "sha512-cArrlJp3Yv6IyFT/DYe+rlO8o3SIHraALbBW/+CcCYW/a9QucpLI+n2p4sRxAvl2O35TiecpX2heSZtJjvEO+Q==" + "version": "12.12.17", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.17.tgz", + "integrity": "sha512-Is+l3mcHvs47sKy+afn2O1rV4ldZFU7W8101cNlOd+MRbjM4Onida8jSZnJdTe/0Pcf25g9BNIUsuugmE6puHA==" }, "ajv": { - "version": "6.10.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz", - "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==", + "version": "6.10.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz", + "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==", "requires": { "fast-deep-equal": "^2.0.1", "fast-json-stable-stringify": "^2.0.0", @@ -128,9 +91,9 @@ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, "glob": { - "version": "7.1.4", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz", - "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==", + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", "requires": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -155,18 +118,18 @@ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "jasmine": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-3.4.0.tgz", - "integrity": "sha512-sR9b4n+fnBFDEd7VS2el2DeHgKcPiMVn44rtKFumq9q7P/t8WrxsVIZPob4UDdgcDNCwyDqwxCt4k9TDRmjPoQ==", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-3.5.0.tgz", + "integrity": "sha512-DYypSryORqzsGoMazemIHUfMkXM7I7easFaxAvNM3Mr6Xz3Fy36TupTrAOxZWN8MVKEU5xECv22J4tUQf3uBzQ==", "requires": { - "glob": "^7.1.3", - "jasmine-core": "~3.4.0" + "glob": "^7.1.4", + "jasmine-core": "~3.5.0" } }, "jasmine-core": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.4.0.tgz", - "integrity": "sha512-HU/YxV4i6GcmiH4duATwAbJQMlE0MsDIR5XmSVxURxKHn3aGAdbY1/ZJFmVRbKtnLwIxxMJD7gYaPsypcbYimg==" + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.5.0.tgz", + "integrity": "sha512-nCeAiw37MIMA9w9IXso7bRaLl+c/ef3wnxsoSAlYrzS+Ot0zTG6nU8G/cIfGkqpkjX2wNaIW9RFG0TwIFnG6bA==" }, "json-schema-traverse": { "version": "0.4.1", @@ -231,9 +194,9 @@ "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==" }, "typescript": { - "version": "3.4.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.4.5.tgz", - "integrity": "sha512-YycBxUb49UUhdNMU5aJ7z5Ej2XGmaIBL0x34vZ82fn3hGvD+bgrMrVDpatgz2f7YxUMJxMkbWxJZeAvDxVe7Vw==" + "version": "3.7.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.7.3.tgz", + "integrity": "sha512-Mcr/Qk7hXqFBXMN7p7Lusj1ktCBydylfQM/FZCk5glCNQJrCUKPkMHdo9R0MTFWsC/4kPFvDS0fDPvukfCkFsw==" }, "uri-js": { "version": "4.2.2", diff --git a/package.json b/package.json index 2e92629..f378fed 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@flakolefluk/tailwind-schematics", - "version": "0.0.5", + "version": "0.0.6", "description": "TailwindCSS schematics for angular", "scripts": { "build": "tsc -p tsconfig.json", @@ -12,22 +12,29 @@ "tailwind", "angular" ], - "author": "", + "ng-add": { + "save": false + }, + "author": "Ignacio Falk", "license": "MIT", "schematics": "./src/collection.json", "dependencies": { - "@angular-devkit/core": "^8.1.1", - "@angular-devkit/schematics": "^8.1.1", - "@types/jasmine": "^3.3.9", - "@types/node": "^8.0.31", - "jasmine": "^3.3.1", - "typescript": "~3.4.3" + "@angular-devkit/core": "^8.3.20", + "@angular-devkit/schematics": "^8.3.20", + "jasmine": "^3.5.0", + "typescript": "~3.7.3" }, "devDependencies": { - "@schematics/angular": "^8.2.2" + "@schematics/angular": "^8.3.20", + "@types/jasmine": "^3.5.0", + "@types/node": "^12.12.17" }, - "repository" : { - "type" : "git", + "repository": { + "type": "git", "url": "ssh://git@github.com:flakolefluk/tailwindcss-schematics.git" + }, + "bugs": { + "url": "https://github.com/flakolefluk/tailwindcss-schematics/issues", + "email": "flakolefluk@gmail.com" } } diff --git a/src/ng-add-setup/index.ts b/src/ng-add-setup/index.ts index e2013c9..a4bb81a 100644 --- a/src/ng-add-setup/index.ts +++ b/src/ng-add-setup/index.ts @@ -83,8 +83,8 @@ function updatePackageJson(pkgJson: PackageJson): Rule { builderVersion.lastIndexOf('.'), ); - if(parseInt(partialVersion, 10)>=802){ - customBuilderVersion = '~8.2.0' + if(parseInt(partialVersion, 10)>=801){ + customBuilderVersion = '~8.4.1' } else customBuilderVersion = `~${partialVersion[0]}.${partialVersion[2]}.0`; } @@ -98,10 +98,10 @@ function updatePackageJson(pkgJson: PackageJson): Rule { builderVersion || '~0.800.0'; pkgJson.devDependencies['@fullhuman/postcss-purgecss'] = - pkgJson.devDependencies['@fullhuman/postcss-purgecss'] || '~1.2.0'; + pkgJson.devDependencies['@fullhuman/postcss-purgecss'] || '~1.3.0'; pkgJson.devDependencies['tailwindcss'] = - pkgJson.devDependencies['tailwindcss'] || '~1.1.2'; + pkgJson.devDependencies['tailwindcss'] || '~1.1.4'; tree.overwrite('package.json', JSON.stringify(pkgJson, null, 2));