Skip to content

Commit a3f61c6

Browse files
committed
fix(all): Fix references due to packages moves
1 parent 70165ec commit a3f61c6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+173
-5670
lines changed

.github/workflows/approve_package_bumps.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@ name: Deck CI
33
on:
44
pull_request:
55
paths:
6-
- 'app/scripts/modules/amazon/package.json'
7-
- 'app/scripts/modules/appengine/package.json'
8-
- 'app/scripts/modules/azure/package.json'
9-
- 'app/scripts/modules/cloudfoundry/package.json'
10-
- 'app/scripts/modules/core/package.json'
11-
- 'app/scripts/modules/docker/package.json'
12-
- 'app/scripts/modules/ecs/package.json'
13-
- 'app/scripts/modules/google/package.json'
14-
- 'app/scripts/modules/huaweicloud/package.json'
15-
- 'app/scripts/modules/kubernetes/package.json'
16-
- 'app/scripts/modules/oracle/package.json'
17-
- 'app/scripts/modules/titus/package.json'
6+
- 'packages/amazon/package.json'
7+
- 'packages/appengine/package.json'
8+
- 'packages/azure/package.json'
9+
- 'packages/cloudfoundry/package.json'
10+
- 'packages/core/package.json'
11+
- 'packages/docker/package.json'
12+
- 'packages/ecs/package.json'
13+
- 'packages/google/package.json'
14+
- 'packages/huaweicloud/package.json'
15+
- 'packages/kubernetes/package.json'
16+
- 'packages/oracle/package.json'
17+
- 'packages/titus/package.json'
1818

1919
env:
2020
NODE_VERSION: 10.15.1

.github/workflows/publish_amazon.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
branches:
66
- 'master'
77
paths:
8-
- 'app/scripts/modules/amazon/package.json'
8+
- 'packages/amazon/package.json'
99

1010
jobs:
1111
build:

.github/workflows/publish_appengine.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
branches:
66
- 'master'
77
paths:
8-
- 'app/scripts/modules/appengine/package.json'
8+
- 'packages/appengine/package.json'
99

1010
jobs:
1111
build:

.github/workflows/publish_azure.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
branches:
66
- 'master'
77
paths:
8-
- 'app/scripts/modules/azure/package.json'
8+
- 'packages/azure/package.json'
99

1010
jobs:
1111
build:

.github/workflows/publish_cloudfoundry.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
branches:
66
- 'master'
77
paths:
8-
- 'app/scripts/modules/cloudfoundry/package.json'
8+
- 'packages/cloudfoundry/package.json'
99

1010
jobs:
1111
build:

.github/workflows/publish_core.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
branches:
66
- 'master'
77
paths:
8-
- 'app/scripts/modules/core/package.json'
8+
- 'packages/core/package.json'
99

1010
jobs:
1111
build:

.github/workflows/publish_docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
branches:
66
- 'master'
77
paths:
8-
- 'app/scripts/modules/docker/package.json'
8+
- 'packages/docker/package.json'
99

1010
jobs:
1111
build:

.github/workflows/publish_ecs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
branches:
66
- 'master'
77
paths:
8-
- 'app/scripts/modules/ecs/package.json'
8+
- 'packages/ecs/package.json'
99

1010
jobs:
1111
build:

.github/workflows/publish_google.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
branches:
66
- 'master'
77
paths:
8-
- 'app/scripts/modules/google/package.json'
8+
- 'packages/google/package.json'
99

1010
jobs:
1111
build:

.github/workflows/publish_huaweicloud.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
branches:
66
- 'master'
77
paths:
8-
- 'app/scripts/modules/huaweicloud/package.json'
8+
- 'packages/huaweicloud/package.json'
99

1010
jobs:
1111
build:

.github/workflows/publish_kubernetes.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
branches:
66
- 'master'
77
paths:
8-
- 'app/scripts/modules/kubernetes/package.json'
8+
- 'packages/kubernetes/package.json'
99

