Simplify the build pipeline (#1385)

Co-authored-by: Oliver Abrahams <[email protected]>
Co-authored-by: James Mockett <[email protected]>

.changeset/config.json

@@ -8,7 +8,7 @@
 	"baseBranch": "main",
 	"updateInternalDependencies": "patch",
 	"bumpVersionsWithWorkspaceProtocolOnly": true,
-	"ignore": ["@csnx/*"],
+	"ignore": ["github-pages", "configs"],
 	"___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
 		"onlyUpdatePeerDependentsWhenOutOfRange": true
 	}

.changeset/lovely-moose-thank.md

@@ -0,0 +1,23 @@
+---
+'@guardian/source-react-components-development-kitchen': patch
+'@guardian/eslint-plugin-source-react-components': patch
+'@guardian/eslint-plugin-source-foundations': patch
+'@guardian/eslint-config-typescript': patch
+'@guardian/source-react-components': patch
+'@guardian/identity-auth-frontend': patch
+'@guardian/browserslist-config': patch
+'@guardian/source-foundations': patch
+'@guardian/cobalt-plugin-ts': patch
+'@guardian/newsletter-types': patch
+'@guardian/core-web-vitals': patch
+'@guardian/design-tokens': patch
+'@guardian/eslint-config': patch
+'@guardian/identity-auth': patch
+'@guardian/ab-react': patch
+'@guardian/prettier': patch
+'@guardian/tsconfig': patch
+'@guardian/ab-core': patch
+'@guardian/libs': patch
+---
+
+Now bundled using [`pkgroll`](https://www.npmjs.com/package/pkgroll).

.eslintrc.cjs

@@ -6,32 +6,19 @@ module.exports = {
 	// disable eslint on all files by default, for perf reasons
 	// re-enabled in each projects own eslint config (ignorePatterns: ['!**/*'])
 	ignorePatterns: ['**/*'],
-	plugins: ['@nx'],
+	parser: '@typescript-eslint/parser',
+	parserOptions: {
+		sourceType: 'module',
+		ecmaVersion: 2020,
+	},
 	overrides: [
-		{
-			files: ['*.ts', '*.tsx', '*.js', '*.jsx'],
-			rules: {
-				'@nx/enforce-module-boundaries': [
-					'error',
-					{
-						enforceBuildableLibDependency: true,
-						depConstraints: [
-							{
-								sourceTag: '*',
-								onlyDependOnLibsWithTags: ['*'],
-							},
-						],
-					},
-				],
-			},
-		},
 		{
 			files: ['*.js', '*.jsx', '*.mjs', '*.cjs'],
-			extends: ['plugin:@nx/javascript', '@guardian/eslint-config'],
+			extends: ['@guardian/eslint-config'],
 		},
 		{
 			files: ['*.ts', '*.tsx', '*.mts', '*.cts', '*.d.ts'],
-			extends: ['plugin:@nx/typescript', '@guardian/eslint-config-typescript'],
+			extends: ['@guardian/eslint-config-typescript'],
 			settings: {
 				'import/resolver': {
 					typescript: {
@@ -46,6 +33,12 @@ module.exports = {
 				'import/no-default-export': 'off',
 			},
 		},
+		{
+			files: ['rollup.config.js'],
+			rules: {
+				'import/no-default-export': 'off',
+			},
+		},
 		{
 			files: ['*.stories.*'],
 			rules: {

.github/actions/setup-node-env/action.yml

@@ -18,11 +18,18 @@ runs:
     - run: pnpm install --frozen-lockfile
       shell: bash
 
+    # if cypress tests fail _and_ you have an update to the lockfile, you may
+    # need to do a single run with this uncommented...
+    # don't forget to check the version.
+    # i hate cypress.
+    # - run: pnpm dlx [email protected] install --force
+    #   shell: bash
+
     # Restores cypress binary cache. If the binary is missing, it will be
     # downloaded and cached for next time.
     # https://docs.cypress.io/guides/continuous-integration/introduction#Caching
     - name: Cache Cypress binary
       uses: actions/cache@v4
       with:
         path: ~/.cache/Cypress
-        key: cypress-${{ runner.os }}-${{ hashFiles('pnpm-lock.yaml') }}
+        key: cypress-${{ runner.os }}-cypress-${{ hashFiles('pnpm-lock.yaml') }}

.github/dependabot.yml

@@ -67,8 +67,6 @@ updates:
       dependencies:
         dependency-type: 'production'
         update-types: ['minor', 'patch']
-        exclude-patterns:
-          - '@csnx*' # don't treat csnx packages as public
       devDependencies:
         dependency-type: 'development'
         update-types: ['minor', 'patch']

.github/workflows/canaries.yml

@@ -27,10 +27,7 @@ jobs:
       - name: Version
         run: pnpm changeset version --snapshot canary
 
-      - run: pnpm nx run-many --target=build --all=true
-
-      - name: Prepare Nx project for changesets
-        uses: ./.github/actions/prepare-for-changesets
+      - run: make build
 
       - name: Release
         uses: changesets/action@v1

.github/workflows/changesets.yml

@@ -30,9 +30,6 @@ jobs:
 
       - run: pnpm nx run-many --target=build --all=true
 
-      - name: Prepare Nx project for changesets
-        uses: ./.github/actions/prepare-for-changesets
-
       # down to business...
       - name: Use GitHub App Token
         uses: actions/create-github-app-token@v1

.lintstagedrc.js

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
 	'*': 'prettier --ignore-unknown --write --cache',
 	'package.json': 'sort-package-json',
 };

.storybook/main.js

@@ -1,5 +1,4 @@
 const path = require('path');
-const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
 const nodeModulesExclude = {
 	and: [/node_modules/],
 	not: [/@guardian\//],
@@ -49,13 +48,6 @@ module.exports = {
 		).exclude = nodeModulesExclude;
 
 		config.resolve.plugins ||= [];
-		config.resolve.plugins.push(
-			new TsconfigPathsPlugin({
-				configFile: path.resolve(__dirname, '..', 'tsconfig.base.json'),
-				extensions: config.resolve.extensions,
-				mainFields: config.resolve.mainFields,
-			}),
-		);
 		return config;
 	},
 	framework: {

Makefile

@@ -182,10 +182,6 @@ install: check-node-version
 @guardian/ab-react\:verify-dist: env
 	@corepack pnpm nx run @guardian/ab-react:verify-dist --skip-nx-cache=$(SKIP_NX_CACHE)
 
-.PHONY: @guardian/browserslist-config\:build
-@guardian/browserslist-config\:build: env
-	@corepack pnpm nx run @guardian/browserslist-config:build --skip-nx-cache=$(SKIP_NX_CACHE)
-
 .PHONY: @guardian/browserslist-config\:fix
 @guardian/browserslist-config\:fix: env
 	@corepack pnpm nx run @guardian/browserslist-config:fix --skip-nx-cache=$(SKIP_NX_CACHE)
@@ -198,14 +194,6 @@ install: check-node-version
 @guardian/browserslist-config\:update-readme: env
 	@corepack pnpm nx run @guardian/browserslist-config:update-readme --skip-nx-cache=$(SKIP_NX_CACHE)
 
-.PHONY: @guardian/browserslist-config\:verify-dist
-@guardian/browserslist-config\:verify-dist: env
-	@corepack pnpm nx run @guardian/browserslist-config:verify-dist --skip-nx-cache=$(SKIP_NX_CACHE)
-
-.PHONY: @guardian/cobalt-plugin-ts\:build
-@guardian/cobalt-plugin-ts\:build: env
-	@corepack pnpm nx run @guardian/cobalt-plugin-ts:build --skip-nx-cache=$(SKIP_NX_CACHE)
-
 .PHONY: @guardian/cobalt-plugin-ts\:fix
 @guardian/cobalt-plugin-ts\:fix: env
 	@corepack pnpm nx run @guardian/cobalt-plugin-ts:fix --skip-nx-cache=$(SKIP_NX_CACHE)
@@ -246,18 +234,10 @@ install: check-node-version
 @guardian/design-tokens\:fix: env
 	@corepack pnpm nx run @guardian/design-tokens:fix --skip-nx-cache=$(SKIP_NX_CACHE)
 
-.PHONY: @guardian/design-tokens\:generate-tokens
-@guardian/design-tokens\:generate-tokens: env
-	@corepack pnpm nx run @guardian/design-tokens:generate-tokens --skip-nx-cache=$(SKIP_NX_CACHE)
-
 .PHONY: @guardian/design-tokens\:lint
 @guardian/design-tokens\:lint: env
 	@corepack pnpm nx run @guardian/design-tokens:lint --skip-nx-cache=$(SKIP_NX_CACHE)
 
-.PHONY: @guardian/eslint-config\:build
-@guardian/eslint-config\:build: env
-	@corepack pnpm nx run @guardian/eslint-config:build --skip-nx-cache=$(SKIP_NX_CACHE)
-
 .PHONY: @guardian/eslint-config\:fix
 @guardian/eslint-config\:fix: env
 	@corepack pnpm nx run @guardian/eslint-config:fix --skip-nx-cache=$(SKIP_NX_CACHE)
@@ -266,14 +246,6 @@ install: check-node-version
 @guardian/eslint-config\:lint: env
 	@corepack pnpm nx run @guardian/eslint-config:lint --skip-nx-cache=$(SKIP_NX_CACHE)
 
-.PHONY: @guardian/eslint-config\:verify-dist
-@guardian/eslint-config\:verify-dist: env
-	@corepack pnpm nx run @guardian/eslint-config:verify-dist --skip-nx-cache=$(SKIP_NX_CACHE)
-
-.PHONY: @guardian/eslint-config-typescript\:build
-@guardian/eslint-config-typescript\:build: env
-	@corepack pnpm nx run @guardian/eslint-config-typescript:build --skip-nx-cache=$(SKIP_NX_CACHE)
-
 .PHONY: @guardian/eslint-config-typescript\:fix
 @guardian/eslint-config-typescript\:fix: env
 	@corepack pnpm nx run @guardian/eslint-config-typescript:fix --skip-nx-cache=$(SKIP_NX_CACHE)
@@ -282,10 +254,6 @@ install: check-node-version
 @guardian/eslint-config-typescript\:lint: env
 	@corepack pnpm nx run @guardian/eslint-config-typescript:lint --skip-nx-cache=$(SKIP_NX_CACHE)
 
-.PHONY: @guardian/eslint-config-typescript\:verify-dist
-@guardian/eslint-config-typescript\:verify-dist: env
-	@corepack pnpm nx run @guardian/eslint-config-typescript:verify-dist --skip-nx-cache=$(SKIP_NX_CACHE)
-
 .PHONY: @guardian/eslint-plugin-source-foundations\:build
 @guardian/eslint-plugin-source-foundations\:build: env
 	@corepack pnpm nx run @guardian/eslint-plugin-source-foundations:build --skip-nx-cache=$(SKIP_NX_CACHE)
@@ -426,10 +394,6 @@ install: check-node-version
 @guardian/newsletter-types\:lint: env
 	@corepack pnpm nx run @guardian/newsletter-types:lint --skip-nx-cache=$(SKIP_NX_CACHE)
 
-.PHONY: @guardian/prettier\:build
-@guardian/prettier\:build: env
-	@corepack pnpm nx run @guardian/prettier:build --skip-nx-cache=$(SKIP_NX_CACHE)
-
 .PHONY: @guardian/prettier\:fix
 @guardian/prettier\:fix: env
 	@corepack pnpm nx run @guardian/prettier:fix --skip-nx-cache=$(SKIP_NX_CACHE)
@@ -438,10 +402,6 @@ install: check-node-version
 @guardian/prettier\:lint: env
 	@corepack pnpm nx run @guardian/prettier:lint --skip-nx-cache=$(SKIP_NX_CACHE)
 
-.PHONY: @guardian/prettier\:verify-dist
-@guardian/prettier\:verify-dist: env
-	@corepack pnpm nx run @guardian/prettier:verify-dist --skip-nx-cache=$(SKIP_NX_CACHE)
-
 .PHONY: @guardian/source-foundations\:build
 @guardian/source-foundations\:build: env
 	@corepack pnpm nx run @guardian/source-foundations:build --skip-nx-cache=$(SKIP_NX_CACHE)
@@ -546,10 +506,6 @@ install: check-node-version
 @guardian/source-react-components-development-kitchen\:verify-dist: env
 	@corepack pnpm nx run @guardian/source-react-components-development-kitchen:verify-dist --skip-nx-cache=$(SKIP_NX_CACHE)
 
-.PHONY: @guardian/tsconfig\:build
-@guardian/tsconfig\:build: env
-	@corepack pnpm nx run @guardian/tsconfig:build --skip-nx-cache=$(SKIP_NX_CACHE)
-
 .PHONY: @guardian/tsconfig\:fix
 @guardian/tsconfig\:fix: env
 	@corepack pnpm nx run @guardian/tsconfig:fix --skip-nx-cache=$(SKIP_NX_CACHE)
@@ -558,10 +514,6 @@ install: check-node-version
 @guardian/tsconfig\:lint: env
 	@corepack pnpm nx run @guardian/tsconfig:lint --skip-nx-cache=$(SKIP_NX_CACHE)
 
-.PHONY: @guardian/tsconfig\:verify-dist
-@guardian/tsconfig\:verify-dist: env
-	@corepack pnpm nx run @guardian/tsconfig:verify-dist --skip-nx-cache=$(SKIP_NX_CACHE)
-
 .PHONY: github-pages\:build
 github-pages\:build: env
 	@corepack pnpm nx run github-pages:build --skip-nx-cache=$(SKIP_NX_CACHE)

README.md

@@ -93,15 +93,12 @@ Project-specific tasks are defined as `scripts` in a `package.json` or `targets`
 
 #### @guardian/browserslist-config
 
-- `make @guardian/browserslist-config:build`
 - `make @guardian/browserslist-config:fix`
 - `make @guardian/browserslist-config:lint`
 - `make @guardian/browserslist-config:update-readme`
-- `make @guardian/browserslist-config:verify-dist`
 
 #### @guardian/cobalt-plugin-ts
 
-- `make @guardian/cobalt-plugin-ts:build`
 - `make @guardian/cobalt-plugin-ts:fix`
 - `make @guardian/cobalt-plugin-ts:lint`
 
@@ -118,22 +115,17 @@ Project-specific tasks are defined as `scripts` in a `package.json` or `targets`
 
 - `make @guardian/design-tokens:build`
 - `make @guardian/design-tokens:fix`
-- `make @guardian/design-tokens:generate-tokens`
 - `make @guardian/design-tokens:lint`
 
 #### @guardian/eslint-config
 
-- `make @guardian/eslint-config:build`
 - `make @guardian/eslint-config:fix`
 - `make @guardian/eslint-config:lint`
-- `make @guardian/eslint-config:verify-dist`
 
 #### @guardian/eslint-config-typescript
 
-- `make @guardian/eslint-config-typescript:build`
 - `make @guardian/eslint-config-typescript:fix`
 - `make @guardian/eslint-config-typescript:lint`
-- `make @guardian/eslint-config-typescript:verify-dist`
 
 #### @guardian/eslint-plugin-source-foundations
 
@@ -190,10 +182,8 @@ Project-specific tasks are defined as `scripts` in a `package.json` or `targets`
 
 #### @guardian/prettier
 
-- `make @guardian/prettier:build`
 - `make @guardian/prettier:fix`
 - `make @guardian/prettier:lint`
-- `make @guardian/prettier:verify-dist`
 
 #### @guardian/source-foundations
 
@@ -232,10 +222,8 @@ Project-specific tasks are defined as `scripts` in a `package.json` or `targets`
 
 #### @guardian/tsconfig
 
-- `make @guardian/tsconfig:build`
 - `make @guardian/tsconfig:fix`
 - `make @guardian/tsconfig:lint`
-- `make @guardian/tsconfig:verify-dist`
 
 #### github-pages
 

apps/github-pages/astro.config.mjs

@@ -1,25 +1,10 @@
 import { defineConfig } from 'astro/config';
-import tsConfig from '../../tsconfig.base.json';
-import path from 'node:path';
 
 import svelte from '@astrojs/svelte';
 
-// duplicate the aliases defined in tsconfig.base.json
-let alias = {};
-for (const [module, modulePath] of Object.entries(
-	tsConfig.compilerOptions.paths,
-)) {
-	alias[module] = path.resolve('../../' + modulePath[0] + '.ts');
-}
-
 // https://astro.build/config
 export default defineConfig({
 	site: 'https://guardian.github.io',
 	base: '/csnx',
 	integrations: [svelte()],
-	vite: {
-		resolve: {
-			alias,
-		},
-	},
 });