diff --git a/.github/workflows/on-merge-main-deploy-gpr.yml b/.github/workflows/on-merge-main-deploy-gpr.yml index 0a480c4..a582b4c 100644 --- a/.github/workflows/on-merge-main-deploy-gpr.yml +++ b/.github/workflows/on-merge-main-deploy-gpr.yml @@ -20,7 +20,7 @@ jobs: node-version: '20.x' registry-url: 'https://npm.pkg.github.com' - run: npm ci - - run: npm run build:lib + - run: npm run build:package - run: cd dist/npm && npm publish --access=public env: NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/on-merge-main-deploy-npmjs.yml b/.github/workflows/on-merge-main-deploy-npmjs.yml index 9f73938..a63e679 100644 --- a/.github/workflows/on-merge-main-deploy-npmjs.yml +++ b/.github/workflows/on-merge-main-deploy-npmjs.yml @@ -16,7 +16,7 @@ jobs: node-version: '20.x' registry-url: 'https://registry.npmjs.org' - run: npm ci - - run: npm run build:lib + - run: npm run build:package - run: cd dist/npm && npm publish --access=public env: NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }} diff --git a/.github/workflows/verify-pull-request.yml b/.github/workflows/verify-pull-request.yml index 701944c..3ea8077 100644 --- a/.github/workflows/verify-pull-request.yml +++ b/.github/workflows/verify-pull-request.yml @@ -16,4 +16,4 @@ jobs: - name: Build 🔧 run: | npm run build:prod - npm run build:lib + npm run build:package diff --git a/.schematics/collection.json b/.schematics/collection.json deleted file mode 100644 index 2a53750..0000000 --- a/.schematics/collection.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "$schema": "../node_modules/@angular-devkit/schematics/collection-schema.json", - "schematics": { - "ng-add": { - "description": "Add pro-form and required luxon date adapter", - "factory": "./ng-add/index.js#ngAdd", - "schema": "./ng-add/schema.json" - } - } -} diff --git a/.schematics/ng-add/index.js b/.schematics/ng-add/index.js deleted file mode 100644 index 60264b6..0000000 --- a/.schematics/ng-add/index.js +++ /dev/null @@ -1,42 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.ngAdd = ngAdd; -const dependencies_1 = require("@schematics/angular/utility/dependencies"); -const tasks_1 = require("@angular-devkit/schematics/tasks"); -function resolveMaterialAdapterVersion(tree) { - const dep = (0, dependencies_1.getPackageJsonDependency)(tree, '@angular/material', 'package.json'); - if (dep === null || dep === void 0 ? void 0 : dep.version) { - const m = dep.version.match(/^[~^]?(\d+)\./); - if (m) - return `^${m[1]}.0.0`; - } - return '^20.0.0'; -} -function ensureDep(tree, name, version) { - (0, dependencies_1.addPackageJsonDependency)(tree, { - type: dependencies_1.NodeDependencyType.Default, - name, - version, - overwrite: false, - }); -} -function ngAdd(options = {}) { - return (tree, context) => { - ensureDep(tree, 'tslib', '^2.8.1'); - if (options.withLuxon !== false) { - ensureDep(tree, 'luxon', '^3.5.0'); - } - if (options.withAdapter !== false) { - const adapterVersion = resolveMaterialAdapterVersion(tree); - ensureDep(tree, '@angular/material-luxon-adapter', adapterVersion); - } - if (!options.skipInstall) { - context.logger.info('Installing packages...'); - context.addTask(new tasks_1.NodePackageInstallTask()); - } - else { - context.logger.info('Skipping package installation as requested.'); - } - return tree; - }; -} diff --git a/.schematics/ng-add/index.ts b/.schematics/ng-add/index.ts deleted file mode 100644 index e212116..0000000 --- a/.schematics/ng-add/index.ts +++ /dev/null @@ -1,55 +0,0 @@ -import { Rule, SchematicContext, Tree } from '@angular-devkit/schematics'; -import { - addPackageJsonDependency, - NodeDependencyType, - getPackageJsonDependency, -} from '@schematics/angular/utility/dependencies'; -import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks'; - -interface Schema { - skipInstall?: boolean; - withAdapter?: boolean; - withLuxon?: boolean; -} - -function resolveMaterialAdapterVersion(tree: Tree): string { - const dep = getPackageJsonDependency(tree, '@angular/material', 'package.json'); - if (dep?.version) { - const m = dep.version.match(/^[~^]?(\d+)\./); - if (m) return `^${m[1]}.0.0`; - } - return '^20.0.0'; -} - -function ensureDep(tree: Tree, name: string, version: string): void { - addPackageJsonDependency(tree, { - type: NodeDependencyType.Default, - name, - version, - overwrite: false, - }); -} - -export function ngAdd(options: Schema = {}): Rule { - return (tree: Tree, context: SchematicContext) => { - ensureDep(tree, 'tslib', '^2.8.1'); - - if (options.withLuxon !== false) { - ensureDep(tree, 'luxon', '^3.5.0'); - } - - if (options.withAdapter !== false) { - const adapterVersion = resolveMaterialAdapterVersion(tree); - ensureDep(tree, '@angular/material-luxon-adapter', adapterVersion); - } - - if (!options.skipInstall) { - context.logger.info('Installing packages...'); - context.addTask(new NodePackageInstallTask()); - } else { - context.logger.info('Skipping package installation as requested.'); - } - - return tree; - }; -} diff --git a/.schematics/ng-add/schema.json b/.schematics/ng-add/schema.json deleted file mode 100644 index b2876c4..0000000 --- a/.schematics/ng-add/schema.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-07/schema#", - "title": "Options for ng add @proangular/pro-form", - "type": "object", - "properties": { - "skipInstall": { - "type": "boolean", - "description": "Skip running the package manager install task", - "default": false - }, - "withAdapter": { - "type": "boolean", - "description": "Install @angular/material-luxon-adapter", - "default": true - }, - "withLuxon": { - "type": "boolean", - "description": "Install luxon", - "default": true - } - }, - "additionalProperties": false -} diff --git a/package-lock.json b/package-lock.json index 0c9a2a6..434af10 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,17 +1,14 @@ { "name": "@proangular/pro-form", - "version": "20.0.0", + "version": "20.1.7", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@proangular/pro-form", - "version": "20.0.0", + "version": "20.1.7", "hasInstallScript": true, "license": "MIT", - "dependencies": { - "tslib": "^2.8.1" - }, "devDependencies": { "@angular/build": "^20.1.6", "@angular/cli": "^20.1.6", diff --git a/package.json b/package.json index 5da8ac6..e04b45c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@proangular/pro-form", - "version": "20.0.1", + "version": "20.1.7", "description": "A predefined set of reactive and reusable form input components based on Angular Material.", "author": "Pro Angular ", "homepage": "https://www.proangular.com", @@ -9,10 +9,9 @@ "node": "^20.19.0 || ^22.12.0 || ^24.0.0" }, "scripts": { - "build": "ng build && npm run build:schematics", - "build:lib": "npm run build:schematics && ng-packagr -p ng-package.json", + "build": "ng build", + "build:package": "ng-packagr -p ng-package.json", "build:prod": "ng build --configuration production", - "build:schematics": "tsc -p tsconfig.schematics.json", "lint": "ng lint", "ng": "ng", "postinstall": "is-ci || husky install", @@ -38,9 +37,6 @@ "rxjs": ">=7.8 <8", "zone.js": ">=0.15 <0.16" }, - "dependencies": { - "tslib": "^2.8.1" - }, "devDependencies": { "@angular/build": "^20.1.6", "@angular/cli": "^20.1.6", @@ -106,13 +102,7 @@ "url": "https://github.com/sponsors/proangular" }, "publishConfig": { - "access": "public", - "directory": "dist/npm" + "access": "public" }, - "schematics": "./.schematics/collection.json", - "files": [ - "dist/", - ".schematics/" - ], "main": "src/main.ts" } diff --git a/tsconfig.schematics.json b/tsconfig.schematics.json deleted file mode 100644 index 9709cb0..0000000 --- a/tsconfig.schematics.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "compilerOptions": { - "target": "ES2019", - "module": "commonjs", - "moduleResolution": "node", - "rootDir": ".schematics", - "outDir": ".schematics", - "declaration": false, - "sourceMap": false, - "strict": true, - "esModuleInterop": true, - "types": ["node"], - "skipLibCheck": true, - "lib": ["ES2019"] - }, - "include": [".schematics/**/*.ts"], - "exclude": [] -}