Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: upgrade angular version to 17.2 EBS-1380 STPA-343 #229

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
dd9ee04
chore: nx repair
ceisipeik-nortal Apr 17, 2024
b431fd8
chore: migrate to nx 15.5.0 from 15.4.5
ceisipeik-nortal Apr 18, 2024
93675d5
fix(cypress): table-card test to be compatible with cypress v12
ceisipeik-nortal Apr 18, 2024
4fd7737
fix(cypress): table test to be compatible with cypress v12
ceisipeik-nortal Apr 18, 2024
22bcb73
fix(cypress): reorderable-list test to be compatible with cypress v12
ceisipeik-nortal Apr 18, 2024
e769ae9
chore: upgrade node and typescript
ceisipeik-nortal Apr 18, 2024
e1c185b
chore: migrate to nx 15.8.0 from 15.5.0
ceisipeik-nortal Apr 18, 2024
04fcaf2
chore: migrate to nx 16.1.0 from 15.8.0
ceisipeik-nortal Apr 22, 2024
2cb97a2
fix: tsconfig types
ceisipeik-nortal Apr 22, 2024
7a15fc7
chore: upgrade prettier
ceisipeik-nortal Apr 22, 2024
f4a7d67
chore: upgrade jest
ceisipeik-nortal Apr 22, 2024
4c21ca2
chore: upgrade storybook to 7.2.2
ceisipeik-nortal May 8, 2024
85af2c3
fix(storybook): rename list.stories.mdx to list.mdx
ceisipeik-nortal May 10, 2024
e7e4225
chore(storybook): refactor main files from js to ts and use ESM format
ceisipeik-nortal May 10, 2024
3cad3a1
chore(storybook): refactor preview from js to ts and use ESM format
ceisipeik-nortal May 10, 2024
54e65ae
chore(storybook): upgrade storybook addons
ceisipeik-nortal May 13, 2024
6a66311
chore: upgrade jest-preset-angular, axe-storybook-testing, sanitize-h…
ceisipeik-nortal May 14, 2024
6f098a7
chore: upgrade cypress-storybook
ceisipeik-nortal May 17, 2024
b88932b
chore: use raw md file type in circle stories
ceisipeik-nortal May 17, 2024
9ec2832
chore: set eslint allowCircularSelfDependency to true
ceisipeik-nortal May 21, 2024
880ea04
chore: migrate to nx 16.4.0 from 16.1.0
ceisipeik-nortal May 21, 2024
b65fe43
chore: migrate to nx 16.7.0 from 16.4.0
ceisipeik-nortal May 21, 2024
7ed5046
fix(ui): ivy compiler 'used before initialization' problems in toast …
ceisipeik-nortal May 21, 2024
713856b
chore: migrate to nx 17.1.1 from 16.7.0
ceisipeik-nortal May 21, 2024
81d1621
chore: remove workspace-lint usage, since the command is removed from…
ceisipeik-nortal May 21, 2024
d11cff1
chore: remove workspace-lint usage, since the command is removed star…
ceisipeik-nortal May 21, 2024
2220881
chore: migrate to nx 17.3.1 from 17.1.1
ceisipeik-nortal May 21, 2024
45719fa
chore: migrate to nx 18.1.1 from 17.3.1
ceisipeik-nortal May 21, 2024
1da5499
chore: upgrade node
ceisipeik-nortal May 21, 2024
ae404b2
chore: libraries' peer dependencies versions
ceisipeik-nortal May 21, 2024
33df418
chore: remove story sorting
ceisipeik-nortal May 24, 2024
5349d60
fix(storybook): installation stories
ceisipeik-nortal Jun 28, 2024
3923f88
fix(storybook): colors stories
ceisipeik-nortal Jul 1, 2024
3555f53
chore(storybook): provide BrowserAnimationsModule in preview inseatd …
ceisipeik-nortal Jul 1, 2024
22ed184
chore(ui): handle deprecated parameters.notes in stories
ceisipeik-nortal Jul 1, 2024
ba6714b
chore: updated package-lock
ceisipeik-nortal Jul 1, 2024
48728eb
chore: updated package-lock
ceisipeik-nortal Jul 1, 2024
a14f90e
chore: use addon-storysource instead of storybook-addon-html
ceisipeik-nortal Jul 11, 2024
428b916
chore(storybook): configure preview
ceisipeik-nortal Jul 11, 2024
72e9b75
fix(storybook): colors stories
ceisipeik-nortal Jul 11, 2024
103ad03
fix: markdown tables
ceisipeik-nortal Jul 11, 2024
e3b9e9f
chore(storybook): update peer dependencies versions in angular and ng…
ceisipeik-nortal Jul 11, 2024
ccefedc
fix(ui): toast.service story
ceisipeik-nortal Jul 12, 2024
bd3a82b
fix(cypress): table and table-card tests
ceisipeik-nortal Jul 12, 2024
8bc5490
format: with updated prettier and editorconfig rules
ceisipeik-nortal Jul 15, 2024
ba68ee7
chore(ng-diagrams): fix lint error
ceisipeik-nortal Jul 15, 2024
04f1f1b
chore: allow root main.ts import to pass module-boundaries rule
ceisipeik-nortal Jul 15, 2024
70f1a91
chore: fix e2e linting errors
ceisipeik-nortal Jul 15, 2024
44be2b5
Merge remote-tracking branch 'origin/main' into feature-EBS-1380-upgr…
ceisipeik-nortal Jul 15, 2024
dec4161
chore: revert notes import from .md?raw to .md
ceisipeik-nortal Jul 15, 2024
79f8b4a
fix(ui-e2e): circle component tests
ceisipeik-nortal Jul 15, 2024
e2b3895
fix(ui): replace '@' in html story with @
ceisipeik-nortal Jul 15, 2024
3b1b51e
chore(ui): remove aria-busy from datepicker html story
ceisipeik-nortal Jul 18, 2024
5e44c97
chore(ui): add missing aria roles to datepicker
ceisipeik-nortal Jul 18, 2024
5ab56f4
fix(ui): button text without underline story
ceisipeik-nortal Jul 30, 2024
d8d0552
fix(ui): form item with inline form elements story
ceisipeik-nortal Jul 30, 2024
86c251f
fix(ui): use initial template for NestedTracks story
ceisipeik-nortal Jul 30, 2024
e7ab4d5
chore(storybook): disable automatic opening of Storybook
ceisipeik-nortal Aug 2, 2024
77e79f0
chore(ng-diagrams): upgrade to angular 17.2
ceisipeik-nortal Aug 5, 2024
b0c9c6f
chore(storybook): upgrade to storybook 7.6
ceisipeik-nortal Aug 5, 2024
66f81d8
chore(ui): upgrade to angular 17.2
ceisipeik-nortal Aug 5, 2024
33c2afb
chore: remove duplicate empty line from readme
ceisipeik-nortal Aug 5, 2024
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
1 change: 1 addition & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ root = true
charset = utf-8
indent_style = space
indent_size = 2
max_line_length = 80
insert_final_newline = true
trim_trailing_whitespace = true

