GitHub/storybook
1
0
Fork 0
mirror of https://github.com/storybookjs/storybook.git synced 2025-04-05 08:01:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(angular): support workspace with only lib

Browse Source 
Note: thow error if project (lib or not) does not have tsConfig options
This commit is contained in:
ThibaudAv 2021-08-02 12:54:02 +02:00 committed by Thibaud Av
parent 167fb9eef8
commit 6e932f6260
No known key found for this signature in database
GPG Key ID: 3F0FA53A70B49E78
11 changed files with 179 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/angular/src/server/__mocks-ng-workspace__/with-lib/angular.json Normal file
View File

@ -0,0 +1,28 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"version": 1,
"newProjectRoot": "projects",
"projects": {
"pattern-lib": {
"projectType": "library",
"root": "projects/pattern-lib",
"sourceRoot": "projects/pattern-lib/src",
"prefix": "lib",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:ng-packagr",
"options": {
"tsConfig": "projects/pattern-lib/tsconfig.lib.json",
"project": "projects/pattern-lib/ng-package.json"
},
"configurations": {
"production": {
"tsConfig": "projects/pattern-lib/tsconfig.lib.prod.json"
}
}
}
}
}
},
"defaultProject": "pattern-lib"
}

2
app/angular/src/server/__mocks-ng-workspace__/with-lib/projects/pattern-lib/src/main.ts Normal file
View File

@ -0,0 +1,2 @@
// To avoid "No inputs were found in config file" tsc error
export const not = 'empty';

25
app/angular/src/server/__mocks-ng-workspace__/with-lib/projects/pattern-lib/tsconfig.lib.json Normal file
View File

@ -0,0 +1,25 @@
/* To learn more about this file see: https://angular.io/config/tsconfig. */
{
"extends": "../../tsconfig.json",
"compilerOptions": {
"outDir": "../../out-tsc/lib",
"target": "es2015",
"declaration": true,
"declarationMap": true,
"inlineSources": true,
"types": [],
"lib": [
"dom",
"es2018"
]
},
"angularCompilerOptions": {
"skipTemplateCodegen": true,
"strictMetadataEmit": true,
"enableResourceInlining": true
},
"exclude": [
"src/test.ts",
"**/*.spec.ts"
]
}

13
app/angular/src/server/__mocks-ng-workspace__/with-lib/tsconfig.json Normal file
View File

@ -0,0 +1,13 @@
{
"compilerOptions": {
"sourceMap": true,
"moduleResolution": "node",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"allowSyntheticDefaultImports": true,
"esModuleInterop": true,
"skipLibCheck": true,
"target": "es5",
"lib": ["es2017", "dom"]
}
}

16
app/angular/src/server/__mocks-ng-workspace__/without-tsConfig/angular.json Normal file
View File

@ -0,0 +1,16 @@
{
"version": 1,
"projects": {
"foo-project": {
"root": "",
"architect": {
"build": {
"options": {
"assets": []
}
}
}
}
},
"defaultProject": "foo-project"
}

2
app/angular/src/server/__mocks-ng-workspace__/without-tsConfig/src/main.ts Normal file
View File

@ -0,0 +1,2 @@
// To avoid "No inputs were found in config file" tsc error
export const not = 'empty';

9
app/angular/src/server/__mocks-ng-workspace__/without-tsConfig/src/tsconfig.app.json Normal file
View File

@ -0,0 +1,9 @@
{
"extends": "../tsconfig.json",
"compilerOptions": {
"baseUrl": "./",
"module": "es2015",
"types": ["node"]
},
"exclude": ["karma.ts", "**/*.spec.ts"]
}

13
app/angular/src/server/__mocks-ng-workspace__/without-tsConfig/tsconfig.json Normal file
View File

@ -0,0 +1,13 @@
{
"compilerOptions": {
"sourceMap": true,
"moduleResolution": "node",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"allowSyntheticDefaultImports": true,
"esModuleInterop": true,
"skipLibCheck": true,
"target": "es5",
"lib": ["es2017", "dom"]
}
}

