Skip to content

Commit a88bc7c

Browse files
alan-agius4alan-agius4
committed
build: remove the need to bootstrap-local
This commit removes the need for the bootstrap-local logic and moves the scripts to` mts`
1 parent 3362b8f commit a88bc7c

28 files changed

+530
-630
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
- name: Validate NgBot Configuration
5656
run: yarn ng-dev ngbot verify
5757
- name: Validate Circular Dependencies
58-
run: yarn ts-circular-deps:check
58+
run: yarn ts-circular-deps check
5959
- name: Run Validation
6060
run: yarn -s admin validate
6161
- name: Check tooling setup

‎.ng-dev/commit-message.mjs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { packages } from '../lib/packages.mjs';
1+
import { packages } from '../scripts/packages.mjs';
22

33
/**
44
* The configuration for `ng-dev commit-message` commands.

‎.ng-dev/format.mjs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/**
22
* Configuration for the `ng-dev format` command.
3-
*
3+
*
44
* @type { import("@angular/ng-dev").FormatConfig }
55
*/
66
export const format = {
77
'prettier': {
8-
matchers: ['**/*.{ts,js,json,yml,yaml,md}'],
8+
matchers: ['**/*.{mts,cts,ts,mjs,cjs,js,json,yml,yaml,md}'],
99
},
1010
'buildifier': true,
1111
};

‎.ng-dev/release.mjs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import semver from 'semver';
2-
import { releasePackages } from '../lib/packages.mjs';
2+
import { releasePackages } from '../scripts/packages.mjs';
33

44
/**
55
* Configuration for the `ng-dev release` command.

‎bin/devkit-admin‎

Lines changed: 0 additions & 78 deletions
This file was deleted.

‎lib/bootstrap-local.js‎

Lines changed: 0 additions & 165 deletions
This file was deleted.

‎lib/packages.ts‎

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎package.json‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
"Angular DevKit"
1818
],
1919
"scripts": {
20-
"admin": "node ./bin/devkit-admin",
20+
"admin": "node --no-warnings=ExperimentalWarning --loader ts-node/esm/transpile-only ./scripts/devkit-admin.mjs",
2121
"test": "bazel test //packages/...",
2222
"build": "yarn admin build",
2323
"build-tsc": "tsc -p tsconfig.json",
24-
"lint": "eslint --cache --max-warnings=0 \"**/*.ts\"",
24+
"lint": "eslint --cache --max-warnings=0 \"**/*.@(ts|mts|cts)\"",
2525
"templates": "yarn admin templates",
2626
"validate": "yarn admin validate",
2727
"postinstall": "yarn webdriver-update && yarn husky && patch-package --patch-dir tools/postinstall/patches",
@@ -30,9 +30,7 @@
3030
"public-api:check": "node goldens/public-api/manage.js test",
3131
"ng-dev": "node --no-warnings=ExperimentalWarning --loader ts-node/esm/transpile-only node_modules/@angular/ng-dev/bundles/cli.mjs",
3232
"public-api:update": "node goldens/public-api/manage.js accept",
33-
"ts-circular-deps": "ts-node --esm --transpile-only node_modules/@angular/ng-dev/bundles/cli.mjs ts-circular-deps --config ./scripts/circular-deps-test.conf.js",
34-
"ts-circular-deps:check": "yarn -s ts-circular-deps check",
35-
"ts-circular-deps:approve": "yarn -s ts-circular-deps approve",
33+
"ts-circular-deps": "yarn ng-dev ts-circular-deps --config ./scripts/circular-deps-test.conf.mjs",
3634
"check-tooling-setup": "tsc --project .ng-dev/tsconfig.json"
3735
},
3836
"repository": {
@@ -104,7 +102,9 @@
104102
"@types/jasmine": "~5.1.0",
105103
"@types/karma": "^6.3.0",
106104
"@types/less": "^3.0.3",
105+
"@types/license-checker": "^25.0.6",
107106
"@types/loader-utils": "^2.0.0",
107+
"@types/lodash.template": "^4.5.3",
108108
"@types/node": "^18.13.0",
109109
"@types/npm-package-arg": "^6.1.0",
110110
"@types/pacote": "^11.1.3",
@@ -113,6 +113,7 @@
113113
"@types/resolve": "^1.17.1",
114114
"@types/semver": "^7.3.12",
115115
"@types/shelljs": "^0.8.11",
116+
"@types/spdx-satisfies": "^0.1.2",
116117
"@types/tar": "^6.1.2",
117118
"@types/watchpack": "^2.4.4",
118119
"@types/yargs": "^17.0.20",
@@ -168,6 +169,7 @@
168169
"license-checker": "^25.0.0",
169170
"license-webpack-plugin": "4.0.2",
170171
"loader-utils": "3.2.1",
172+
"lodash.template": "^4.5.0",
171173
"magic-string": "0.30.8",
172174
"mini-css-extract-plugin": "2.8.1",
173175
"mrmime": "2.0.0",

0 commit comments

Comments
 (0)