Skip to content

Commit

Permalink
chore(monorepo): Upgraded Nx packages to version 16.9.1
Browse files Browse the repository at this point in the history
  • Loading branch information
sullivanpj committed Sep 29, 2023
1 parent d994538 commit 9c187fc
Show file tree
Hide file tree
Showing 28 changed files with 1,756 additions and 827 deletions.
4 changes: 2 additions & 2 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ AKKA_STREAMS_KAFKA_TEST_FILE_LOGGING=true
RUST_BACKTRACE=full
# PUPPETEER_SKIP_DOWNLOAD=true

HS_SERVICE_NAME="@stormstack/repo"
HS_SERVICE_NAME="@stormstack/monorepo"
# HS_DEBUG=true

SENTRY_ORGANIZATION="stormstack"
Expand Down Expand Up @@ -37,7 +37,7 @@ UPSTASH_KAFKA_REST_URL="https://fitting-dassie-7031-us1-rest-kafka.upstash.io"
# UPSTASH_KAFKA_REST_PASSWORD=

PRISMA_GENERATE_DATAPROXY=true
STORM_RUNTIME_MODULE="dist/.storm"
FORECAST_RUNTIME_MODULE="dist/.stormstack"

NO_D1_WARNING=true

Expand Down
2 changes: 2 additions & 0 deletions babel.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
".",

