Skip to content

Commit 0141592

Browse files
authored
Merge pull request #2398 from Akshat55/to-Ng13
feat: Update to angular 13
2 parents f979ac1 + c172569 commit 0141592

37 files changed

+9138
-41879
lines changed

.github/workflows/check-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141

4242
strategy:
4343
matrix:
44-
angular-version: [12, 13, 14]
44+
angular-version: [13, 14]
4545
node-version: [16.x]
4646

4747
steps:

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/.angular/cache
12
.DS_Store
23
*.log*
34
*.swp

.storybook/main.js

Lines changed: 7 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -32,38 +32,21 @@ module.exports = {
3232
framework: "@storybook/angular",
3333
core: {
3434
builder: "webpack5",
35-
disableTelemetry: true,
35+
disableTelemetry: true
3636
},
3737
webpackFinal: async config => {
38-
// remove all styling rules to ensure styles get loaded
39-
config.module.rules = config.module.rules.filter((rule) => !isStylingRule(rule));
40-
4138
config.module.rules.push({
42-
test: /\.scss$/,
43-
sideEffects: true,
39+
test: [/\.stories\.ts$/, /index\.ts$/],
40+
include: [path.resolve(__dirname, '../src')],
4441
use: [
45-
"style-loader",
46-
"css-loader",
47-
"postcss-loader",
4842
{
49-
loader: "sass-loader",
50-
options: {
51-
implementation: require("sass")
52-
}
43+
loader: require.resolve('@storybook/source-loader'),
44+
options: { parser: 'typescript' }
5345
}
54-
]
46+
],
47+
enforce: 'pre'
5548
});
5649

57-
config.mode = "development";
58-
config.devtool = "source-map";
5950
return config;
6051
}
6152
}
62-
63-
function isStylingRule(rule) {
64-
const { test } = rule;
65-
if (!(test instanceof RegExp)) {
66-
return false;
67-
}
68-
return test.test('.css') || test.test('.scss') || test.test('.sass');
69-
}

.storybook/preview.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// load global styles
2-
import "!style-loader!css-loader!postcss-loader!sass-loader!./preview.scss";
32
import { breakpoints } from '@carbon/layout';
43

54
// Add compodoc

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Angular version support matrix:
6060
| 9 ||||
6161
| 10 ||||
6262
| 11 ||||
63-
| 12 ||| |
63+
| 12 ||| |
6464
| 13 ||||
6565
| 14 ||||
6666

angular.json

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,6 @@
2929
"tsConfig": "./tsconfig.spec.json"
3030
}
3131
},
32-
"lint": {
33-
"builder": "@angular-devkit/build-angular:tslint",
34-
"options": {
35-
"tsConfig": [
36-
"./tsconfig.json",
37-
"./tsconfig.spec.json"
38-
],
39-
"exclude": [
40-
"**/node_modules/**"
41-
]
42-
}
43-
},
4432
"storybook": {
4533
"builder": "@storybook/angular:start-storybook",
4634
"options": {
@@ -99,17 +87,6 @@
9987
"protractorConfig": "./protractor.conf.js",
10088
"devServerTarget": "carbon-components-angular:serve"
10189
}
102-
},
103-
"lint": {
104-
"builder": "@angular-devkit/build-angular:tslint",
105-
"options": {
106-
"tsConfig": [
107-
"e2e/tsconfig.e2e.json"
108-
],
109-
"exclude": [
110-
"**/node_modules/**/*"
111-
]
112-
}
11390
}
11491
}
11592
}

integration/ng12/.browserslistrc

Lines changed: 0 additions & 17 deletions
This file was deleted.

integration/ng12/.editorconfig

Lines changed: 0 additions & 16 deletions
This file was deleted.

integration/ng12/.gitignore

Lines changed: 0 additions & 45 deletions
This file was deleted.

integration/ng12/README.md

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)