Expand Down
14 changes: 8 additions & 6 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
{
"root": true,
"ignorePatterns": ["**/*"],
"plugins": ["@nrwl/nx"],
"plugins": ["@nx"],
"overrides": [
{
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
"rules": {
"@nrwl/nx/enforce-module-boundaries": [
"@nx/enforce-module-boundaries": [
"error",
{
"enforceBuildableLibDependency": true,
"allow": [],
"allowCircularSelfDependency": true,
"allow": [".storybook/main"],
"depConstraints": [
{
"sourceTag": "*",
Expand All @@ -35,13 +36,14 @@
},
{
"files": ["*.ts", "*.tsx"],
"extends": ["plugin:@nrwl/nx/typescript"],
"extends": ["plugin:@nx/typescript"],
"rules": {}
},
{
"files": ["*.js", "*.jsx"],
"extends": ["plugin:@nrwl/nx/javascript"],
"extends": ["plugin:@nx/javascript"],
"rules": {}
}
]
],
"extends": ["plugin:storybook/recommended"]
}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ testem.log
Thumbs.db

.angular
.nx
.vscode/settings.json
libs/storybook/.storybook/documentation.json
/build-storybook.log
2 changes: 1 addition & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

npm run format && npm run affected:lint && npm run workspace-lint && npm run lint:css && npm run lint:svg
npm run format && npm run affected:lint && npm run lint:css && npm run lint:svg
2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@

/dist
/coverage

/.nx/cache
8 changes: 7 additions & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
{
"singleQuote": true
"useTabs": false,
"tabWidth": 2,
"singleQuote": true,
"semi": true,
"bracketSpacing": true,
"trailingComma": "es5",
"bracketSameLine": true
}
19 changes: 0 additions & 19 deletions .storybook/main.js

This file was deleted.

47 changes: 47 additions & 0 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
import { StorybookConfig } from '@storybook/angular';
import remarkGfm from 'remark-gfm';

const config: StorybookConfig = {
framework: {
name: '@storybook/angular',
options: {},
},
stories: [],
addons: [
'@storybook/addon-controls',
{
name: '@storybook/addon-storysource',
certainlyakey marked this conversation as resolved.
Show resolved Hide resolved
options: {
loaderOptions: {
prettierConfig: { printWidth: 80, singleQuote: false },
},
},
},
'@storybook/addon-actions',
'@storybook/addon-a11y',
'storybook-addon-pseudo-states',
'@storybook/addon-viewport',
{
name: '@storybook/addon-docs',
options: {
mdxPluginOptions: {
mdxCompileOptions: {
remarkPlugins: [remarkGfm],
certainlyakey marked this conversation as resolved.
Show resolved Hide resolved
},
},
},
},
],
core: { disableTelemetry: true },
docs: {
autodocs: true,
},
// uncomment the property below if you want to apply some webpack config globally
// webpackFinal: async (config, { configType }) => {
// // Make whatever fine-grained changes you need that should apply to all storybook configs
// // Return the altered config
// return config;
// },
};

export default config;
18 changes: 0 additions & 18 deletions angular.json

This file was deleted.

13 changes: 11 additions & 2 deletions apps/react-sandbox-e2e/cypress.config.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
import { defineConfig } from 'cypress';
import { nxE2EPreset } from '@nrwl/cypress/plugins/cypress-preset';
import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset';

export default defineConfig({
e2e: nxE2EPreset(__dirname),
e2e: {
...nxE2EPreset(__dirname),
/**
* TODO(@nx/cypress): In Cypress v12,the testIsolation option is turned on by default.
* This can cause tests to start breaking where not indended.
* You should consider enabling this once you verify tests do not depend on each other
* More Info: https://docs.cypress.io/guides/references/migration-guide#Test-Isolation
**/
testIsolation: false,
},
});
9 changes: 3 additions & 6 deletions apps/react-sandbox-e2e/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"projectType": "application",
"targets": {
"e2e": {
"executor": "@nrwl/cypress:cypress",
"executor": "@nx/cypress:cypress",
"options": {
"cypressConfig": "apps/react-sandbox-e2e/cypress.config.ts",
"devServerTarget": "react-sandbox:serve:development",
Expand All @@ -18,11 +18,8 @@
}
},
"lint": {
"executor": "@nrwl/linter:eslint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["apps/react-sandbox-e2e/**/*.{js,ts}"]
}
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"]
}
},
"tags": [],
Expand Down
2 changes: 1 addition & 1 deletion apps/react-sandbox/.babelrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"presets": [
[
"@nrwl/react/babel",
"@nx/react/babel",
{
"runtime": "automatic"
}
Expand Down
2 changes: 1 addition & 1 deletion apps/react-sandbox/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": ["plugin:@nrwl/nx/react", "../../.eslintrc.json"],
"extends": ["plugin:@nx/react", "../../.eslintrc.json"],
"ignorePatterns": ["!**/*"],
"overrides": [
{
Expand Down
4 changes: 2 additions & 2 deletions apps/react-sandbox/jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ export default {
displayName: 'react-sandbox',
preset: '../../jest.preset.js',
transform: {
'^(?!.*\\.(js|jsx|ts|tsx|css|json)$)': '@nrwl/react/plugins/jest',
'^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nrwl/react/babel'] }],
'^(?!.*\\.(js|jsx|ts|tsx|css|json)$)': '@nx/react/plugins/jest',
'^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nx/react/babel'] }],
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
};
19 changes: 8 additions & 11 deletions apps/react-sandbox/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"projectType": "application",
"targets": {
"build": {
"executor": "@nrwl/webpack:webpack",
"executor": "@nx/webpack:webpack",
"outputs": ["{options.outputPath}"],
"defaultConfiguration": "production",
"options": {
Expand All @@ -25,7 +25,8 @@
"libs/styles/src/lib/scss/main.scss"
],
"scripts": [],
"webpackConfig": "@nrwl/react/plugins/webpack"
"webpackConfig": "apps/react-sandbox/webpack.config.js",
"isolatedConfig": true
},
"configurations": {
"development": {
Expand All @@ -51,7 +52,7 @@
}
},
"serve": {
"executor": "@nrwl/webpack:dev-server",
"executor": "@nx/webpack:dev-server",
"defaultConfiguration": "development",
"options": {
"buildTarget": "react-sandbox:build",
Expand All @@ -68,18 +69,14 @@
}
},
"lint": {
"executor": "@nrwl/linter:eslint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["apps/react-sandbox/**/*.{ts,tsx,js,jsx}"]
}
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"]
},
"test": {
"executor": "@nrwl/jest:jest",
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
"options": {
"jestConfig": "apps/react-sandbox/jest.config.ts",
"passWithNoTests": true
"jestConfig": "apps/react-sandbox/jest.config.ts"
}
}
},
Expand Down
10 changes: 7 additions & 3 deletions apps/react-sandbox/tsconfig.app.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,15 @@
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "../../dist/out-tsc",
"types": ["node"]
"types": [
"node",
"@nx/react/typings/cssmodule.d.ts",
"@nx/react/typings/image.d.ts"
]
},
"files": [
"../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
"../../node_modules/@nrwl/react/typings/image.d.ts"
"../../node_modules/@nx/react/typings/cssmodule.d.ts",
"../../node_modules/@nx/react/typings/image.d.ts"
],
"exclude": [
"jest.config.ts",
Expand Down
11 changes: 8 additions & 3 deletions apps/react-sandbox/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@
"compilerOptions": {
"outDir": "../../dist/out-tsc",
"module": "commonjs",
"types": ["jest", "node"]
"types": [
"jest",
"node",
"@nx/react/typings/cssmodule.d.ts",
"@nx/react/typings/image.d.ts"
]
},
"include": [
"jest.config.ts",
Expand All @@ -18,7 +23,7 @@
"src/**/*.d.ts"
],
"files": [
"../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
"../../node_modules/@nrwl/react/typings/image.d.ts"
"../../node_modules/@nx/react/typings/cssmodule.d.ts",
"../../node_modules/@nx/react/typings/image.d.ts"
]
}
15 changes: 15 additions & 0 deletions apps/react-sandbox/webpack.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
const { composePlugins, withNx } = require('@nx/webpack');
const { withReact } = require('@nx/react');

// Nx plugins for webpack.
module.exports = composePlugins(
withNx(),
withReact(),
(config, { options, context }) => {
// Update the webpack config as needed here.
// e.g. config.plugins.push(new MyPlugin())
// For more information on webpack config and Nx see:
// https://nx.dev/packages/webpack/documents/webpack-config-setup
return config;
}
);
13 changes: 11 additions & 2 deletions apps/ria-e2e/cypress.config.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
import { defineConfig } from 'cypress';
import { nxE2EPreset } from '@nrwl/cypress/plugins/cypress-preset';
import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset';

export default defineConfig({
e2e: nxE2EPreset(__filename),
e2e: {
...nxE2EPreset(__filename),
/**
* TODO(@nx/cypress): In Cypress v12,the testIsolation option is turned on by default.
certainlyakey marked this conversation as resolved.
Show resolved Hide resolved
* This can cause tests to start breaking where not indended.
* You should consider enabling this once you verify tests do not depend on each other
* More Info: https://docs.cypress.io/guides/references/migration-guide#Test-Isolation
**/
testIsolation: false,
},
});
9 changes: 3 additions & 6 deletions apps/ria-e2e/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"projectType": "application",
"targets": {
"e2e": {
"executor": "@nrwl/cypress:cypress",
"executor": "@nx/cypress:cypress",
"options": {
"cypressConfig": "apps/ria-e2e/cypress.config.ts",
"devServerTarget": "ria:serve:development",
Expand All @@ -18,11 +18,8 @@
}
},
"lint": {
"executor": "@nrwl/linter:eslint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["apps/ria-e2e/**/*.{js,ts}"]
}
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"]
}
},
"tags": [],
Expand Down
Loading
Loading