// Also consider monorepo packages "root" and load their .babelrc.json files.
"./apps/*",
"./libs/*",
"./design-system/*",
"./tools/*"
],
// @see https://babeljs.io/docs/en/options#presets
Expand Down
2 changes: 1 addition & 1 deletion commitlint.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = {
extends: ["./dist/tools/devops/config/commitlint/index.js"],
extends: ["./dist/tools/devops/config/commitlint/index.js"]
};
2 changes: 1 addition & 1 deletion libs/contact/typescript/server/attachment/schema.4cast
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ datasource db {
generator js {
provider = "prisma-client-js"
/// Generate into custom location because this repo has multiple prisma schemas
output = "../../../../../../node_modules/@prisma/client/contact-attachment"
output = "../../../../../node_modules/@prisma/client/contact-attachment"
}

plugin crud {
Expand Down
43 changes: 43 additions & 0 deletions migrations.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
{
"migrations": [
{
"cli": "nx",
"version": "16.8.0-beta.3",
"description": "Escape $ in env variables",
"implementation": "./src/migrations/update-16-8-0/escape-dollar-sign-env-variables",
"package": "nx",
"name": "16.8.0-escape-dollar-sign-env"
},
{
"cli": "nx",
"version": "16.9.0-beta.1",
"description": "Replace imports of Module Federation utils frm @nx/devkit to @nx/webpack",
"implementation": "./src/migrations/update-16-9-0/migrate-mf-util-usage",
"package": "@nx/devkit",
"name": "update-16-9-0-migrate-mf-usage-to-webpack"
},
{
"cli": "nx",
"version": "16.8.2-beta.0",
"description": "Remove invalid options (strict, noInterop) for ES6 type modules.",
"factory": "./src/migrations/update-16-8-2/update-swcrc",
"package": "@nx/js",
"name": "16-8-2-update-swcrc"
},
{
"cli": "nx",
"version": "16.8.0-beta.4",
"description": "Update to Cypress v13. Most noteable change is video recording is off by default. This migration will only update if the workspace is already on Cypress v12. https://docs.cypress.io/guides/references/migration-guide#Migrating-to-Cypress-130",
"implementation": "./src/migrations/update-16-8-0/cypress-13",
"package": "@nx/cypress",
"name": "update-16-8-0-cypress-13"
},
{
"version": "16.8.0",
"description": "update-16-8-0-add-ignored-files",
"implementation": "./src/migrations/update-16-8-0-add-ignored-files/update-16-8-0-add-ignored-files",
"package": "@nx/linter",
"name": "update-16-8-0-add-ignored-files"
}
]
}
6 changes: 6 additions & 0 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,12 @@
],
"sharedGlobals": ["{workspaceRoot}/babel.config.json"]
},
"defaultBase": "main",
"pluginsConfig": {
"@nrwl/js": {
"analyzeSourceFiles": false
}
},
"generators": {
"@nx/react": {
"application": {
Expand Down
69 changes: 34 additions & 35 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@stormstack/root",
"name": "monorepo",
"namespace": "@stormstack",
"version": "0.0.0",
"private": true,
Expand Down Expand Up @@ -38,49 +38,49 @@
"url": "https://stormcloud.dev"
},
"scripts": {
"nx": "nx",
"help": "nx help",
"prepare": "pnpm prepare:husky && npx patch-package -y",
"prepare:husky": "is-ci || husky install",
"preinstall": "node -e \"if(process.env.CI == 'true') {console.log('Skipping preinstall...'); process.exit(1)}\" || npx -y only-allow pnpm",
"install:csb": "corepack enable && pnpm install --frozen-lockfile",
"local-registry": "nx local-registry @stormstack/root",
"add:contributors": "all-contributors add",
"add:decisions": "pnpm log4brains adr new",
"analyze": "cross-env ANALYZE=true npm run build",
"build": "pnpm nx run-many -t build --all --parallel 4",
"build:relay": "relay-compiler ./dist/tools/devops/config/relay",
"build:storybook": "cross-env FORCE_COLOR=1 storybook build -s public",
"build:tools": "cross-env FORCE_COLOR=1 pnpm nx run tools-executors-typescript:build && pnpm nx run tools-executors-docs:build && pnpm nx run design-system-tokens:build:impact",
"build:tools-ci": "pnpm nx run tools-executors-typescript:build && pnpm nx run design-system-tokens:style-dictionary",
"build:web-deploy": "pnpm run build:tools-ci && pnpm nx run web-shell:build:production",
"build:relay": "relay-compiler ./dist/tools/devops/config/relay",
"clean": "rimraf dist",
"clean:apps": "rimraf dist/apps",
"clean:libs": "rimraf dist/libs",
"clean:tools": "rimraf dist/tools",
"commit": "git-cz",
"dep-graph": "nx dep-graph",
"e2e": "nx e2e",
"format": "nx format:write && pnpm doctoc --github README.md",
"generate": "graphql-codegen --config graphql-codegen.ts",
"generate:contributors": "all-contributors generate",
"generate:graphql": "graphql-codegen --config graphql-codegen.ts",
"help": "nx help",
"preinstall": "node -e \"if(process.env.CI == 'true') {console.log('Skipping preinstall...'); process.exit(1)}\" || npx -y only-allow pnpm",
"install:csb": "corepack enable && pnpm install --frozen-lockfile",
"lint": "pnpm lint:language && lint:dependency-versions",
"lint:dependency-versions": "cross-env FORCE_COLOR=1 check-dependency-version-consistency . --fix",
"lint:language": "cross-env FORCE_COLOR=1 alex . !**/CODE_OF_CONDUCT.md --quiet",
"lint:spellcheck": "cross-env FORCE_COLOR=1 cspell lint \"**/*.{txt,js,jsx,ts,tsx,md,mdx}\" --cache --no-progress --relative --dot --gitignore --config=dist/tools/devops/config/cspell/config.js",
"local-registry": "nx local-registry @stormstack/root",
"nx": "nx",
"nx-release": "nx generate @stormstack/tools-generators-typescript:monorepo-release --no-interactive",
"pre-commit": "lint-staged --concurrent false --config @stormstack/tools-devops-config/lint-staged",
"prepare": "pnpm prepare:husky && npx patch-package -y",
"prepare:husky": "is-ci || husky install",
"preview:decisions": "pnpm log4brains preview",
"watch:relay": "pnpm build:relay --watch",
"repo-check": "pnpm repo-check:manypkg && pnpm repo-check:circular-deps",
"repo-check:circular-deps": "pnpm exec dpdm ",
"repo-check:manypkg": "pnpm exec manypkg check",
"start": "nx serve",
"storybook": "cross-env FORCE_COLOR=1 storybook dev -p 6006",
"test": "nx test",
"e2e": "nx e2e",
"test:storybook": "cross-env FORCE_COLOR=1 test-storybook",
"typecheck": "pnpm run -r typecheck",
"nx-release": "nx generate @stormstack/tools-generators-typescript:monorepo-release --no-interactive"
"watch:relay": "pnpm build:relay --watch"
},
"husky": {
"hooks": {
Expand Down Expand Up @@ -170,22 +170,22 @@
"@manypkg/cli": "^0.21.0",
"@mdx-js/react": "1.6.22",
"@nx-plus/docusaurus": "^15.0.0-rc.0",
"@nx/cypress": "16.7.0",
"@nx/devkit": "16.7.0",
"@nx/esbuild": "16.7.0",
"@nx/eslint-plugin": "16.7.0",
"@nx/jest": "16.7.0",
"@nx/js": "16.7.0",
"@nx/linter": "16.7.0",
"@nx/next": "16.7.0",
"@nx/node": "16.7.0",
"@nx/plugin": "16.7.0",
"@nx/react": "16.7.0",
"@nx/rollup": "16.7.0",
"@nx/storybook": "16.7.0",
"@nx/web": "16.7.0",
"@nx/webpack": "16.7.0",
"@nx/workspace": "16.7.0",
"@nx/cypress": "16.9.1",
"@nx/devkit": "16.9.1",
"@nx/esbuild": "16.9.1",
"@nx/eslint-plugin": "16.9.1",
"@nx/jest": "16.9.1",
"@nx/js": "16.9.1",
"@nx/linter": "16.9.1",
"@nx/next": "16.9.1",
"@nx/node": "16.9.1",
"@nx/plugin": "16.9.1",
"@nx/react": "16.9.1",
"@nx/rollup": "16.9.1",
"@nx/storybook": "16.9.1",
"@nx/web": "16.9.1",
"@nx/webpack": "16.9.1",
"@nx/workspace": "16.9.1",
"@nxkit/style-dictionary": "^3.0.2",
"@opentelemetry/api": "^1.4.1",
"@opentelemetry/instrumentation": "^0.41.2",
Expand Down Expand Up @@ -213,8 +213,8 @@
"@swc-jotai/react-refresh": "^0.1.0",
"@swc-node/register": "^1.6.7",
"@swc/cli": "^0.1.62",
"@swc/core": "^1.3.83",
"@swc/helpers": "^0.5.2",
"@swc/core": "1.3.90",
"@swc/helpers": "0.5.2",
"@swc/jest": "^0.2.29",
"@tailwindcss/forms": "^0.5.3",
"@tailwindcss/line-clamp": "^0.4.4",
Expand Down Expand Up @@ -243,11 +243,11 @@
"cross-env": "^7.0.3",
"cspell": "^6.31.1",
"css-loader": "^6.4.0",
"cypress": "^12.16.0",
"cypress": "^13.0.0",
"cz-conventional-changelog": "^3.3.0",
"doctoc": "^2.2.1",
"dpdm": "^3.13.1",
"esbuild": "^0.18.11",
"esbuild": "0.19.2",
"eslint": "8.46.0",
"eslint-config-next": "^13.4.7",
"eslint-config-prettier": "8.8.0",
Expand All @@ -272,8 +272,8 @@
"log4brains": "^1.0.1",
"mustache": "^4.2.0",
"next-intl": "^2.13.1",
"nx": "16.7.0",
"nx-cloud": "16.3.0",
"nx": "16.9.1",
"nx-cloud": "16.4.0",
"patch-package": "^7.0.0",
"postcss": "^8.4.23",
"postcss-import": "^15.1.0",
Expand Down Expand Up @@ -333,7 +333,6 @@
},
"pnpm": {
"patchedDependencies": {
"@nx/js@16.7.0": "patches/@nx__js@16.7.0.patch",
"@graphql-hive/client@0.24.1": "patches/@graphql-hive__client@0.24.1.patch",
"@graphql-hive/core@0.2.3": "patches/@graphql-hive__core@0.2.3.patch",
"@graphql-tools/graphql-file-loader@8.0.0": "patches/@graphql-tools__graphql-file-loader@8.0.0.patch",
Expand Down
32 changes: 0 additions & 32 deletions patches/@nx__js@16.7.0.patch

This file was deleted.

Loading

0 comments on commit 9c187fc

Please sign in to comment.