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

Update app to Angular version 18, with package and angular.json (CLI support) changes #71

Merged
merged 8 commits into from
Sep 18, 2024

Conversation

DivergentEuropeans
Copy link
Member

Proposed changes

This PR addresses Issue: [Link to Github issue within https://github.com/zowe/zlux/issues if any]

This PR depends upon the following PRs:

Type of change

Please delete options that are not relevant.

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Change in a documentation
  • Refactor the code
  • Chore, repository cleanup, updates the dependencies.
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)

PR Checklist

Please delete options that are not relevant.

  • If the changes in this PR are meant for the next release / mainline, this PR targets the "staging" branch.
  • My code follows the style guidelines of this project (see: Contributing guideline)
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • New and existing unit tests pass locally with my changes
  • video or image is included if visual changes are made
  • Relevant update to CHANGELOG.md
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works, or describe a test method below

Testing

Further comments

zowe-robot and others added 5 commits February 6, 2024 15:04
Signed-off-by: zowe-robot <zowe.robot@gmail.com>
Signed-off-by: zowe-robot <zowe.robot@gmail.com>
Signed-off-by: zowe-robot <zowe.robot@gmail.com>
Signed-off-by: zowe-robot <zowe.robot@gmail.com>
Signed-off-by: Satish Wadkar <swadkar@rocketsoftware.com>
Satish Wadkar added 2 commits August 28, 2024 13:48
Signed-off-by: Satish Wadkar <swadkar@rocketsoftware.com>
Signed-off-by: Satish Wadkar <swadkar@rocketsoftware.com>
@DivergentEuropeans DivergentEuropeans changed the title [WIP] Update app to Angular version 18, with package and angular.json (CLI support) changes Update app to Angular version 18, with package and angular.json (CLI support) changes Aug 28, 2024
@DivergentEuropeans DivergentEuropeans changed the base branch from v2.x/staging to v3.x/staging August 28, 2024 19:36
Copy link
Member

@1000TurquoisePogs 1000TurquoisePogs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are missing "entryPoint" zowe/zlux-app-server#308

Please do

"entryPoint": {
"2.0": "main.js",
"3.0": "v3/main.js"
}

Our build automation is already setup to handle this. It builds v2 content into the web folder alongside v3 content, so they should be separated in that way.

@@ -1,7 +1,7 @@
{
"identifier": "org.zowe.terminal.vt",
"apiVersion": "2.0.0",
"pluginVersion": "2.14.0",
"pluginVersion": "2.18.0",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that is not semver.
you have made breaking changes. it is v3.0.0

'path': path.resolve(__dirname, '../web'),
'filename': 'main.js',
output: {
path: path.resolve(__dirname, '../web'),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

web/v3

to isolate it from the v2 content that the build system will populate into the web folder.

},
'plugins': [
plugins: [
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CopyWebPackPlugin's "to" needs to be "../web/v3/assets"

Signed-off-by: Satish Wadkar <swadkar@rocketsoftware.com>
@pull-request-size pull-request-size bot added size/L and removed size/XL labels Sep 4, 2024
clean: true
},
resolve: {
alias: {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

likely needs resolve.extensions = ['.ts', '.js']

@@ -49,7 +74,7 @@ function deepMerge(base, extension) {
if (!base[key]) base[key] = {};
deepMerge(base[key], extension[key]);
} else {
Object.assign(base, {[key]: extension[key]});
Object.assign(base, { [key]: extension[key] });
}
}
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

export config to module.exports

@DivergentEuropeans DivergentEuropeans merged commit 725a0fa into zowe:v3.x/staging Sep 18, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants