Skip to content

Commit eddee65

Browse files
third774third774
authored
Merge pull request #14 from cloudflare/update-to-angular-13
Update to angular 13
2 parents c3ca948 + 75dc7d2 commit eddee65

26 files changed

+30087
-7500
lines changed

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- run: yarn --frozen-lockfile
2020
- run: yarn test-headless
2121
# Only publish when tag does not include beta or rc suffix
22-
- run: if [[ ${TAG_NAME} =~ ^v[0-9]+.[0-9]+.[0-9]+$ ]]; then yarn build --prod && cd dist/cloudflare-stream && npm publish; fi
22+
- run: if [[ ${TAG_NAME} =~ ^v[0-9]+.[0-9]+.[0-9]+$ ]]; then yarn build && cd dist/cloudflare-stream && npm publish; fi
2323
env:
2424
NODE_AUTH_TOKEN: ${{secrets.npm_token}}
2525
TAG_NAME: ${{github.event.release.tag_name}}

‎.gitignore‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,42 @@
11
# See http://help.github.com/ignore-files/ for more about ignoring files.
22

3-
# compiled output
3+
# Compiled output
44
/dist
55
/tmp
66
/out-tsc
7-
# Only exists if Bazel was run
87
/bazel-out
98

10-
# dependencies
9+
# Node
1110
/node_modules
12-
13-
# profiling files
14-
chrome-profiler-events*.json
15-
speed-measure-plugin*.json
11+
npm-debug.log
12+
yarn-error.log
1613

1714
# IDEs and editors
18-
/.idea
15+
.idea/
1916
.project
2017
.classpath
2118
.c9/
2219
*.launch
2320
.settings/
2421
*.sublime-workspace
2522

26-
# IDE - VSCode
23+
# Visual Studio Code
2724
.vscode/*
2825
!.vscode/settings.json
2926
!.vscode/tasks.json
3027
!.vscode/launch.json
3128
!.vscode/extensions.json
3229
.history/*
3330

34-
# misc
35-
/.sass-cache
31+
# Miscellaneous
32+
/.angular/cache
33+
.sass-cache/
3634
/connect.lock
3735
/coverage
3836
/libpeerconnection.log
39-
npm-debug.log
40-
yarn-error.log
4137
testem.log
4238
/typings
4339

44-
# System Files
40+
# System files
4541
.DS_Store
4642
Thumbs.db

‎.storybook/main.js‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11
module.exports = {
2-
stories: ["../src/**/*.stories.ts"],
3-
addons: [
4-
"@storybook/addon-knobs",
5-
"@storybook/addon-actions",
2+
"stories": [
3+
"../stories/**/*.stories.mdx",
4+
"../stories/**/*.stories.@(js|jsx|ts|tsx)"
5+
],
6+
"addons": [
67
"@storybook/addon-links",
7-
"@storybook/addon-notes",
8+
"@storybook/addon-essentials",
9+
"@storybook/addon-interactions"
810
],
9-
};
11+
"framework": "@storybook/angular",
12+
"core": {
13+
"builder": "webpack5"
14+
}
15+
}

‎.storybook/preview.js‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
import { setCompodocJson } from "@storybook/addon-docs/angular";
2+
import docJson from "../documentation.json";
3+
setCompodocJson(docJson);
4+
5+
export const parameters = {
6+
actions: { argTypesRegex: "^on[A-Z].*" },
7+
controls: {
8+
matchers: {
9+
color: /(background|color)$/i,
10+
date: /Date$/,
11+
},
12+
},
13+
docs: { inlineStories: true },
14+
}

