Skip to content

Commit 236d4be

Browse files
sougata-progresssougata-progress
committed
Fixed node-saas issue
Signed-off-by: sougata-progress <sougatab@progress.com>
1 parent 09675b3 commit 236d4be

9 files changed

Lines changed: 121 additions & 125 deletions

File tree

‎.expeditor/verify.pipeline.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ expeditor:
99
HAB_STUDIO_SECRET_HAB_BLDR_CHANNEL: base-2025
1010
HAB_STUDIO_SECRET_HAB_REFRESH_CHANNEL: base-2025
1111
HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL: base-2025
12-
# HAB_STUDIO_SECRET_HAB_AUTH_TOKEN: $HAB_AUTH_TOKEN
1312

1413
steps:
1514
- label: "[lint] :linux: :bash: Shellcheck"

‎.github/actions/hab-pkg-build-and-upload-linux/action.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ runs:
1515
shell: bash
1616
env:
1717
BLDR_COMPONENT: ${{ inputs.bldr-component }}
18-
HAB_AUTH_TOKEN: ${{ inputs.hab-auth-token }}
1918
HAB_BLDR_CHANNEL: base-2025
2019
HAB_REFRESH_CHANNEL: base-2025
2120
HAB_FALLBACK_CHANNEL: base-2025

‎components/builder-web/app/package/job-list/_job-list.component.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
}
1212

1313
&.dispatched, &.processing {
14-
@extend hab-icon.spinning;
14+
@extend hab-icon, .spinning;
1515
}
1616
}
1717
}

‎components/builder-web/app/shared/job-notice/_job-notice.component.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
hab-icon {
66
&.dispatched, &.processing {
7-
@extend hab-icon.spinning;
7+
@extend hab-icon, .spinning;
88
}
99
}
1010

‎components/builder-web/app/shared/job-status-icon/_job-status-icon.component.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ hab-job-status-icon {
1111
&.inprogress, &.dispatching, &.dispatched, &.cancelpending, &.cancelprocessing {
1212

1313
&.animate {
14-
@extend hab-icon.spinning;
14+
@extend hab-icon, .spinning;
1515
}
1616
}
1717
}

‎components/builder-web/app/shared/project-settings/_project-settings.component.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@
198198
}
199199

200200
.repo-link {
201-
font-size: rem(12);
201+
font-size: 0.75rem;
202202
float: right;
203203
display: block;
204204
}
@@ -212,7 +212,7 @@
212212

213213
button, a {
214214
display: inline-block;
215-
font-size: rem(14);
215+
font-size: 0.875rem;
216216
margin-right: 16px;
217217
}
218218
}

‎components/builder-web/app/user-nav/_user-nav.component.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@
5252

5353
&:last-child {
5454
border-top: 1px solid $light-gray;
55-
margin-top: rem(8);
55+
margin-top: 0.5rem;
5656
padding-bottom: 0;
57-
padding-top: rem(12);
57+
padding-top: 0.75rem;
5858
}
5959

