Skip to content

Commit

Permalink
fix: forced resolution on types/react
Browse files Browse the repository at this point in the history
  • Loading branch information
jsalaber committed Jun 7, 2024
1 parent ab20277 commit b8414d1
Show file tree
Hide file tree
Showing 9 changed files with 2,273 additions and 3,004 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/build-changelog.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
name: Build Changelog

on:
pull_request

jobs:
build-changelog:
runs-on: ubuntu-latest
Expand Down
3 changes: 2 additions & 1 deletion examples/js/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
"examples/js/src/assets"
],
"styles": ["examples/js/src/styles.css"],
"scripts": []
"scripts": [],
"webpackConfig": "examples/js/webpack.config.js"
},
"configurations": {
"production": {
Expand Down
2 changes: 1 addition & 1 deletion examples/js/tsconfig.app.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
]
},
"exclude": ["**/*.spec.ts", "**/*.test.ts"],
"include": ["**/*.ts"]
"include": ["**/*.ts", "webpack.config.js"]
}
8 changes: 8 additions & 0 deletions examples/js/webpack.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
const { composePlugins, withNx } = require('@nx/webpack')

// Nx plugins for webpack.
module.exports = composePlugins(withNx(), (config) => {
// Update the webpack config as needed here.
// e.g. `config.plugins.push(new MyPlugin())`
return config
})
330 changes: 165 additions & 165 deletions migrations.json
Original file line number Diff line number Diff line change
@@ -1,167 +1,167 @@
{
"migrations": [
{
"cli": "nx",
"version": "17.3.1-beta.0",
"description": "Add project property to playwright config",
"implementation": "./src/migrations/update-17-3-1/add-project-to-config",
"package": "@nx/playwright",
"name": "17-3-1-add-project-to-config"
},
{
"cli": "nx",
"version": "18.1.0-beta.3",
"description": "Remove invalid baseUrl option from @nx/playwright:playwright targets in project.json.",
"implementation": "./src/migrations/update-18-1-0/remove-baseUrl-from-project-json",
"package": "@nx/playwright",
"name": "18-1-0-remove-baseUrl-from-project-json"
},
{
"cli": "nx",
"version": "18.1.0-beta.3",
"description": "Update to Cypress ^13.6.6 if the workspace is using Cypress v13 to ensure workspaces don't use v13.6.5 which has an issue when verifying Cypress.",
"implementation": "./src/migrations/update-18-1-0/update-cypress-version-13-6-6",
"package": "@nx/cypress",
"name": "update-cypress-version-13-6-6"
},
{
"cli": "nx",
"version": "17.0.2",
"description": "Remove deprecated build options",
"implementation": "./src/migrations/update-17-0-0/remove-deprecated-build-options",
"package": "@nx/js",
"name": "update-17-0-0-remove-deprecated-build-options"
},
{
"version": "17.1.0-beta.2",
"description": "Move jest executor options to nx.json targetDefaults",
"implementation": "./src/migrations/update-17-1-0/move-options-to-target-defaults",
"package": "@nx/jest",
"name": "move-options-to-target-defaults"
},
{
"cli": "nx",
"version": "17.2.6-beta.1",
"description": "Rename workspace rules from @nx/workspace/name to @nx/workspace-name",
"implementation": "./src/migrations/update-17-2-6-rename-workspace-rules/rename-workspace-rules",
"package": "@nx/eslint-plugin",
"name": "update-17-2-6-rename-workspace-rules"
},
{
"cli": "nx",
"version": "18.0.0-beta.0",
"description": "Add NX_MF_DEV_SERVER_STATIC_REMOTES to inputs for task hashing when '@nx/webpack:webpack' is used for Module Federation.",
"factory": "./src/migrations/update-18-0-0/add-mf-env-var-to-target-defaults",
"package": "@nx/react",
"name": "add-module-federation-env-var-to-target-defaults"
},
{
"cli": "nx",
"version": "18.1.1-beta.0",
"description": "Ensure targetDefaults inputs for task hashing when '@nx/webpack:webpack' is used are correct for Module Federation.",
"factory": "./src/migrations/update-18-1-1/fix-target-defaults-inputs",
"package": "@nx/react",
"name": "fix-target-defaults-for-webpack"
},
{
"cli": "nx",
"version": "17.2.1-beta.0",
"description": "Add webpack.config.js file when webpackConfig is not defined",
"implementation": "./src/migrations/update-17-2-1/webpack-config-setup",
"package": "@nx/webpack",
"name": "update-17-2-1-webpack-config-setup"
},
{
"cli": "nx",
"version": "17.2.7",
"description": "Remove patched eslint rule for @next/next/no-html-link-for-pages",
"implementation": "./src/migrations/update-17-2-7/remove-eslint-rules-patch",
"package": "@nx/next",
"name": "update-17-2-7"
},
{
"cli": "nx",
"version": "18.0.0-beta.0",
"description": "Add web configuration to react native projects",
"implementation": "./src/migrations/update-18-0-0/add-web-configuration",
"package": "@nx/react-native",
"name": "update-18-0-0-add-web-configuration"
},
{
"cli": "nx",
"version": "18.0.0-beta.0",
"description": "Upgrade react native storybook target to use web",
"implementation": "./src/migrations/update-18-0-0/change-storybook-targets",
"package": "@nx/react-native",
"name": "update-18-0-0-change-storybook-targets"
},
{
"cli": "nx",
"version": "18.0.0-beta.0",
"description": "Remove blockList in metro.config.js.",
"implementation": "./src/migrations/update-18-0-0/remove-block-list",
"package": "@nx/react-native",
"name": "update-18-0-0-remove-block-list"
},
{
"cli": "nx",
"version": "18.0.0-beta.0",
"description": "Remove metro-* and @react-native-community/cli-* from package.json devDependencies",
"implementation": "./src/migrations/update-18-0-0/remove-metro",
"package": "@nx/react-native",
"name": "update-18-0-0-remove-metro"
},
{
"cli": "nx",
"version": "18.0.0-beta.0",
"description": "Remove ensure-symlink target",
"implementation": "./src/migrations/update-18-0-0/remove-symlink-target",
"package": "@nx/react-native",
"name": "update-18-0-0-remove-symlink-target"
},
{
"cli": "nx",
"version": "18.0.0-beta.0",
"description": "Add upgrade target to react native projects",
"implementation": "./src/migrations/update-18-0-0/add-upgrade-target",
"package": "@nx/react-native",
"name": "update-18-0-0-add-upgrade-target"
},
{
"cli": "nx",
"version": "17.0.2",
"description": "Remove deprecated build options",
"implementation": "./src/migrations/update-17-0-0/remove-deprecated-build-options",
"package": "@nrwl/js",
"name": "update-17-0-0-remove-deprecated-build-options"
},
{
"version": "17.0.0-beta.7",
"description": "update-17-0-0-rename-to-eslint",
"implementation": "./src/migrations/update-17-0-0-rename-to-eslint/update-17-0-0-rename-to-eslint",
"package": "@nx/linter",
"name": "update-17-0-0-rename-to-eslint"
},
{
"version": "17.1.0-beta.1",
"description": "Updates for @typescript-utils/utils v6.9.1+",
"implementation": "./src/migrations/update-17-1-0/update-typescript-eslint",
"package": "@nx/linter",
"name": "update-typescript-eslint"
},
{
"version": "17.2.0-beta.0",
"description": "Simplify eslintFilePatterns",
"implementation": "./src/migrations/update-17-2-0/simplify-eslint-patterns",
"package": "@nx/linter",
"name": "simplify-eslint-patterns"
},
{
"version": "17.2.9",
"description": "Move executor options to target defaults",
"implementation": "./src/migrations/update-17-2-9/move-options-to-target-defaults",
"package": "@nx/linter",
"name": "move-options-to-target-defaults"
}
]
"migrations": [
{
"cli": "nx",
"version": "17.3.1-beta.0",
"description": "Add project property to playwright config",
"implementation": "./src/migrations/update-17-3-1/add-project-to-config",
"package": "@nx/playwright",
"name": "17-3-1-add-project-to-config"
},
{
"cli": "nx",
"version": "18.1.0-beta.3",
"description": "Remove invalid baseUrl option from @nx/playwright:playwright targets in project.json.",
"implementation": "./src/migrations/update-18-1-0/remove-baseUrl-from-project-json",
"package": "@nx/playwright",
"name": "18-1-0-remove-baseUrl-from-project-json"
},
{
"cli": "nx",
"version": "18.1.0-beta.3",
"description": "Update to Cypress ^13.6.6 if the workspace is using Cypress v13 to ensure workspaces don't use v13.6.5 which has an issue when verifying Cypress.",
"implementation": "./src/migrations/update-18-1-0/update-cypress-version-13-6-6",
"package": "@nx/cypress",
"name": "update-cypress-version-13-6-6"
},
{
"cli": "nx",
"version": "17.0.2",
"description": "Remove deprecated build options",
"implementation": "./src/migrations/update-17-0-0/remove-deprecated-build-options",
"package": "@nx/js",
"name": "update-17-0-0-remove-deprecated-build-options"
},
{
"version": "17.1.0-beta.2",
"description": "Move jest executor options to nx.json targetDefaults",
"implementation": "./src/migrations/update-17-1-0/move-options-to-target-defaults",
"package": "@nx/jest",
"name": "move-options-to-target-defaults"
},
{
"cli": "nx",
"version": "17.2.6-beta.1",
"description": "Rename workspace rules from @nx/workspace/name to @nx/workspace-name",
"implementation": "./src/migrations/update-17-2-6-rename-workspace-rules/rename-workspace-rules",
"package": "@nx/eslint-plugin",
"name": "update-17-2-6-rename-workspace-rules"
},
{
"cli": "nx",
"version": "18.0.0-beta.0",
"description": "Add NX_MF_DEV_SERVER_STATIC_REMOTES to inputs for task hashing when '@nx/webpack:webpack' is used for Module Federation.",
"factory": "./src/migrations/update-18-0-0/add-mf-env-var-to-target-defaults",
"package": "@nx/react",
"name": "add-module-federation-env-var-to-target-defaults"
},
{
"cli": "nx",
"version": "18.1.1-beta.0",
"description": "Ensure targetDefaults inputs for task hashing when '@nx/webpack:webpack' is used are correct for Module Federation.",
"factory": "./src/migrations/update-18-1-1/fix-target-defaults-inputs",
"package": "@nx/react",
"name": "fix-target-defaults-for-webpack"
},
{
"cli": "nx",
"version": "17.2.1-beta.0",
"description": "Add webpack.config.js file when webpackConfig is not defined",
"implementation": "./src/migrations/update-17-2-1/webpack-config-setup",
"package": "@nx/webpack",
"name": "update-17-2-1-webpack-config-setup"
},
{
"cli": "nx",
"version": "17.2.7",
"description": "Remove patched eslint rule for @next/next/no-html-link-for-pages",
"implementation": "./src/migrations/update-17-2-7/remove-eslint-rules-patch",
"package": "@nx/next",
"name": "update-17-2-7"
},
{
"cli": "nx",
"version": "18.0.0-beta.0",
"description": "Add web configuration to react native projects",
"implementation": "./src/migrations/update-18-0-0/add-web-configuration",
"package": "@nx/react-native",
"name": "update-18-0-0-add-web-configuration"
},
{
"cli": "nx",
"version": "18.0.0-beta.0",
"description": "Upgrade react native storybook target to use web",
"implementation": "./src/migrations/update-18-0-0/change-storybook-targets",
"package": "@nx/react-native",
"name": "update-18-0-0-change-storybook-targets"
},
{
"cli": "nx",
"version": "18.0.0-beta.0",
"description": "Remove blockList in metro.config.js.",
"implementation": "./src/migrations/update-18-0-0/remove-block-list",
"package": "@nx/react-native",
"name": "update-18-0-0-remove-block-list"
},
{
"cli": "nx",
"version": "18.0.0-beta.0",
"description": "Remove metro-* and @react-native-community/cli-* from package.json devDependencies",
"implementation": "./src/migrations/update-18-0-0/remove-metro",
"package": "@nx/react-native",
"name": "update-18-0-0-remove-metro"
},
{
"cli": "nx",
"version": "18.0.0-beta.0",
"description": "Remove ensure-symlink target",
"implementation": "./src/migrations/update-18-0-0/remove-symlink-target",
"package": "@nx/react-native",
"name": "update-18-0-0-remove-symlink-target"
},
{
"cli": "nx",
"version": "18.0.0-beta.0",
"description": "Add upgrade target to react native projects",
"implementation": "./src/migrations/update-18-0-0/add-upgrade-target",
"package": "@nx/react-native",
"name": "update-18-0-0-add-upgrade-target"
},
{
"cli": "nx",
"version": "17.0.2",
"description": "Remove deprecated build options",
"implementation": "./src/migrations/update-17-0-0/remove-deprecated-build-options",
"package": "@nrwl/js",
"name": "update-17-0-0-remove-deprecated-build-options"
},
{
"version": "17.0.0-beta.7",
"description": "update-17-0-0-rename-to-eslint",
"implementation": "./src/migrations/update-17-0-0-rename-to-eslint/update-17-0-0-rename-to-eslint",
"package": "@nx/linter",
"name": "update-17-0-0-rename-to-eslint"
},
{
"version": "17.1.0-beta.1",
"description": "Updates for @typescript-utils/utils v6.9.1+",
"implementation": "./src/migrations/update-17-1-0/update-typescript-eslint",
"package": "@nx/linter",
"name": "update-typescript-eslint"
},
{
"version": "17.2.0-beta.0",
"description": "Simplify eslintFilePatterns",
"implementation": "./src/migrations/update-17-2-0/simplify-eslint-patterns",
"package": "@nx/linter",
"name": "simplify-eslint-patterns"
},
{
"version": "17.2.9",
"description": "Move executor options to target defaults",
"implementation": "./src/migrations/update-17-2-9/move-options-to-target-defaults",
"package": "@nx/linter",
"name": "move-options-to-target-defaults"
}
]
}
12 changes: 6 additions & 6 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,11 @@
}
},
"release": {
"projects": ["sdk/*", "!sdk/openfeature-web-provider"],
"projectsRelationship": "independent",
"version": {
"conventionalCommits": true,
"currentVersionResolver": "registry"
}
"projects": ["sdk/*", "!sdk/openfeature-web-provider"],
"projectsRelationship": "independent",
"version": {
"conventionalCommits": true,
"currentVersionResolver": "registry"
}
}
}
Loading

0 comments on commit b8414d1

Please sign in to comment.