From d8396e6afd888758856b307130917afe11cc4205 Mon Sep 17 00:00:00 2001 From: Alan Agius Date: Fri, 22 Mar 2024 08:21:22 +0000 Subject: [PATCH 1/2] test: remove webpack test-app test This particular test is no longer useful, hence it has been removed. --- .../webpack/test-app/app/app.component.html | 5 --- .../webpack/test-app/app/app.component.scss | 3 -- .../webpack/test-app/app/app.component.ts | 15 ------- .../assets/webpack/test-app/app/app.module.ts | 27 ------------ .../test-app/app/feature/feature.module.ts | 20 --------- .../app/feature/lazy-feature.module.ts | 22 ---------- .../assets/webpack/test-app/app/injectable.ts | 8 ---- .../webpack/test-app/app/lazy.module.ts | 22 ---------- .../e2e/assets/webpack/test-app/app/main.ts | 4 -- .../e2e/assets/webpack/test-app/index.html | 12 ------ .../e2e/assets/webpack/test-app/package.json | 23 ---------- .../e2e/assets/webpack/test-app/tsconfig.json | 26 ----------- .../assets/webpack/test-app/webpack.config.js | 29 ------------- .../e2e/tests/packages/webpack/test-app.ts | 43 ------------------- 14 files changed, 259 deletions(-) delete mode 100644 tests/legacy-cli/e2e/assets/webpack/test-app/app/app.component.html delete mode 100644 tests/legacy-cli/e2e/assets/webpack/test-app/app/app.component.scss delete mode 100644 tests/legacy-cli/e2e/assets/webpack/test-app/app/app.component.ts delete mode 100644 tests/legacy-cli/e2e/assets/webpack/test-app/app/app.module.ts delete mode 100644 tests/legacy-cli/e2e/assets/webpack/test-app/app/feature/feature.module.ts delete mode 100644 tests/legacy-cli/e2e/assets/webpack/test-app/app/feature/lazy-feature.module.ts delete mode 100644 tests/legacy-cli/e2e/assets/webpack/test-app/app/injectable.ts delete mode 100644 tests/legacy-cli/e2e/assets/webpack/test-app/app/lazy.module.ts delete mode 100644 tests/legacy-cli/e2e/assets/webpack/test-app/app/main.ts delete mode 100644 tests/legacy-cli/e2e/assets/webpack/test-app/index.html delete mode 100644 tests/legacy-cli/e2e/assets/webpack/test-app/package.json delete mode 100644 tests/legacy-cli/e2e/assets/webpack/test-app/tsconfig.json delete mode 100644 tests/legacy-cli/e2e/assets/webpack/test-app/webpack.config.js delete mode 100644 tests/legacy-cli/e2e/tests/packages/webpack/test-app.ts diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app/app/app.component.html b/tests/legacy-cli/e2e/assets/webpack/test-app/app/app.component.html deleted file mode 100644 index 5a532db9308f..000000000000 --- a/tests/legacy-cli/e2e/assets/webpack/test-app/app/app.component.html +++ /dev/null @@ -1,5 +0,0 @@ -
-

hello world