6060
a {

‎components/builder-web/bin/build-css‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
#!/bin/sh
22
set -x
33

4-
node-sass \
5-
--include-path=node_modules/bourbon-neat/core \
6-
--include-path=node_modules/bourbon/app/assets/stylesheets \
7-
--include-path=node_modules/normalize-scss/sass \
8-
--include-path=node_modules/normalize-scss/node_modules/support-for/sass \
9-
--include-path=node_modules \
10-
--include-path=stylesheets \
11-
--include-path=app \
12-
--recursive=true \
13-
--output=assets \
14-
--output-style=compressed \
4+
sass \
5+
--load-path=node_modules/bourbon-neat/core \
6+
--load-path=node_modules/bourbon/app/assets/stylesheets \
7+
--load-path=node_modules/normalize-scss/sass \
8+
--load-path=node_modules/normalize-scss/node_modules/support-for/sass \
9+
--load-path=node_modules \
10+
--load-path=stylesheets \
11+
--load-path=app \
12+
--style=compressed \
1513
"$@" \
16-
app/app.scss
14+
app/app.scss:assets/app.css

‎components/builder-web/package.json‎

Lines changed: 104 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -1,105 +1,105 @@
11
{
2-
"name": "habitat",
3-
"version": "0.8.0",
4-
"repository": {
5-
"type": "git",
6-
"url": "https://github.com/habitat-sh/builder.git"
7-
},
8-
"engines": {
9-
"node": ">=14.18.1",
10-
"npm": ">=6.14.15"
11-
},
12-
"license": "Apache-2.0",
13-
"scripts": {
14-
"build": "concurrently \"npm run build-js\" \"npm run build-css\"",
15-
"build-css": "bin/build-css",
16-
"build-css-watch": "npm run build-css -- --source-map=true --watch",
17-
"build-e2e": "bin/e2e",
18-
"build-js": "npm run lint-js && webpack --config webpack.conf.js",
19-
"build-js-watch": "npm run build-js -- --watch",
20-
"clean": "concurrently \"npm run clean-js\" \"npm run clean-css\"",
21-
"clean-css": "rm -fv assets/app.css assets/app.css.map",
22-
"clean-js": "rm -fv assets/app.js assets/app.js.map",
23-
"dist": "bin/dist",
24-
"lint": "concurrently \"npm run lint-css\" \"npm run lint-js\"",
25-
"lint-css": "sass-lint --format json --verbose stylesheets**/*.scss app**/*.scss",
26-
"lint-css-watch": "watch 'npm run lint-css'",
27-
"lint-js": "tslint app**/*.ts",
28-
"lint-js-watch": "watch 'npm run lint-js'",
29-
"help": "cat README.md",
30-
"repl": "cd app && tsun",
31-
"serve-e2e": "lite-server -c ./bs-config.e2e.js",
32-
"start": "bin/start",
33-
"test": "npm run test-unit && npm run test-e2e",
34-
"test-unit": "karma start",
35-
"test-unit-watch": "npm run test-unit -- --no-single-run",
36-
"test-watch": "concurrently 'npm run test-unit-watch' 'npm run test-e2e-watch'",
37-
"travis": "npm run test-unit && npm run test-e2e-record"
38-
},
39-
"dependencies": {
40-
"@angular/animations": "^6.1.3",
41-
"@angular/cdk": "^6.4.6",
42-
"@angular/common": "^6.1.3",
43-
"@angular/compiler": "^6.1.3",
44-
"@angular/core": "^6.1.3",
45-
"@angular/forms": "^6.1.3",
46-
"@angular/http": "^6.1.3",
47-
"@angular/material": "^6.4.6",
48-
"@angular/platform-browser": "^6.1.3",
49-
"@angular/platform-browser-dynamic": "^6.1.3",
50-
"@angular/platform-server": "^6.1.3",
51-
"@angular/router": "^6.1.3",
52-
"ansi_up": "^5.0.0",
53-
"async": "^2.6.1",
54-
"blueimp-md5": "^2.10.0",
55-
"core-js": "^2.5.7",
56-
"immutable": "^3.8.2",
57-
"js-cookie": "^2.2.0",
58-
"lodash": "^4.17.21",
59-
"marked": "^15.0.6",
60-
"moment": "^2.30.1",
61-
"redux": "^4.0.0",
62-
"redux-reset": "^0.3.0",
63-
"redux-thunk": "^2.3.0",
64-
"reflect-metadata": "^0.1.12",
65-
"rxjs": "^6.2.2",
66-
"uuid": "^3.3.2",
67-
"whatwg-fetch": "^2.0.4",
68-
"zone.js": "^0.8.26"
69-
},
70-
"devDependencies": {
71-
"@types/jasmine": "^2.8.17",
72-
"@types/node": "^8.10.66",
73-
"awesome-typescript-loader": "^5.2.1",
74-
"codelyzer": "^4.4.4",
75-
"concurrently": "^3.6.1",
76-
"http-proxy-middleware": "^0.19.2",
77-
"jasmine-core": "^3.7.1",
78-
"karma": "^6.4.4",
79-
"karma-chrome-launcher": "^3.1.0",
80-
"karma-cli": "^2.0.0",
81-
"karma-coverage": "^2.0.3",
82-
"karma-jasmine": "^2.0.1",
83-
"karma-jasmine-html-reporter": "^1.6.0",
84-
"karma-phantomjs-launcher": "^1.0.4",
85-
"karma-sourcemap-loader": "^0.3.8",
86-
"karma-spec-reporter": "0.0.32",
87-
"karma-webpack": "^5.0.1",
88-
"lite-server": "^2.6.1",
89-
"loader-utils": "^1.4.2",
90-
"ng2-mock-component": "^0.1.0",
91-
"node-sass": "^8.0.0",
92-
"normalize-scss": "^7.0.0",
93-
"phantomjs-prebuilt": "^2.1.16",
94-
"raw-loader": "^0.5.1",
95-
"sass-lint": "^1.13.1",
96-
"ts-node": "^7.0.1",
97-
"tslint": "^5.20.1",
98-
"tslint-loader": "^3.5.2",
99-
"tsun": "^0.5.0",
100-
"typescript": "^3.9.9",
101-
"watch": "^1.0.2",
102-
"webpack": "^5.93.0",
103-
"webpack-cli": "^5.1.4"
104-
}
105-
}
2+
"name": "habitat",
3+
"version": "0.8.0",
4+
"repository": {
5+
"type": "git",
6+
"url": "https://github.com/habitat-sh/builder.git"
7+
},
8+
"engines": {
9+
"node": ">=14.18.1",
10+
"npm": ">=6.14.15"
11+
},
12+
"license": "Apache-2.0",
13+
"scripts": {
14+
"build": "concurrently \"npm run build-js\" \"npm run build-css\"",
15+
"build-css": "bin/build-css",
16+
"build-css-watch": "npm run build-css -- --source-map=true --watch",
17+
"build-e2e": "bin/e2e",
18+
"build-js": "npm run lint-js && webpack --config webpack.conf.js",
19+
"build-js-watch": "npm run build-js -- --watch",
20+
"clean": "concurrently \"npm run clean-js\" \"npm run clean-css\"",
21+
"clean-css": "rm -fv assets/app.css assets/app.css.map",
22+
"clean-js": "rm -fv assets/app.js assets/app.js.map",
23+
"dist": "bin/dist",
24+
"lint": "concurrently \"npm run lint-css\" \"npm run lint-js\"",
25+
"lint-css": "sass-lint --format json --verbose stylesheets**/*.scss app**/*.scss",
26+
"lint-css-watch": "watch 'npm run lint-css'",
27+
"lint-js": "tslint app**/*.ts",
28+
"lint-js-watch": "watch 'npm run lint-js'",
29+
"help": "cat README.md",
30+
"repl": "cd app && tsun",
31+
"serve-e2e": "lite-server -c ./bs-config.e2e.js",
32+
"start": "bin/start",
33+
"test": "npm run test-unit && npm run test-e2e",
34+
"test-unit": "karma start",
35+
"test-unit-watch": "npm run test-unit -- --no-single-run",
36+
"test-watch": "concurrently 'npm run test-unit-watch' 'npm run test-e2e-watch'",
37+
"travis": "npm run test-unit && npm run test-e2e-record"
38+
},
39+
"dependencies": {
40+
"@angular/animations": "^6.1.3",
41+
"@angular/cdk": "^6.4.6",
42+
"@angular/common": "^6.1.3",
43+
"@angular/compiler": "^6.1.3",
44+
"@angular/core": "^6.1.3",
45+
"@angular/forms": "^6.1.3",
46+
"@angular/http": "^6.1.3",
47+
"@angular/material": "^6.4.6",
48+
"@angular/platform-browser": "^6.1.3",
49+
"@angular/platform-browser-dynamic": "^6.1.3",
50+
"@angular/platform-server": "^6.1.3",
51+
"@angular/router": "^6.1.3",
52+
"ansi_up": "^5.0.0",
53+
"async": "^2.6.1",
54+
"blueimp-md5": "^2.10.0",
55+
"core-js": "^2.5.7",
56+
"immutable": "^3.8.2",
57+
"js-cookie": "^2.2.0",
58+
"lodash": "^4.17.21",
59+
"marked": "^15.0.6",
60+
"moment": "^2.30.1",
61+
"redux": "^4.0.0",
62+
"redux-reset": "^0.3.0",
63+
"redux-thunk": "^2.3.0",
64+
"reflect-metadata": "^0.1.12",
65+
"rxjs": "^6.2.2",
66+
"uuid": "^3.3.2",
67+
"whatwg-fetch": "^2.0.4",
68+
"zone.js": "^0.8.26"
69+
},
70+
"devDependencies": {
71+
"@types/jasmine": "^2.8.17",
72+
"@types/node": "^8.10.66",
73+
"awesome-typescript-loader": "^5.2.1",
74+
"codelyzer": "^4.4.4",
75+
"concurrently": "^3.6.1",
76+
"http-proxy-middleware": "^0.19.2",
77+
"jasmine-core": "^3.7.1",
78+
"karma": "^6.4.4",
79+
"karma-chrome-launcher": "^3.1.0",
80+
"karma-cli": "^2.0.0",
81+
"karma-coverage": "^2.0.3",
82+
"karma-jasmine": "^2.0.1",
83+
"karma-jasmine-html-reporter": "^1.6.0",
84+
"karma-phantomjs-launcher": "^1.0.4",
85+
"karma-sourcemap-loader": "^0.3.8",
86+
"karma-spec-reporter": "0.0.32",
87+
"karma-webpack": "^5.0.1",
88+
"lite-server": "^2.6.1",
89+
"loader-utils": "^1.4.2",
90+
"ng2-mock-component": "^0.1.0",
91+
"sass": "^1.69.5",
92+
"normalize-scss": "^7.0.0",
93+
"phantomjs-prebuilt": "^2.1.16",
94+
"raw-loader": "^0.5.1",
95+
"sass-lint": "^1.13.1",
96+
"ts-node": "^7.0.1",
97+
"tslint": "^5.20.1",
98+
"tslint-loader": "^3.5.2",
99+
"tsun": "^0.5.0",
100+
"typescript": "^3.9.9",
101+
"watch": "^1.0.2",
102+
"webpack": "^5.93.0",
103+
"webpack-cli": "^5.1.4"
104+
}
105+
}

0 commit comments

Comments
 (0)