build: remove the need to bootstrap-local

This commit removes the need for the bootstrap-local logic and moves the scripts to` mts`
angular · Mar 14, 2024 · a88bc7c · a88bc7c
1 parent 3362b8f
commit a88bc7c
Show file tree

Hide file tree

Showing 28 changed files with 530 additions and 630 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -55,7 +55,7 @@ jobs:
       - name: Validate NgBot Configuration
         run: yarn ng-dev ngbot verify
       - name: Validate Circular Dependencies
-        run: yarn ts-circular-deps:check
+        run: yarn ts-circular-deps check
       - name: Run Validation
         run: yarn -s admin validate
       - name: Check tooling setup

diff --git a/.ng-dev/commit-message.mjs b/.ng-dev/commit-message.mjs
@@ -1,4 +1,4 @@
-import { packages } from '../lib/packages.mjs';
+import { packages } from '../scripts/packages.mjs';
 
 /**
  * The configuration for `ng-dev commit-message` commands.

diff --git a/.ng-dev/format.mjs b/.ng-dev/format.mjs
@@ -1,11 +1,11 @@
 /**
  * Configuration for the `ng-dev format` command.
- * 
+ *
  * @type { import("@angular/ng-dev").FormatConfig }
  */
 export const format = {
   'prettier': {
-    matchers: ['**/*.{ts,js,json,yml,yaml,md}'],
+    matchers: ['**/*.{mts,cts,ts,mjs,cjs,js,json,yml,yaml,md}'],
   },
   'buildifier': true,
 };
diff --git a/.ng-dev/release.mjs b/.ng-dev/release.mjs
@@ -1,5 +1,5 @@
 import semver from 'semver';
-import { releasePackages } from '../lib/packages.mjs';
+import { releasePackages } from '../scripts/packages.mjs';
 
 /**
  * Configuration for the `ng-dev release` command.

diff --git a/bin/devkit-admin b/bin/devkit-admin
diff --git a/lib/bootstrap-local.js b/lib/bootstrap-local.js
diff --git a/lib/packages.ts b/lib/packages.ts
diff --git a/package.json b/package.json
@@ -17,11 +17,11 @@
     "Angular DevKit"
   ],
   "scripts": {
-    "admin": "node ./bin/devkit-admin",
+    "admin": "node --no-warnings=ExperimentalWarning --loader ts-node/esm/transpile-only ./scripts/devkit-admin.mjs",
     "test": "bazel test //packages/...",
     "build": "yarn admin build",
     "build-tsc": "tsc -p tsconfig.json",
-    "lint": "eslint --cache --max-warnings=0 \"**/*.ts\"",
+    "lint": "eslint --cache --max-warnings=0 \"**/*.@(ts|mts|cts)\"",
     "templates": "yarn admin templates",
     "validate": "yarn admin validate",
     "postinstall": "yarn webdriver-update && yarn husky && patch-package --patch-dir tools/postinstall/patches",
@@ -30,9 +30,7 @@
     "public-api:check": "node goldens/public-api/manage.js test",
     "ng-dev": "node --no-warnings=ExperimentalWarning --loader ts-node/esm/transpile-only node_modules/@angular/ng-dev/bundles/cli.mjs",
     "public-api:update": "node goldens/public-api/manage.js accept",
-    "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",
-    "ts-circular-deps:check": "yarn -s ts-circular-deps check",
-    "ts-circular-deps:approve": "yarn -s ts-circular-deps approve",
+    "ts-circular-deps": "yarn ng-dev ts-circular-deps --config ./scripts/circular-deps-test.conf.mjs",
     "check-tooling-setup": "tsc --project .ng-dev/tsconfig.json"
   },
   "repository": {
@@ -104,7 +102,9 @@
     "@types/jasmine": "~5.1.0",
     "@types/karma": "^6.3.0",
     "@types/less": "^3.0.3",
+    "@types/license-checker": "^25.0.6",
     "@types/loader-utils": "^2.0.0",
+    "@types/lodash.template": "^4.5.3",
     "@types/node": "^18.13.0",
     "@types/npm-package-arg": "^6.1.0",
     "@types/pacote": "^11.1.3",
@@ -113,6 +113,7 @@
     "@types/resolve": "^1.17.1",
     "@types/semver": "^7.3.12",
     "@types/shelljs": "^0.8.11",
+    "@types/spdx-satisfies": "^0.1.2",
     "@types/tar": "^6.1.2",
     "@types/watchpack": "^2.4.4",
     "@types/yargs": "^17.0.20",
@@ -168,6 +169,7 @@
     "license-checker": "^25.0.0",
     "license-webpack-plugin": "4.0.2",
     "loader-utils": "3.2.1",
+    "lodash.template": "^4.5.0",
     "magic-string": "0.30.8",
     "mini-css-extract-plugin": "2.8.1",
     "mrmime": "2.0.0",