1010
jobs:
1111
build:

.github/workflows/publish_oracle.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
branches:
66
- 'master'
77
paths:
8-
- 'app/scripts/modules/oracle/package.json'
8+
- 'packages/oracle/package.json'
99

1010
jobs:
1111
build:

.github/workflows/publish_titus.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
branches:
66
- 'master'
77
paths:
8-
- 'app/scripts/modules/titus/package.json'
8+
- 'packages/titus/package.json'
99

1010
jobs:
1111
build:

.prettierignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
package.json
2-
app/scripts/modules/*/lib
2+
**/dist/**/*
33
**/node_modules/**/*

.storybook/main.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ const deckWebpackConfigurer = require('../webpack.config');
55
module.exports = {
66
addons: ['@storybook/preset-typescript', '@storybook/addon-essentials', '@storybook/addon-storysource'],
77
stories: [
8-
'../app/scripts/modules/core/src/presentation/**/*.stories.[tj]sx',
9-
'../app/scripts/modules/core/src/presentation/**/*.stories.mdx',
8+
'../packages/core/src/presentation/**/*.stories.[tj]sx',
9+
'../packages/core/src/presentation/**/*.stories.mdx',
1010
],
1111
webpackFinal: async (config) => {
1212
const deckWebpackConfig = deckWebpackConfigurer({}, {});

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ It's a work in progress, but please try to follow the [conventions here](https:/
5555
## Customizing the UI
5656

5757
It's certainly doable - we're in the middle of some significant changes to our build process, which should make it easier.
58-
For now, you can look at the [all modules](https://github.com/spinnaker/deck/tree/master/app/scripts/modules/) to
58+
For now, you can look at the [all modules](https://github.com/spinnaker/deck/tree/master/packages/) to
5959
get an idea how we are customizing Deck internally. Expect a lot of this to change, though, as we figure out better, cleaner
6060
hooks and integration points. And we're happy to provide new integration points (or accept pull requests) following
6161
those existing conventions if you need an integration point that doesn't already exist.

codegen.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
overwrite: true
2-
schema:
3-
- app/scripts/modules/core/src/managed/graphql/schema.graphql # TODO: move this file to a separate node module
4-
documents: app/scripts/modules/core/src/**/*.graphql
2+
schema:
3+
- packages/core/src/managed/graphql/schema.graphql # TODO: move this file to a separate node module
4+
documents: packages/core/src/**/*.graphql
55
generates:
6-
app/scripts/modules/core/src/managed/graphql/graphql-sdk.ts:
6+
packages/core/src/managed/graphql/graphql-sdk.ts:
77
plugins:
88
- add:
9-
content: "/* eslint-disable @typescript-eslint/array-type */"
9+
content: '/* eslint-disable @typescript-eslint/array-type */'
1010
- typescript
1111
- typescript-operations
1212
- typescript-react-apollo
@@ -18,4 +18,4 @@ generates:
1818
InstantTime: string
1919
./graphql.schema.json:
2020
plugins:
21-
- "introspection"
21+
- 'introspection'

karma-shim.js

Lines changed: 43 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ global.$ = global.jQuery = require('jquery');
1212
import './app/scripts/modules/app/src/settings';
1313
import './app/scripts/modules/app/src/app';
1414
import './test/helpers/customMatchers';
15-
import { jasmineMockHttpSupport } from './app/scripts/modules/core/src/api/mock/jasmine';
15+
import { jasmineMockHttpSupport } from './packages/core/src/api/mock/jasmine';
1616

1717
// angular 1 test harness
1818
import 'angular';
@@ -21,5 +21,46 @@ beforeEach(angular.mock.module('bcherny/ngimport'));
2121

2222
jasmineMockHttpSupport();
2323

24-
const testContext = require.context('./app/scripts/', true, /\.spec\.(js|ts|tsx)$/);
24+
let testContext;
25+
26+
testContext = require.context('./packages/amazon', true, /\.spec\.(js|ts|tsx)$/);
27+
testContext.keys().forEach(testContext);
28+
29+
testContext = require.context('./packages/appengine', true, /\.spec\.(js|ts|tsx)$/);
30+
testContext.keys().forEach(testContext);
31+
32+
testContext = require.context('./packages/azure', true, /\.spec\.(js|ts|tsx)$/);
33+
testContext.keys().forEach(testContext);
34+
35+
testContext = require.context('./packages/cloudfoundry', true, /\.spec\.(js|ts|tsx)$/);
36+
testContext.keys().forEach(testContext);
37+
38+
testContext = require.context('./packages/core', true, /\.spec\.(js|ts|tsx)$/);
39+
testContext.keys().forEach(testContext);
40+
41+
testContext = require.context('./packages/dcos', true, /\.spec\.(js|ts|tsx)$/);
42+
testContext.keys().forEach(testContext);
43+
44+
testContext = require.context('./packages/docker', true, /\.spec\.(js|ts|tsx)$/);
45+
testContext.keys().forEach(testContext);
46+
47+
testContext = require.context('./packages/ecs', true, /\.spec\.(js|ts|tsx)$/);
48+
testContext.keys().forEach(testContext);
49+
50+
testContext = require.context('./packages/google', true, /\.spec\.(js|ts|tsx)$/);
51+
testContext.keys().forEach(testContext);
52+
53+
testContext = require.context('./packages/huaweicloud', true, /\.spec\.(js|ts|tsx)$/);
54+
testContext.keys().forEach(testContext);
55+
56+
testContext = require.context('./packages/kubernetes', true, /\.spec\.(js|ts|tsx)$/);
57+
testContext.keys().forEach(testContext);
58+
59+
testContext = require.context('./packages/oracle', true, /\.spec\.(js|ts|tsx)$/);
60+
testContext.keys().forEach(testContext);
61+
62+
testContext = require.context('./packages/tencentcloud', true, /\.spec\.(js|ts|tsx)$/);
63+
testContext.keys().forEach(testContext);
64+
65+
testContext = require.context('./packages/titus', true, /\.spec\.(js|ts|tsx)$/);
2566
testContext.keys().forEach(testContext);

karma.conf.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
44
const path = require('path');
55

66
const prodWebpackConfig = require('./app/scripts/modules/app/webpack.config')();
7-
const MODULES_ROOT = path.resolve(`${__dirname}/app/scripts/modules`);
7+
const MODULES_ROOT = path.resolve(`${__dirname}/packages`);
88

99
const webpackConfig = {
1010
mode: 'development',

package.json

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,25 @@
1717
},
1818
"private": true,
1919
"workspaces": [
20-
"app/scripts/modules/*",
20+
"app/scripts/modules/app",
21+
"packages/amazon",
22+
"packages/appengine",
23+
"packages/azure",
24+
"packages/cloudfoundry",
25+
"packages/core",
26+
"packages/dcos",
27+
"packages/docker",
28+
"packages/ecs",
2129
"packages/eslint-plugin",
30+
"packages/google",
31+
"packages/huaweicloud",
32+
"packages/kubernetes",
33+
"packages/oracle",
2234
"packages/pluginsdk",
2335
"packages/presentation",
24-
"packages/scripts"
36+
"packages/scripts",
37+
"packages/tencentcloud",
38+
"packages/titus"
2539
],
2640
"scripts": {
2741
"clean": "npx rimraf .awcache .cache-loader build node_modules/.cache transpiled && cd app/scripts/modules/app/ && npm run clean",

packages/amazon/tsconfig.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
2-
"extends": "../../../../tsconfig.base.json",
2+
"extends": "../../tsconfig.base.json",
33
"compilerOptions": {
4-
"baseUrl": "../../../../",
54
"outDir": "dist",
65
"rootDir": "./src"
76
},

0 commit comments

Comments
 (0)