- lazy - -
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app/app/app.component.scss b/tests/legacy-cli/e2e/assets/webpack/test-app/app/app.component.scss deleted file mode 100644 index 5cde7b922336..000000000000 --- a/tests/legacy-cli/e2e/assets/webpack/test-app/app/app.component.scss +++ /dev/null @@ -1,3 +0,0 @@ -:host { - background-color: blue; -} diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app/app/app.component.ts b/tests/legacy-cli/e2e/assets/webpack/test-app/app/app.component.ts deleted file mode 100644 index 82a4059565d3..000000000000 --- a/tests/legacy-cli/e2e/assets/webpack/test-app/app/app.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import {Component, ViewEncapsulation} from '@angular/core'; -import {MyInjectable} from './injectable'; - - -@Component({ - selector: 'app-root', - templateUrl: './app.component.html', - styleUrls: ['./app.component.scss'], - encapsulation: ViewEncapsulation.None -}) -export class AppComponent { - constructor(public inj: MyInjectable) { - console.log(inj); - } -} diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app/app/app.module.ts b/tests/legacy-cli/e2e/assets/webpack/test-app/app/app.module.ts deleted file mode 100644 index a649a90cb41b..000000000000 --- a/tests/legacy-cli/e2e/assets/webpack/test-app/app/app.module.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { NgModule, Component } from '@angular/core'; -import { BrowserModule } from '@angular/platform-browser'; -import { RouterModule } from '@angular/router'; -import { AppComponent } from './app.component'; - -@Component({ - selector: 'home-view', - template: 'home!' -}) -export class HomeView {} - - -@NgModule({ - declarations: [ - AppComponent, - HomeView - ], - imports: [ - BrowserModule, - RouterModule.forRoot([ - {path: 'lazy', loadChildren: () => import('./lazy.module').then(m => m.LazyModule)}, - {path: '', component: HomeView} - ]) - ], - bootstrap: [AppComponent] -}) -export class AppModule { } diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app/app/feature/feature.module.ts b/tests/legacy-cli/e2e/assets/webpack/test-app/app/feature/feature.module.ts deleted file mode 100644 index f464ca028b05..000000000000 --- a/tests/legacy-cli/e2e/assets/webpack/test-app/app/feature/feature.module.ts +++ /dev/null @@ -1,20 +0,0 @@ -import {NgModule, Component} from '@angular/core'; -import {RouterModule} from '@angular/router'; - -@Component({ - selector: 'feature-component', - template: 'foo.html' -}) -export class FeatureComponent {} - -@NgModule({ - declarations: [ - FeatureComponent - ], - imports: [ - RouterModule.forChild([ - { path: '', component: FeatureComponent} - ]) - ] -}) -export class FeatureModule {} diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app/app/feature/lazy-feature.module.ts b/tests/legacy-cli/e2e/assets/webpack/test-app/app/feature/lazy-feature.module.ts deleted file mode 100644 index 26db7b7a70ca..000000000000 --- a/tests/legacy-cli/e2e/assets/webpack/test-app/app/feature/lazy-feature.module.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { NgModule, Component } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -@Component({ - selector: 'lazy-feature-comp', - template: 'lazy feature!', -}) -export class LazyFeatureComponent {} - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: LazyFeatureComponent, pathMatch: 'full' }, - { - path: 'feature', - loadChildren: () => import('./feature.module').then((m) => m.FeatureModule), - }, - ]), - ], - declarations: [LazyFeatureComponent], -}) -export class LazyFeatureModule {} diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app/app/injectable.ts b/tests/legacy-cli/e2e/assets/webpack/test-app/app/injectable.ts deleted file mode 100644 index feb7ab0b76a8..000000000000 --- a/tests/legacy-cli/e2e/assets/webpack/test-app/app/injectable.ts +++ /dev/null @@ -1,8 +0,0 @@ -import {Injectable, Inject, ViewContainerRef} from '@angular/core'; -import {DOCUMENT} from '@angular/common'; - - -@Injectable() -export class MyInjectable { - constructor(public viewContainer: ViewContainerRef, @Inject(DOCUMENT) public doc) {} -} diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app/app/lazy.module.ts b/tests/legacy-cli/e2e/assets/webpack/test-app/app/lazy.module.ts deleted file mode 100644 index b3ebda410c2b..000000000000 --- a/tests/legacy-cli/e2e/assets/webpack/test-app/app/lazy.module.ts +++ /dev/null @@ -1,22 +0,0 @@ -import {NgModule, Component} from '@angular/core'; -import {RouterModule} from '@angular/router'; - -@Component({ - selector: 'lazy-comp', - template: 'lazy!' -}) -export class LazyComponent {} - -@NgModule({ - imports: [ - RouterModule.forChild([ - {path: '', component: LazyComponent, pathMatch: 'full'}, - {path: 'feature', loadChildren: () => import( './feature/feature.module').then(m => m.FeatureModule)}, - {path: 'lazy-feature', loadChildren: () => import( './feature/lazy-feature.module').then(m => m.LazyFeatureModule)}, - ]), - ], - declarations: [LazyComponent] -}) -export class LazyModule {} - -export class SecondModule {} diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app/app/main.ts b/tests/legacy-cli/e2e/assets/webpack/test-app/app/main.ts deleted file mode 100644 index 1c880c8d0dda..000000000000 --- a/tests/legacy-cli/e2e/assets/webpack/test-app/app/main.ts +++ /dev/null @@ -1,4 +0,0 @@ -import {platformBrowserDynamic} from '@angular/platform-browser-dynamic'; -import {AppModule} from './app.module'; - -platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app/index.html b/tests/legacy-cli/e2e/assets/webpack/test-app/index.html deleted file mode 100644 index 89fb0893c35d..000000000000 --- a/tests/legacy-cli/e2e/assets/webpack/test-app/index.html +++ /dev/null @@ -1,12 +0,0 @@ - - - - Document - - - - - - - - diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app/package.json b/tests/legacy-cli/e2e/assets/webpack/test-app/package.json deleted file mode 100644 index 0c000e85e8f5..000000000000 --- a/tests/legacy-cli/e2e/assets/webpack/test-app/package.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "test", - "license": "MIT", - "dependencies": { - "@angular/common": "^18.0.0-next", - "@angular/compiler": "^18.0.0-next", - "@angular/compiler-cli": "^18.0.0-next", - "@angular/core": "^18.0.0-next", - "@angular/platform-browser": "^18.0.0-next", - "@angular/platform-browser-dynamic": "^18.0.0-next", - "@angular/router": "^18.0.0-next", - "@ngtools/webpack": "0.0.0", - "rxjs": "^6.6.7", - "zone.js": "^0.14.0" - }, - "devDependencies": { - "sass": "^1.32.8", - "sass-loader": "^11.0.1", - "typescript": "~5.3.2", - "webpack": "^5.27.0", - "webpack-cli": "^4.5.0" - } -} diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app/tsconfig.json b/tests/legacy-cli/e2e/assets/webpack/test-app/tsconfig.json deleted file mode 100644 index 0102307af01b..000000000000 --- a/tests/legacy-cli/e2e/assets/webpack/test-app/tsconfig.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "compilerOptions": { - "baseUrl": "", - "module": "es2022", - "moduleResolution": "node", - "target": "es2015", - "noImplicitAny": false, - "sourceMap": true, - "mapRoot": "", - "emitDecoratorMetadata": true, - "experimentalDecorators": true, - "lib": [ - "es2017", - "dom" - ], - "outDir": "lib", - "skipLibCheck": true, - "rootDir": "." - }, - "angularCompilerOptions": { - "enableIvy": true, - "disableTypeScriptVersionCheck": true, - "genDir": "./app/ngfactory", - "entryModule": "app/app.module#AppModule" - } -} diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app/webpack.config.js b/tests/legacy-cli/e2e/assets/webpack/test-app/webpack.config.js deleted file mode 100644 index f9a00181ea48..000000000000 --- a/tests/legacy-cli/e2e/assets/webpack/test-app/webpack.config.js +++ /dev/null @@ -1,29 +0,0 @@ -const ngToolsWebpack = require('@ngtools/webpack'); -const path = require('path'); - -module.exports = { - resolve: { - extensions: ['.ts', '.js'], - }, - entry: './app/main.ts', - output: { - path: path.resolve('./dist'), - publicPath: 'dist/', - filename: 'app.main.js', - }, - plugins: [new ngToolsWebpack.AngularWebpackPlugin()], - module: { - rules: [ - // rxjs 6 requires directory imports which are not support in ES modules. - // Disabling `fullySpecified` allows Webpack to ignore this but this is - // not ideal because it currently disables ESM behavior import for all JS files. - { test: /\.[m]?js$/, resolve: { fullySpecified: false } }, - { test: /\.scss$/, use: ['sass-loader'], type: 'asset/source' }, - { test: /\.html$/, type: 'asset/source' }, - { test: /\.ts$/, loader: ngToolsWebpack.AngularWebpackLoaderPath }, - ], - }, - devServer: { - historyApiFallback: true, - }, -}; diff --git a/tests/legacy-cli/e2e/tests/packages/webpack/test-app.ts b/tests/legacy-cli/e2e/tests/packages/webpack/test-app.ts deleted file mode 100644 index e4f6b5fe71f6..000000000000 --- a/tests/legacy-cli/e2e/tests/packages/webpack/test-app.ts +++ /dev/null @@ -1,43 +0,0 @@ -import { join, normalize } from 'path'; -import { createProjectFromAsset } from '../../../utils/assets'; -import { expectFileSizeToBeUnder, expectFileToMatch, replaceInFile } from '../../../utils/fs'; -import { execWithEnv } from '../../../utils/process'; -import { readdir } from 'node:fs/promises'; -import assert from 'node:assert'; - -export default async function () { - const webpackCLIBin = normalize('node_modules/.bin/webpack-cli'); - const restoreRegistry = await createProjectFromAsset('webpack/test-app'); - - // DISABLE_V8_COMPILE_CACHE=1 is required to disable the `v8-compile-cache` package. - // It currently does not support dynamic import expressions which are now required by the - // CLI to support ESM. ref: https://github.com/zertosh/v8-compile-cache/issues/30 - await execWithEnv(webpackCLIBin, [], { ...process.env, 'DISABLE_V8_COMPILE_CACHE': '1' }); - - // Note: these sizes are without Build Optimizer or any advanced optimizations in the CLI. - await expectFileSizeToBeUnder('dist/app.main.js', 650 * 1024); - const outputFiles = await readdir('dist', { withFileTypes: true }); - let fileCount = 0; - for (const outputFile of outputFiles) { - if (outputFile.isFile() && outputFile.name.endsWith('.app.main.js')) { - ++fileCount; - await expectFileSizeToBeUnder(join('dist', outputFile.name), 1024); - } - } - if (fileCount !== 3) { - assert.fail('Expected three additional Webpack output chunk files.'); - } - - // test resource urls without ./ - await replaceInFile('app/app.component.ts', './app.component.html', 'app.component.html'); - await replaceInFile('app/app.component.ts', './app.component.scss', 'app.component.scss'); - - // test the inclusion of metadata - // This build also test resource URLs without ./ - await execWithEnv(webpackCLIBin, ['--mode=development'], { - ...process.env, - 'DISABLE_V8_COMPILE_CACHE': '1', - }); - await expectFileToMatch('dist/app.main.js', 'AppModule'); - await restoreRegistry(); -} From a3448ced17d779b722ba9f10790dc78200fc0359 Mon Sep 17 00:00:00 2001 From: Alan Agius Date: Fri, 22 Mar 2024 08:21:51 +0000 Subject: [PATCH 2/2] refactor: delete unused ssl files This files are no longer used. --- tests/legacy-cli/e2e/assets/ssl/server.crt | 23 ------------------ tests/legacy-cli/e2e/assets/ssl/server.key | 27 ---------------------- 2 files changed, 50 deletions(-) delete mode 100644 tests/legacy-cli/e2e/assets/ssl/server.crt delete mode 100644 tests/legacy-cli/e2e/assets/ssl/server.key diff --git a/tests/legacy-cli/e2e/assets/ssl/server.crt b/tests/legacy-cli/e2e/assets/ssl/server.crt deleted file mode 100644 index 6891c4c67573..000000000000 --- a/tests/legacy-cli/e2e/assets/ssl/server.crt +++ /dev/null @@ -1,23 +0,0 @@ ------BEGIN CERTIFICATE----- -MIID5jCCAs6gAwIBAgIJAJOebwfGCm61MA0GCSqGSIb3DQEBBQUAMFUxCzAJBgNV -BAYTAlVTMRAwDgYDVQQIEwdHZW9yZ2lhMRAwDgYDVQQHEwdBdGxhbnRhMRAwDgYD -VQQKEwdBbmd1bGFyMRAwDgYDVQQLEwdBbmd1bGFyMB4XDTE2MTAwNDAxMDAyMVoX -DTI2MTAwMjAxMDAyMVowVTELMAkGA1UEBhMCVVMxEDAOBgNVBAgTB0dlb3JnaWEx -EDAOBgNVBAcTB0F0bGFudGExEDAOBgNVBAoTB0FuZ3VsYXIxEDAOBgNVBAsTB0Fu -Z3VsYXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDT6Q4d1+mw81SC -4K1qLbsMn4O459XDiDDU/cGBiE0byqi6RpaB0MujCPn35xdeCf1mdDw929leEIRB -w/fCN3VwE+4ZDM7sF6SgoSDN8YT/OOush4tDu0djH110I+i1Bfg4m7gVkUnJLUCv -vMMOlD19LDqqaxdY3ojXx8gZJW9sNtUH2vCICwsZ7aNZp2NcCNKpU7LppP4IomCd -GfG501kY/UtELVgNGX+zuJwIiH/2AQZ+fsaDBBD0Azanck2M/aq5yVKMG8y/S5WP -7LMvZs8ZHPSG73QINogRTYW0EKx7nT87vmrHRtCc9u4coPdqOzQN9BigCYVkYrTv -xkOX9VDHAgMBAAGjgbgwgbUwHQYDVR0OBBYEFG4VV6/aNLx/qFIS9MhAWuyeV5OX -MIGFBgNVHSMEfjB8gBRuFVev2jS8f6hSEvTIQFrsnleTl6FZpFcwVTELMAkGA1UE -BhMCVVMxEDAOBgNVBAgTB0dlb3JnaWExEDAOBgNVBAcTB0F0bGFudGExEDAOBgNV -BAoTB0FuZ3VsYXIxEDAOBgNVBAsTB0FuZ3VsYXKCCQCTnm8HxgputTAMBgNVHRME -BTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQDO4jZT/oKVxaiWr+jV5TD+qwThl9zT -Uw/ZpFDkdbZdY/baCFaLCiJwkK9+puMOabLvm1VzcnHHWCoiUNbWpw8AOumLEnTv -ze/5OZXJ6XlA9kd9f3hDlN5zNB3S+Z2nKIrkPGfxQZ603QCbWaptip5dxgek6oDZ -YXVtnbOnPznRsG5jh07U49RO8CNebqZLzdRToLgObbqYlfRMcbUxCOHXjnB5wUlp -377Iivm4ldnCTvFOjEiDh+FByWL5xic7PjyJPZFMidiYTmsGilP9XTFC83CRZwz7 -vW+RCSlU6x8Uejz98BPmASoqCuCTUeOo+2pFelFhX9NwR/Sb6b7ybdPv ------END CERTIFICATE----- diff --git a/tests/legacy-cli/e2e/assets/ssl/server.key b/tests/legacy-cli/e2e/assets/ssl/server.key deleted file mode 100644 index e0e0af0f8da8..000000000000 --- a/tests/legacy-cli/e2e/assets/ssl/server.key +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpAIBAAKCAQEA0+kOHdfpsPNUguCtai27DJ+DuOfVw4gw1P3BgYhNG8qoukaW -gdDLowj59+cXXgn9ZnQ8PdvZXhCEQcP3wjd1cBPuGQzO7BekoKEgzfGE/zjrrIeL -Q7tHYx9ddCPotQX4OJu4FZFJyS1Ar7zDDpQ9fSw6qmsXWN6I18fIGSVvbDbVB9rw -iAsLGe2jWadjXAjSqVOy6aT+CKJgnRnxudNZGP1LRC1YDRl/s7icCIh/9gEGfn7G -gwQQ9AM2p3JNjP2quclSjBvMv0uVj+yzL2bPGRz0hu90CDaIEU2FtBCse50/O75q -x0bQnPbuHKD3ajs0DfQYoAmFZGK078ZDl/VQxwIDAQABAoIBAEl17kXcNo/4GqDw -QE2hoslCdwhfnhQVn1AG09ESriBnRcylccF4308aaoVM4CXicqzUuJl9IEJimWav -B7GVRinfTtfyP71KiPCCSvv5sPBFDDYYGugVAS9UjTIYzLAMbLs7CDq5zglmnZkO -Z9QjAZnl/kRbsZFGO8wJ3s0Q1Cp/ygZcvFU331K2jHXW7B4YXiFOH/lBQrjdz0Gy -WBjX4zIdNWnwarvxu46IS/0z1P1YOHM8+B1Uv54MG94A6szBdd/Vp0cQRs78t/Cu -BQ1Rnuk16Pi+ieC5K04yUgeuNusYW0PWLtPX1nKNp9z46bmD1NHKAxaoDFXr7qP3 -pZCaDMkCgYEA8mmTYrhXJTRIrOxoUwM1e3OZ0uOxVXJJ8HF6X8t+UO6dFxXB/JC9 -ZBc+94cZQapaKFOeMmd/j3L2CQIjChk5yKV/G3Io+raxIoAAKPCkMF4NQQVvvNkS -CAGl61Qa78DoF5Habumz0AC1R9P877kNTC0aPSt4lhPWgfotbZNNMlMCgYEA38nM -s4a0pZseXPkuOtPYX/3Ms3E+d70XKSFuIMCHCg79YGsQ8h/9apYcPyeYkpQ0a4gs -I3IUqMaXC2OyqWA5LU1BZv51mXb6zcb2pokZfpiSWk+7sy5XjkE9EmQxp3xHfV3c -EO/DxHfWNvtMjESMbhu0yVzM2O/Aa53Tl9lqAT0CgYEA1dXBuHyqCtyTG08zO78B -55Ny5rAJ1zkI9jvz2hr0o0nJcvqzcyruliNXXRxkcCNoglg4nXfk81JSrGGhLSBR -c6hhdoF+mqKboLZO7c5Q14WvpWK5TVoiaMOja/J2DHYbhecYS2yGPH7TargaUBDq -JP9IPRtitOhs+Z0Jg7ZDi5cCgYAMb7B6gY/kbBxh2k8hYchyfS41AqQQD2gMFxmB -pHFcs7yM8SY97l0s4S6sq8ykyKupFiYtyhcv0elu7pltJDXJOLPbv2RVpPEHInlu -g8vw5xWrAydRK9Adza5RKVRBFHz8kIy8PDbK4kX7RDfay6xqKgv/7LJNk/VDhb/O -fnyPmQKBgQDg/o8Ubf/gxA9Husnuld4DBu3wwFhkMlWqyO9QH3cKgojQ2JGSrfDz -xHhetmhionEyzg0JCaMSpzgIHY+8o/NAwc++OjNHEoYp3XWM9GTp81ROMz6b83jV -biVR9N0MhONdwF6vtzDCcJxNIUe2p4lTvLf/Xd9jaQDNXe35Gxsdyg== ------END RSA PRIVATE KEY-----