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

[YUNIKORN-2954] Remove so-called modular sidebar #219

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,9 @@ OS := $(shell uname -s | tr '[:upper:]' '[:lower:]')
license-check:
@echo "checking license headers:"
ifeq (darwin,$(OS))
$(shell mkdir -p "$(OUTPUT)" && find -E . -not \( -path './.git*' -prune \) -not \( -path ./coverage -prune \) -not \( -path ./node_modules -prune \) -not \( -path ./build -prune \) -not \( -path ./tools -prune \) -not -path ./pnpm-lock.yaml -not \( -path ./dist -prune \) -regex ".*\.(go|sh|md|conf|yaml|yml|html|mod|js)" -exec grep -L "Licensed to the Apache Software Foundation" {} \; > "$(OUTPUT)/license-check.txt")
$(shell mkdir -p "$(OUTPUT)" && find -E . -not \( -path './.git*' -prune \) -not \( -path ./coverage -prune \) -not \( -path ./node_modules -prune \) -not \( -path ./build -prune \) -not \( -path ./tools -prune \) -not -path ./pnpm-lock.yaml -regex ".*\.(go|sh|md|conf|yaml|yml|html|mod)" -exec grep -L "Licensed to the Apache Software Foundation" {} \; > "$(OUTPUT)/license-check.txt")
else
$(shell mkdir -p "$(OUTPUT)" && find . -not \( -path './.git*' -prune \) -not \( -path ./coverage -prune \) -not \( -path ./node_modules -prune \) -not \( -path ./build -prune \) -not \( -path ./tools -prune \) -not -path ./pnpm-lock.yaml -not \( -path ./node_modules -prune \) -regex ".*\.\(go\|sh\|md\|conf\|yaml\|yml\|html\|mod\|js\)" -exec grep -L "Licensed to the Apache Software Foundation" {} \; > "$(OUTPUT)/license-check.txt")
$(shell mkdir -p "$(OUTPUT)" && find . -not \( -path './.git*' -prune \) -not \( -path ./coverage -prune \) -not \( -path ./node_modules -prune \) -not \( -path ./build -prune \) -not \( -path ./tools -prune \) -not -path ./pnpm-lock.yaml -regex ".*\.\(go\|sh\|md\|conf\|yaml\|yml\|html\|mod\)" -exec grep -L "Licensed to the Apache Software Foundation" {} \; > "$(OUTPUT)/license-check.txt")
endif
@if [ -s "$(OUTPUT)/license-check.txt" ]; then \
echo "following files are missing license header:" ; \
Expand Down
47 changes: 12 additions & 35 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,32 +22,22 @@
"prefix": "app",
"architect": {
"build": {
"builder": "ngx-build-plus:browser",
"builder": "@angular-devkit/build-angular:browser",
"options": {
"outputPath": "dist/yunikorn-web",
"index": "src/index.html",
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "tsconfig.app.json",
"inlineStyleLanguage": "scss",
"assets": [
"src/favicon.ico",
"src/assets",
{
"glob": "LICENSE",
"input": "./",
"output": "./"
}
],
"assets": ["src/favicon.ico", "src/assets", {"glob": "LICENSE", "input": "./", "output": "./"}],
"styles": [
"src/styles.scss",
"node_modules/@fontsource/roboto/index.css",
"node_modules/@fontsource/roboto/500.css",
"node_modules/@fortawesome/fontawesome-free/css/all.css"
],
"scripts": [],
"extraWebpackConfig": "webpack.config.js",
"commonChunk": false
"scripts": []
},
"configurations": {
"production": {
Expand All @@ -69,8 +59,7 @@
"with": "src/environments/environment.prod.ts"
}
],
"outputHashing": "all",
"extraWebpackConfig": "webpack.prod.config.js"
"outputHashing": "all"
},
"development": {
"buildOptimizer": false,
Expand All @@ -84,28 +73,21 @@
"defaultConfiguration": "production"
},
"serve": {
"builder": "ngx-build-plus:dev-server",
"builder": "@angular-devkit/build-angular:dev-server",
"configurations": {
"production": {
"browserTarget": "yunikorn-web:build:production",
"extraWebpackConfig": "webpack.prod.config.js"
"browserTarget": "yunikorn-web:build:production"
},
"development": {
"buildTarget": "yunikorn-web:build:development"
}
},
"defaultConfiguration": "development",
"options": {
"port": 4200,
"publicHost": "http://localhost:4200",
"extraWebpackConfig": "webpack.config.js"
}
"defaultConfiguration": "development"
},
"extract-i18n": {
"builder": "ngx-build-plus:extract-i18n",
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "yunikorn-web:build",
"extraWebpackConfig": "webpack.config.js"
"browserTarget": "yunikorn-web:build"
}
},
"test": {
Expand All @@ -116,17 +98,12 @@
"tsConfig": "tsconfig.spec.json",
"karmaConfig": "karma.conf.js",
"inlineStyleLanguage": "scss",
"assets": [
"src/favicon.ico",
"src/assets"
],
"styles": [
"src/styles.scss"
],
"assets": ["src/favicon.ico", "src/assets"],
"styles": ["src/styles.scss"],
"scripts": []
}
}
}
}
}
}
}
7 changes: 2 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
"build:prod": "ng build --configuration production",
"start:srv": "json-server --watch json-db.json",
"test:coverage": "ng test --code-coverage --karma-config=./karma.conf.ci.js",
"prettify": "prettier --config ./.prettierrc --write 'src/**/*.{js,ts,json,css,scss,md,html}'",
"run:all": "node node_modules/@angular-architects/module-federation/src/server/mf-dev-server.js"
"prettify": "prettier --config ./.prettierrc --write 'src/**/*.{js,ts,json,css,scss,md,html}'"
},
"private": true,
"husky": {
Expand All @@ -29,7 +28,6 @@
]
},
"dependencies": {
"@angular-architects/module-federation": "^18.0.6",
"@angular/animations": "^18.2.6",
"@angular/cdk": "^18.2.6",
"@angular/common": "^18.2.6",
Expand Down Expand Up @@ -83,7 +81,6 @@
"karma-super-dots-reporter": "^0.2.0",
"lint-staged": "^15.2.10",
"ng-mocks": "^14.13.1",
"ngx-build-plus": "^18.0.0",
"prettier": "^3.3.3",
"puppeteer": "^23.4.1",
"typescript": "5.5.4"
Expand All @@ -93,4 +90,4 @@
"pnpm": "9"
},
"packageManager": "pnpm@9"
}
}
Loading