5
app/angular/src/server/angular-devkit-build-webpack.ts
View File

@ -70,9 +70,8 @@ const buildWebpackConfigOptions = async (
): Promise<WebpackConfigOptions> => {
const { options: projectBuildOptions = {} } = target;
const requiredOptions = ['tsConfig', 'assets', 'optimization'];
if (!requiredOptions.every((key) => key in projectBuildOptions)) {
const requiredOptions = ['tsConfig'];
if (!requiredOptions.every((key) => !!projectBuildOptions[key])) {
throw new Error(
`Missing required options in project target. Check "${requiredOptions.join(', ')}"`
);

69
app/angular/src/server/framework-preset-angular-cli.test.ts
View File

@ -141,7 +141,7 @@ describe('framework-preset-angular-cli', () => {
});
it('throws error', async () => {
await expect(() => webpackFinal(newWebpackConfiguration(), options)).rejects.toThrowError(
'Missing required options in project target. Check "tsConfig, assets, optimization"'
'Missing required options in project target. Check "tsConfig"'
);
expect(logger.error).toHaveBeenCalledWith(`=> Could not get angular cli webpack config`);
});
@ -353,6 +353,19 @@ describe('framework-preset-angular-cli', () => {
});
});
describe('when angular.json haven\'t "options.tsConfig" config', () => {
beforeEach(() => {
initMockWorkspace('without-tsConfig');
});
it('throws error', async () => {
await expect(() => webpackFinal(newWebpackConfiguration(), options)).rejects.toThrowError(
'Missing required options in project target. Check "tsConfig"'
);
expect(logger.error).toHaveBeenCalledWith(`=> Could not get angular cli webpack config`);
});
});
describe('when is a nx with angular.json', () => {
beforeEach(() => {
initMockWorkspace('with-nx');
@ -509,6 +522,60 @@ describe('framework-preset-angular-cli', () => {
});
});
describe('when angular.json have only one lib project', () => {
beforeEach(() => {
initMockWorkspace('with-lib');
});
it('should extends webpack base config', async () => {
const baseWebpackConfig = newWebpackConfiguration();
const webpackFinalConfig = await webpackFinal(baseWebpackConfig, options);
expect(webpackFinalConfig).toEqual({
...baseWebpackConfig,
entry: [...(baseWebpackConfig.entry as any[])],
module: { ...baseWebpackConfig.module, rules: expect.anything() },
plugins: expect.anything(),
resolve: {
...baseWebpackConfig.resolve,
modules: expect.arrayContaining(baseWebpackConfig.resolve.modules),
// the base resolve.plugins are not kept 🤷‍♂️
plugins: expect.not.arrayContaining(baseWebpackConfig.resolve.plugins),
},
resolveLoader: expect.anything(),
});
});
it('should set webpack "module.rules"', async () => {
const baseWebpackConfig = newWebpackConfiguration();
const webpackFinalConfig = await webpackFinal(baseWebpackConfig, options);
expect(webpackFinalConfig.module.rules).toEqual([
{
exclude: [],
test: /\.css$/,
use: expect.anything(),
},
{
exclude: [],
test: /\.scss$|\.sass$/,
use: expect.anything(),
},
{
exclude: [],
test: /\.less$/,
use: expect.anything(),
},
{
exclude: [],
test: /\.styl$/,
use: expect.anything(),
},
...baseWebpackConfig.module.rules,
]);
});
});
describe('when angular.json have some config', () => {
beforeEach(() => {
initMockWorkspace('some-config');

2
app/angular/src/server/framework-preset-angular-cli.ts
View File

@ -72,7 +72,7 @@ export async function webpackFinal(baseConfig: webpack.Configuration, options: O
}
// Use angular-cli to get some webpack config
let angularCliWebpackConfig;
let angularCliWebpackConfig: AngularCliWebpackConfig;
try {
angularCliWebpackConfig = await extractAngularCliWebpackConfig(dirToSearch, project, target);
logger.info(`=> Using angular-cli webpack config`);