Skip to content

Commit ecad07e

Browse files
authored
chore: remove angular integration (#23004)
1 parent f147ebb commit ecad07e

File tree

14 files changed

+46
-47
lines changed

14 files changed

+46
-47
lines changed

cli/package.json

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,7 @@
107107
"vue",
108108
"react",
109109
"vue2",
110-
"react18",
111-
"angular"
110+
"react18"
112111
],
113112
"bin": {
114113
"cypress": "bin/cypress"
@@ -150,11 +149,6 @@
150149
"./mount-utils": {
151150
"require": "./mount-utils/dist/index.js",
152151
"types": "./mount-utils/dist/index.d.ts"
153-
},
154-
"./angular": {
155-
"import": "./angular/dist/index.js",
156-
"require": "./angular/dist/index.js",
157-
"types": "./angular/dist/index.d.ts"
158152
}
159153
},
160154
"workspaces": {

cli/scripts/post-build.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ const npmModulesToCopy = [
1212
'react18',
1313
'vue',
1414
'vue2',
15-
'angular',
1615
]
1716

1817
npmModulesToCopy.forEach((folder) => {

cli/types/cypress.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3044,7 +3044,7 @@ declare namespace Cypress {
30443044

30453045
type DevServerConfigOptions = {
30463046
bundler: 'webpack'
3047-
framework: 'react' | 'vue' | 'vue-cli' | 'nuxt' | 'create-react-app' | 'next' | 'angular'
3047+
framework: 'react' | 'vue' | 'vue-cli' | 'nuxt' | 'create-react-app' | 'next'
30483048
webpackConfig?: PickConfigOpt<'webpackConfig'>
30493049
} | {
30503050
bundler: 'vite'

npm/angular/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
"scripts": {
77
"prebuild": "rimraf dist",
88
"build": "tsc || echo 'built, with type errors'",
9-
"postbuild": "node ../../scripts/sync-exported-npm-with-cli.js",
109
"build-prod": "yarn build",
1110
"check-ts": "tsc --noEmit"
1211
},

npm/webpack-dev-server/cypress/e2e/angular.cy.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ for (const project of WEBPACK_REACT) {
1212
continue
1313
}
1414

15-
describe(`Working with ${project}`, () => {
15+
// TODO: revert once Angular is slated for release
16+
describe.skip(`Working with ${project}`, () => {
1617
beforeEach(() => {
1718
cy.scaffoldProject(project)
1819
cy.openProject(project)

npm/webpack-dev-server/src/devServer.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import { nuxtHandler } from './helpers/nuxtHandler'
1212
import { createReactAppHandler } from './helpers/createReactAppHandler'
1313
import { nextHandler } from './helpers/nextHandler'
1414
import { sourceDefaultWebpackDependencies, SourceRelativeWebpackResult } from './helpers/sourceRelativeWebpackModules'
15-
import { angularHandler } from './helpers/angularHandler'
1615

1716
const debug = debugLib('cypress:webpack-dev-server:devServer')
1817

@@ -26,7 +25,7 @@ export type WebpackDevServerConfig = {
2625
webpackConfig?: unknown // Derived from the user's webpack
2726
}
2827

29-
export const ALL_FRAMEWORKS = ['create-react-app', 'nuxt', 'react', 'vue-cli', 'next', 'vue', 'angular'] as const
28+
export const ALL_FRAMEWORKS = ['create-react-app', 'nuxt', 'react', 'vue-cli', 'next', 'vue'] as const
3029

3130
/**
3231
* @internal
@@ -116,8 +115,9 @@ async function getPreset (devServerConfig: WebpackDevServerConfig): Promise<Opti
116115
case 'next':
117116
return await nextHandler(devServerConfig)
118117

119-
case 'angular':
120-
return await angularHandler(devServerConfig)
118+
// TODO: revert once Angular is slated for release
119+
// case 'angular':
120+
// return await angularHandler(devServerConfig)
121121

122122
case 'react':
123123
case 'vue':

npm/webpack-dev-server/src/helpers/sourceRelativeWebpackModules.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ const frameworkWebpackMapper: FrameworkWebpackMapper = {
6565
react: undefined,
6666
vue: undefined,
6767
next: 'next',
68-
'angular': '@angular-devkit/build-angular',
68+
// TODO: revert once Angular is slated for release
69+
// 'angular': '@angular-devkit/build-angular',
6970
}
7071

7172
// Source the users framework from the provided projectRoot. The framework, if available, will serve

npm/webpack-dev-server/src/makeDefaultWebpackConfig.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,9 @@ export function makeDefaultWebpackConfig (
3838
plugins: [
3939
new HtmlWebpackPlugin({
4040
template: indexHtmlFile,
41+
// TODO: revert once Angular is slated for release
4142
// Angular generates all of it's scripts with <script type="module">. Live-reloading breaks without this option.
42-
...(config.devServerConfig.framework === 'angular' ? { scriptLoading: 'module' } : {}),
43+
// ...(config.devServerConfig.framework === 'angular' ? { scriptLoading: 'module' } : {}),
4344
}),
4445
],
4546
} as any

npm/webpack-dev-server/test/handlers/angularHandler.spec.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ const projectConfig: AngularJsonProjectConfig = {
4040
},
4141
}
4242

43-
describe('angularHandler', function () {
43+
// TODO: revert once Angular is slated for release
44+
describe.skip('angularHandler', function () {
4445
this.timeout(1000 * 60)
4546

4647
it('sources the config from angular-13', async () => {
@@ -53,7 +54,7 @@ describe('angularHandler', function () {
5354
projectRoot,
5455
specPattern: 'src/**/*.cy.ts',
5556
} as Cypress.PluginConfigOptions,
56-
framework: 'angular',
57+
// framework: 'angular',
5758
} as WebpackDevServerConfig
5859

5960
const { frameworkConfig: webpackConfig, sourceWebpackModulesResult } = await angularHandler(devServerConfig)
@@ -78,7 +79,7 @@ describe('angularHandler', function () {
7879
projectRoot,
7980
specPattern: 'src/**/*.cy.ts',
8081
} as Cypress.PluginConfigOptions,
81-
framework: 'angular',
82+
// framework: 'angular',
8283
} as WebpackDevServerConfig
8384

8485
const { frameworkConfig: webpackConfig, sourceWebpackModulesResult } = await angularHandler(devServerConfig)

packages/graphql/schemas/schema.graphql

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -870,7 +870,6 @@ type FileParts implements Node {
870870
}
871871

872872
enum FrontendFrameworkEnum {
873-
angular
874873
nextjs
875874
nuxtjs
876875
react

0 commit comments

Comments
 (0)