‎.storybook/tsconfig.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
{
2-
"extends": "../projects/cloudflare-stream/tsconfig.lib.json",
2+
"extends": "../tsconfig.json",
33
"compilerOptions": {
4-
"types": ["node"]
4+
"types": ["node"],
5+
"allowSyntheticDefaultImports": true
56
},
67
"exclude": [
78
"../src/test.ts",
89
"../src/**/*.spec.ts",
910
"../projects/**/*.spec.ts"
1011
],
11-
"include": ["../src/**/*", "../projects/**/*"],
12+
"include": ["../stories/**/*", "../projects/**/*"],
1213
"files": ["./typings.d.ts"]
1314
}

‎.vscode/extensions.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=827846
3+
"recommendations": ["angular.ng-template"]
4+
}

‎.vscode/launch.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
3+
"version": "0.2.0",
4+
"configurations": [
5+
{
6+
"name": "ng serve",
7+
"type": "pwa-chrome",
8+
"request": "launch",
9+
"preLaunchTask": "npm: start",
10+
"url": "http://localhost:4200/"
11+
},
12+
{
13+
"name": "ng test",
14+
"type": "chrome",
15+
"request": "launch",
16+
"preLaunchTask": "npm: test",
17+
"url": "http://localhost:9876/debug.html"
18+
}
19+
]
20+
}

‎.vscode/tasks.json‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
{
2+
// For more information, visit: https://go.microsoft.com/fwlink/?LinkId=733558
3+
"version": "2.0.0",
4+
"tasks": [
5+
{
6+
"type": "npm",
7+
"script": "start",
8+
"isBackground": true,
9+
"problemMatcher": {
10+
"owner": "typescript",
11+
"pattern": "$tsc",
12+
"background": {
13+
"activeOnStart": true,
14+
"beginsPattern": {
15+
"regexp": "(.*?)"
16+
},
17+
"endsPattern": {
18+
"regexp": "bundle generation complete"
19+
}
20+
}
21+
}
22+
},
23+
{
24+
"type": "npm",
25+
"script": "test",
26+
"isBackground": true,
27+
"problemMatcher": {
28+
"owner": "typescript",
29+
"pattern": "$tsc",
30+
"background": {
31+
"activeOnStart": true,
32+
"beginsPattern": {
33+
"regexp": "(.*?)"
34+
},
35+
"endsPattern": {
36+
"regexp": "bundle generation complete"
37+
}
38+
}
39+
}
40+
}
41+
]
42+
}

‎angular.json‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,19 @@
1010
"prefix": "lib",
1111
"architect": {
1212
"build": {
13-
"builder": "@angular-devkit/build-ng-packagr:build",
13+
"builder": "@angular-devkit/build-angular:ng-packagr",
1414
"options": {
15-
"tsConfig": "projects/cloudflare-stream/tsconfig.lib.json",
1615
"project": "projects/cloudflare-stream/ng-package.json"
1716
},
1817
"configurations": {
1918
"production": {
2019
"tsConfig": "projects/cloudflare-stream/tsconfig.lib.prod.json"
20+
},
21+
"development": {
22+
"tsConfig": "projects/cloudflare-stream/tsconfig.lib.json"
2123
}
22-
}
24+
},
25+
"defaultConfiguration": "production"
2326
},
2427
"test": {
2528
"builder": "@angular-devkit/build-angular:karma",
@@ -29,15 +32,15 @@
2932
"karmaConfig": "projects/cloudflare-stream/karma.conf.js"
3033
}
3134
},
32-
"lint": {
33-
"builder": "@angular-devkit/build-angular:tslint",
35+
"storybook": {
36+
"builder": "@storybook/angular:start-storybook",
3437
"options": {
35-
"tsConfig": [
36-
"projects/cloudflare-stream/tsconfig.lib.json",
37-
"projects/cloudflare-stream/tsconfig.spec.json"
38-
],
39-
"exclude": ["**/node_modules/**"]
38+
"port": 6006
4039
}
40+
},
41+
"build-storybook": {
42+
"builder": "@storybook/angular:build-storybook",
43+
"options": {}
4144
}
4245
}
4346
}

0 commit comments

Comments
 (0)