Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ jobs:
- name: Verify tooling setup
run: pnpm check-tooling-setup
- name: Build and create package artifacts
run: ./scripts/create-package-archives.js --suffix "pr${{github.event.number}}-$(git rev-parse --short HEAD)"
run: ./scripts/create-package-archives.mjs --suffix "pr${{github.event.number}}-$(git rev-parse --short HEAD)"
- name: Upload artifacts
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
with:
Expand Down
4 changes: 2 additions & 2 deletions integration/linker/link-packages-test.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {NodeJSFileSystem, ConsoleLogger, LogLevel} from '@angular/compiler-cli';
import fs from 'fs';
import path from 'path';
import babel from '@babel/core';
import glob from 'glob';
import {sync as globSync} from 'glob';
import chalk from 'chalk';

/** File system used by the Angular linker plugin. */
Expand Down Expand Up @@ -62,7 +62,7 @@ if (failedPackages) {
* @returns An object containing linker failures and passed files.
*/
function testPackage(pkg) {
const entryPointFesmFiles = glob.sync(`fesm2022/**/*.mjs`, {cwd: pkg.pkgPath});
const entryPointFesmFiles = globSync(`fesm2022/**/*.mjs`, {cwd: pkg.pkgPath});
const passedFiles = [];
const failures = [];

Expand Down
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@
"lint": "pnpm -s tslint && pnpm -s stylelint && pnpm -s ownerslint && pnpm -s ng-dev format changed --check",
"e2e": "bazel test //src/... --build_tag_filters=e2e --test_tag_filters=e2e --build_tests_only",
"deploy-dev-app": "node ./scripts/deploy-dev-app.js",
"breaking-changes": "ts-node --project scripts/tsconfig.json scripts/breaking-changes.ts",
"check-entry-point-setup": "node ./scripts/check-entry-point-setup.js",
"check-package-externals": "ts-node --project scripts/tsconfig.json scripts/check-package-externals.ts",
"breaking-changes": "node --no-warnings=ExperimentalWarning --loader ts-node/esm/transpile-only scripts/breaking-changes.mts",
"check-entry-point-setup": "node ./scripts/check-entry-point-setup.mjs",
"check-package-externals": "node --no-warnings=ExperimentalWarning --loader ts-node/esm/transpile-only scripts/check-package-externals.mts",
"format": "pnpm -s ng-dev format changed",
"cherry-pick-patch": "ts-node --project tools/cherry-pick-patch/tsconfig.json tools/cherry-pick-patch/cherry-pick-patch.ts",
"ownerslint": "ts-node --project scripts/tsconfig.json scripts/ownerslint.ts",
"detect-component-id-collisions": "ts-node --project scripts/tsconfig.json scripts/detect-component-id-collisions.ts",
"ownerslint": "node --no-warnings=ExperimentalWarning --loader ts-node/esm/transpile-only scripts/ownerslint.mts",
"detect-component-id-collisions": "node --no-warnings=ExperimentalWarning --loader ts-node/esm/transpile-only scripts/detect-component-id-collisions.mts",
"tslint": "tslint -c tslint.json --project ./tsconfig.json",
"stylelint": "stylelint \"(src|docs)/**/*.+(css|scss)\" --config .stylelintrc.json",
"resync-caretaker-app": "ts-node --project scripts/tsconfig.json scripts/caretaking/resync-caretaker-app-prs.ts",
Expand Down Expand Up @@ -95,7 +95,6 @@
"@types/glob": "^8.0.0",
"@types/jasmine": "^5.0.0",
"@types/luxon": "^3.0.0",
"@types/marked": "^2.0.0",
"@types/minimatch": "^5.1.2",
"@types/node": "^22.14.1",
"@types/selenium-webdriver": "^3.0.17",
Expand All @@ -104,13 +103,13 @@
"@types/yargs": "^17.0.8",
"autoprefixer": "^10.4.2",
"axe-core": "^4.10.3",
"chalk": "^4.1.0",
"chalk": "^5.4.1",
"dgeni": "^0.4.14",
"dgeni-packages": "^0.30.0",
"esbuild": "^0.25.0",
"firebase-tools": "14.4.0",
"fs-extra": "^11.0.0",
"glob": "^7.2.0",
"glob": "^11.0.3",
"highlight.js": "^11.0.0",
"husky": "^9.0.1",
"jasmine": "^5.6.0",
Expand All @@ -124,7 +123,7 @@
"karma-parallel": "^0.3.1",
"karma-sourcemap-loader": "^0.4.0",
"magic-string": "0.30.17",
"marked": "^2.0.0",
"marked": "^15.0.12",
"minimatch": "^3.0.4",
"node-fetch": "^2.6.0",
"parse5": "^7.1.2",
Expand All @@ -141,6 +140,7 @@
"semver": "^7.3.5",
"send": "^0.19.0",
"shelljs": "^0.10.0",
"slugify": "^1.6.6",
"source-map-support": "^0.5.21",
"stylelint": "^14.14.0",
"terser": "^5.10.0",
Expand Down
96 changes: 78 additions & 18 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ import ts from 'typescript';

const projectRoot = process.cwd();

const packageJson = JSON.parse(readFileSync(join(projectRoot, 'package.json'), 'utf8'));

// Current version from the package.json. Splits it on the dash to ignore pre-release labels.
const packageVersion = require(join(projectRoot, 'package.json')).version.split('-')[0];
const packageVersion = packageJson.version.split('-')[0];

// Regex used to extract versions from a string.
const versionRegex = /\d+\.\d+\.\d+/;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
* script through a manifest file (generated by Bazel)
*/

const {join, dirname} = require('path');
const {sync: globSync} = require('glob');
const minimatch = require('minimatch');
const fs = require('fs');
const chalk = require('chalk');
import {join, dirname} from 'path';
import {sync as globSync} from 'glob';
import {readFileSync} from 'fs';
import minimatch from 'minimatch';
import chalk from 'chalk';

const [entryPointManifest] = process.argv.slice(2);
const entryPoints = JSON.parse(fs.readFileSync(entryPointManifest, 'utf8'));
const packagesDir = join(__dirname, '../src');
const entryPoints = JSON.parse(readFileSync(entryPointManifest, 'utf8'));
const packagesDir = join(process.cwd(), 'src');

/**
* Globs that matches directories which should never be considered
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import minimatch from 'minimatch';
import {join, relative} from 'path';
import ts from 'typescript';

const projectRoot = join(__dirname, '../');
const projectRoot = process.cwd();
const args = process.argv.slice(2);

if (args.length !== 1) {
Expand Down
Loading
Loading