From b05ebe019fe6e205b7cb36eeaeee78dd9083fa15 Mon Sep 17 00:00:00 2001 From: arturovt Date: Fri, 10 Apr 2026 20:28:33 +0300 Subject: [PATCH] chore: rename packages back to single-spa-angular Renaming everything back to single-spa-angular because the GitHub support team has transferred permissions for single-spa-angular to @arturovt. --- README.md | 14 +++++++------- apps/chat/src/app/app.config.ts | 2 +- apps/chat/src/main.single-spa.ts | 2 +- apps/chat/webpack.config.ts | 2 +- apps/elements/src/main.single-spa.ts | 4 ++-- apps/navbar/src/app/app.config.ts | 2 +- apps/navbar/src/main.single-spa.ts | 2 +- apps/navbar/webpack.config.ts | 2 +- apps/parcel/src/app/app.component.ts | 2 +- apps/parcel/src/main.single-spa.ts | 2 +- apps/parcel/webpack.config.ts | 2 +- apps/root-config/src/index.ejs | 16 ++++++++-------- apps/shop/src/app/app.config.ts | 2 +- apps/shop/src/main.single-spa.ts | 2 +- apps/shop/webpack.config.ts | 2 +- .../elements}/ng-package.json | 2 +- .../elements/src/index.ts | 2 +- .../elements/src/types.ts | 2 +- .../index.ts | 0 .../internals}/ng-package.json | 2 +- .../internals/src/dom.ts | 0 .../internals/src/index.ts | 0 .../internals/src/types.ts | 0 .../ng-package.json | 2 +- .../package.json | 2 +- .../parcel}/ng-package.json | 2 +- .../parcel/src/index.ts | 0 .../parcel/src/parcel.component.ts | 0 .../parcel/src/parcel.module.ts | 0 libs/single-spa-angular/project.json | 17 +++++++++++++++++ .../src/platform-providers.ts | 0 .../src/providers.ts | 0 .../src/public_api.ts | 0 .../src/run-outside-angular.ts | 0 .../src/single-spa-angular.ts | 2 +- .../src/types.ts | 2 +- .../tsconfig.json | 0 .../tsconfig.lib.json | 0 .../webpack/__snapshots__/index.spec.ts.snap | 0 .../webpack/externals.ts | 8 ++++---- .../webpack/index.spec.ts | 0 .../webpack/index.ts | 0 .../webpack-5/remove-mini-css-extract.ts | 0 libs/single-spa-community-angular/project.json | 17 ----------------- package.json | 5 +++-- .../_files/extra-webpack.config.js.template | 2 +- .../_files/src/main.single-spa.ts.template | 4 ++-- system/rollup.config.js | 16 ++++++++-------- tsconfig.base.json | 14 +++++++------- tsconfig.webpack.json | 2 +- 50 files changed, 81 insertions(+), 80 deletions(-) rename libs/{single-spa-community-angular/parcel => single-spa-angular/elements}/ng-package.json (67%) rename libs/{single-spa-community-angular => single-spa-angular}/elements/src/index.ts (97%) rename libs/{single-spa-community-angular => single-spa-angular}/elements/src/types.ts (79%) rename libs/{single-spa-community-angular => single-spa-angular}/index.ts (100%) rename libs/{single-spa-community-angular/elements => single-spa-angular/internals}/ng-package.json (66%) rename libs/{single-spa-community-angular => single-spa-angular}/internals/src/dom.ts (100%) rename libs/{single-spa-community-angular => single-spa-angular}/internals/src/index.ts (100%) rename libs/{single-spa-community-angular => single-spa-angular}/internals/src/types.ts (100%) rename libs/{single-spa-community-angular => single-spa-angular}/ng-package.json (72%) rename libs/{single-spa-community-angular => single-spa-angular}/package.json (95%) rename libs/{single-spa-community-angular/internals => single-spa-angular/parcel}/ng-package.json (66%) rename libs/{single-spa-community-angular => single-spa-angular}/parcel/src/index.ts (100%) rename libs/{single-spa-community-angular => single-spa-angular}/parcel/src/parcel.component.ts (100%) rename libs/{single-spa-community-angular => single-spa-angular}/parcel/src/parcel.module.ts (100%) create mode 100644 libs/single-spa-angular/project.json rename libs/{single-spa-community-angular => single-spa-angular}/src/platform-providers.ts (100%) rename libs/{single-spa-community-angular => single-spa-angular}/src/providers.ts (100%) rename libs/{single-spa-community-angular => single-spa-angular}/src/public_api.ts (100%) rename libs/{single-spa-community-angular => single-spa-angular}/src/run-outside-angular.ts (100%) rename libs/{single-spa-community-angular => single-spa-angular}/src/single-spa-angular.ts (99%) rename libs/{single-spa-community-angular => single-spa-angular}/src/types.ts (91%) rename libs/{single-spa-community-angular => single-spa-angular}/tsconfig.json (100%) rename libs/{single-spa-community-angular => single-spa-angular}/tsconfig.lib.json (100%) rename libs/{single-spa-community-angular => single-spa-angular}/webpack/__snapshots__/index.spec.ts.snap (100%) rename libs/{single-spa-community-angular => single-spa-angular}/webpack/externals.ts (88%) rename libs/{single-spa-community-angular => single-spa-angular}/webpack/index.spec.ts (100%) rename libs/{single-spa-community-angular => single-spa-angular}/webpack/index.ts (100%) rename libs/{single-spa-community-angular => single-spa-angular}/webpack/webpack-5/remove-mini-css-extract.ts (100%) delete mode 100644 libs/single-spa-community-angular/project.json diff --git a/README.md b/README.md index ede92504..38503967 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@

- @single-spa-community/angular logo + single-spa-angular logo

-# @single-spa-community/angular +# single-spa-angular Helpers for building [single-spa](https://github.com/single-spa/single-spa) applications which use Angular. @@ -22,10 +22,10 @@ The package has been republished under the `@single-spa-community` scope due to ## Compatibility -| `@single-spa-community/angular` | Angular | -| ------------------------------- | ------- | -| `21.x` | `21.x` | -| `20.x` | `20.x` | -| `19.x` | `19.x` | +| `single-spa-angular` | Angular | +| -------------------- | ------- | +| `21.x` | `21.x` | +| `20.x` | `20.x` | +| `19.x` | `19.x` | > **Note:** This package follows a lock-step versioning strategy — the major version is aligned with Angular's major version to make compatibility obvious at a glance. This means a major bump does not necessarily indicate a breaking change in this package's own API. diff --git a/apps/chat/src/app/app.config.ts b/apps/chat/src/app/app.config.ts index 17200bcf..0aecb163 100644 --- a/apps/chat/src/app/app.config.ts +++ b/apps/chat/src/app/app.config.ts @@ -1,7 +1,7 @@ import { APP_BASE_HREF } from '@angular/common'; import type { ApplicationConfig } from '@angular/core'; import { provideRouter } from '@angular/router'; -import { provideSingleSpa } from '@single-spa-community/angular'; +import { provideSingleSpa } from 'single-spa-angular'; import { routes } from './app.routes'; diff --git a/apps/chat/src/main.single-spa.ts b/apps/chat/src/main.single-spa.ts index e03b80d1..85126fbc 100644 --- a/apps/chat/src/main.single-spa.ts +++ b/apps/chat/src/main.single-spa.ts @@ -1,5 +1,5 @@ import { NavigationStart, Router } from '@angular/router'; -import { provideSingleSpaPlatform, singleSpaAngular } from '@single-spa-community/angular'; +import { provideSingleSpaPlatform, singleSpaAngular } from 'single-spa-angular'; import { singleSpaPropsSubject } from './single-spa/single-spa-props'; import { bootstrapApplication, platformBrowser } from '@angular/platform-browser'; diff --git a/apps/chat/webpack.config.ts b/apps/chat/webpack.config.ts index 20b29317..a61bc244 100644 --- a/apps/chat/webpack.config.ts +++ b/apps/chat/webpack.config.ts @@ -1 +1 @@ -export { default } from '../../libs/single-spa-community-angular/webpack'; +export { default } from '../../libs/single-spa-angular/webpack'; diff --git a/apps/elements/src/main.single-spa.ts b/apps/elements/src/main.single-spa.ts index 2feb27f9..9f951716 100644 --- a/apps/elements/src/main.single-spa.ts +++ b/apps/elements/src/main.single-spa.ts @@ -1,5 +1,5 @@ -import { singleSpaAngularElements } from '@single-spa-community/angular/elements'; -import { provideSingleSpaPlatform } from '@single-spa-community/angular'; +import { singleSpaAngularElements } from 'single-spa-angular/elements'; +import { provideSingleSpaPlatform } from 'single-spa-angular'; import { AppModule } from './app/app.module'; diff --git a/apps/navbar/src/app/app.config.ts b/apps/navbar/src/app/app.config.ts index 2c0aaaea..1b089f34 100644 --- a/apps/navbar/src/app/app.config.ts +++ b/apps/navbar/src/app/app.config.ts @@ -1,7 +1,7 @@ import { APP_BASE_HREF } from '@angular/common'; import { ApplicationConfig } from '@angular/core'; import { provideRouter } from '@angular/router'; -import { provideSingleSpa } from '@single-spa-community/angular'; +import { provideSingleSpa } from 'single-spa-angular'; import { routes } from './app.routes'; diff --git a/apps/navbar/src/main.single-spa.ts b/apps/navbar/src/main.single-spa.ts index 1ebd4ee5..89bb8c2d 100644 --- a/apps/navbar/src/main.single-spa.ts +++ b/apps/navbar/src/main.single-spa.ts @@ -1,6 +1,6 @@ import { NavigationStart, Router } from '@angular/router'; import { bootstrapApplication, platformBrowser } from '@angular/platform-browser'; -import { provideSingleSpaPlatform, singleSpaAngular } from '@single-spa-community/angular'; +import { provideSingleSpaPlatform, singleSpaAngular } from 'single-spa-angular'; import { appConfig } from './app/app.config'; import { AppComponent } from './app/app.component'; diff --git a/apps/navbar/webpack.config.ts b/apps/navbar/webpack.config.ts index 20b29317..a61bc244 100644 --- a/apps/navbar/webpack.config.ts +++ b/apps/navbar/webpack.config.ts @@ -1 +1 @@ -export { default } from '../../libs/single-spa-community-angular/webpack'; +export { default } from '../../libs/single-spa-angular/webpack'; diff --git a/apps/parcel/src/app/app.component.ts b/apps/parcel/src/app/app.component.ts index 473c4226..00556e01 100644 --- a/apps/parcel/src/app/app.component.ts +++ b/apps/parcel/src/app/app.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component, signal } from '@angular/core'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; import { defer, shareReplay } from 'rxjs'; -import { ParcelModule } from '@single-spa-community/angular/parcel'; +import { ParcelModule } from 'single-spa-angular/parcel'; import { config } from './ReactWidget/ReactWidget'; diff --git a/apps/parcel/src/main.single-spa.ts b/apps/parcel/src/main.single-spa.ts index 21361b22..478cd20a 100644 --- a/apps/parcel/src/main.single-spa.ts +++ b/apps/parcel/src/main.single-spa.ts @@ -1,5 +1,5 @@ import { bootstrapApplication, platformBrowser } from '@angular/platform-browser'; -import { provideSingleSpaPlatform, singleSpaAngular } from '@single-spa-community/angular'; +import { provideSingleSpaPlatform, singleSpaAngular } from 'single-spa-angular'; import { AppComponent } from './app/app.component'; diff --git a/apps/parcel/webpack.config.ts b/apps/parcel/webpack.config.ts index 20b29317..a61bc244 100644 --- a/apps/parcel/webpack.config.ts +++ b/apps/parcel/webpack.config.ts @@ -1 +1 @@ -export { default } from '../../libs/single-spa-community-angular/webpack'; +export { default } from '../../libs/single-spa-angular/webpack'; diff --git a/apps/root-config/src/index.ejs b/apps/root-config/src/index.ejs index ec468c80..67ffa6c7 100644 --- a/apps/root-config/src/index.ejs +++ b/apps/root-config/src/index.ejs @@ -53,10 +53,10 @@ "@angular/elements": "http://localhost:4600/es2022/angular-elements.js", - "@single-spa-community/angular/internals": "http://localhost:4600/es2022/single-spa-community-angular-internals.js", - "@single-spa-community/angular": "http://localhost:4600/es2022/single-spa-community-angular.js", - "@single-spa-community/angular/elements": "http://localhost:4600/es2022/single-spa-community-angular-elements.js", - "@single-spa-community/angular/parcel": "http://localhost:4600/es2022/single-spa-community-angular-parcel.js" + "single-spa-angular/internals": "http://localhost:4600/es2022/single-spa-angular-internals.js", + "single-spa-angular": "http://localhost:4600/es2022/single-spa-angular.js", + "single-spa-angular/elements": "http://localhost:4600/es2022/single-spa-angular-elements.js", + "single-spa-angular/parcel": "http://localhost:4600/es2022/single-spa-angular-parcel.js" } } @@ -87,10 +87,10 @@ "@angular/elements": "http://localhost:4600/es2022/angular-elements.min.js", - "@single-spa-community/angular/internals": "http://localhost:4600/es2022/single-spa-community-angular-internals.min.js", - "@single-spa-community/angular": "http://localhost:4600/es2022/single-spa-community-angular.min.js", - "@single-spa-community/angular/elements": "http://localhost:4600/es2022/single-spa-community-angular-elements.min.js", - "@single-spa-community/angular/parcel": "http://localhost:4600/es2022/single-spa-community-angular-parcel.min.js" + "single-spa-angular/internals": "http://localhost:4600/es2022/single-spa-angular-internals.min.js", + "single-spa-angular": "http://localhost:4600/es2022/single-spa-angular.min.js", + "single-spa-angular/elements": "http://localhost:4600/es2022/single-spa-angular-elements.min.js", + "single-spa-angular/parcel": "http://localhost:4600/es2022/single-spa-angular-parcel.min.js" } } diff --git a/apps/shop/src/app/app.config.ts b/apps/shop/src/app/app.config.ts index a960c19f..7bd1c5cd 100644 --- a/apps/shop/src/app/app.config.ts +++ b/apps/shop/src/app/app.config.ts @@ -1,7 +1,7 @@ import { APP_BASE_HREF } from '@angular/common'; import type { ApplicationConfig } from '@angular/core'; import { provideRouter } from '@angular/router'; -import { provideSingleSpa } from '@single-spa-community/angular'; +import { provideSingleSpa } from 'single-spa-angular'; import { routes } from './app.routes'; diff --git a/apps/shop/src/main.single-spa.ts b/apps/shop/src/main.single-spa.ts index bf184939..a99ec6e2 100644 --- a/apps/shop/src/main.single-spa.ts +++ b/apps/shop/src/main.single-spa.ts @@ -1,6 +1,6 @@ import { NavigationStart, Router } from '@angular/router'; import { bootstrapApplication, platformBrowser } from '@angular/platform-browser'; -import { singleSpaAngular, provideSingleSpaPlatform } from '@single-spa-community/angular'; +import { singleSpaAngular, provideSingleSpaPlatform } from 'single-spa-angular'; import { loadMontserrat } from './fonts'; import { appConfig } from './app/app.config'; diff --git a/apps/shop/webpack.config.ts b/apps/shop/webpack.config.ts index 20b29317..a61bc244 100644 --- a/apps/shop/webpack.config.ts +++ b/apps/shop/webpack.config.ts @@ -1 +1 @@ -export { default } from '../../libs/single-spa-community-angular/webpack'; +export { default } from '../../libs/single-spa-angular/webpack'; diff --git a/libs/single-spa-community-angular/parcel/ng-package.json b/libs/single-spa-angular/elements/ng-package.json similarity index 67% rename from libs/single-spa-community-angular/parcel/ng-package.json rename to libs/single-spa-angular/elements/ng-package.json index 23b53a0b..4ca7c596 100644 --- a/libs/single-spa-community-angular/parcel/ng-package.json +++ b/libs/single-spa-angular/elements/ng-package.json @@ -2,6 +2,6 @@ "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", "lib": { "entryFile": "src/index.ts", - "flatModuleFile": "single-spa-community-angular-parcel" + "flatModuleFile": "single-spa-angular-elements" } } diff --git a/libs/single-spa-community-angular/elements/src/index.ts b/libs/single-spa-angular/elements/src/index.ts similarity index 97% rename from libs/single-spa-community-angular/elements/src/index.ts rename to libs/single-spa-angular/elements/src/index.ts index 6916b172..1885eb0b 100644 --- a/libs/single-spa-community-angular/elements/src/index.ts +++ b/libs/single-spa-angular/elements/src/index.ts @@ -3,7 +3,7 @@ import type { NgElement } from '@angular/elements'; import { type BaseSingleSpaAngularOptions, getContainerElementAndSetTemplate, -} from '@single-spa-community/angular/internals'; +} from 'single-spa-angular/internals'; import type { BootstrappedSingleSpaAngularElementsOptions } from './types'; diff --git a/libs/single-spa-community-angular/elements/src/types.ts b/libs/single-spa-angular/elements/src/types.ts similarity index 79% rename from libs/single-spa-community-angular/elements/src/types.ts rename to libs/single-spa-angular/elements/src/types.ts index e19ae385..e662dfa9 100644 --- a/libs/single-spa-community-angular/elements/src/types.ts +++ b/libs/single-spa-angular/elements/src/types.ts @@ -1,6 +1,6 @@ import type { ApplicationRef, NgModuleRef } from '@angular/core'; import type { NgElement } from '@angular/elements'; -import type { BaseSingleSpaAngularOptions } from '@single-spa-community/angular/internals'; +import type { BaseSingleSpaAngularOptions } from 'single-spa-angular/internals'; export interface BootstrappedSingleSpaAngularElementsOptions extends BaseSingleSpaAngularOptions { ngModuleRefOrAppRef: NgModuleRef | ApplicationRef | null; diff --git a/libs/single-spa-community-angular/index.ts b/libs/single-spa-angular/index.ts similarity index 100% rename from libs/single-spa-community-angular/index.ts rename to libs/single-spa-angular/index.ts diff --git a/libs/single-spa-community-angular/elements/ng-package.json b/libs/single-spa-angular/internals/ng-package.json similarity index 66% rename from libs/single-spa-community-angular/elements/ng-package.json rename to libs/single-spa-angular/internals/ng-package.json index f5e734f5..fddd0860 100644 --- a/libs/single-spa-community-angular/elements/ng-package.json +++ b/libs/single-spa-angular/internals/ng-package.json @@ -2,6 +2,6 @@ "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", "lib": { "entryFile": "src/index.ts", - "flatModuleFile": "single-spa-community-angular-elements" + "flatModuleFile": "single-spa-angular-internals" } } diff --git a/libs/single-spa-community-angular/internals/src/dom.ts b/libs/single-spa-angular/internals/src/dom.ts similarity index 100% rename from libs/single-spa-community-angular/internals/src/dom.ts rename to libs/single-spa-angular/internals/src/dom.ts diff --git a/libs/single-spa-community-angular/internals/src/index.ts b/libs/single-spa-angular/internals/src/index.ts similarity index 100% rename from libs/single-spa-community-angular/internals/src/index.ts rename to libs/single-spa-angular/internals/src/index.ts diff --git a/libs/single-spa-community-angular/internals/src/types.ts b/libs/single-spa-angular/internals/src/types.ts similarity index 100% rename from libs/single-spa-community-angular/internals/src/types.ts rename to libs/single-spa-angular/internals/src/types.ts diff --git a/libs/single-spa-community-angular/ng-package.json b/libs/single-spa-angular/ng-package.json similarity index 72% rename from libs/single-spa-community-angular/ng-package.json rename to libs/single-spa-angular/ng-package.json index 038d4a0c..91983ccd 100644 --- a/libs/single-spa-community-angular/ng-package.json +++ b/libs/single-spa-angular/ng-package.json @@ -2,7 +2,7 @@ "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", "dest": "../../lib", "lib": { - "flatModuleFile": "single-spa-community-angular", + "flatModuleFile": "single-spa-angular", "entryFile": "index.ts" } } diff --git a/libs/single-spa-community-angular/package.json b/libs/single-spa-angular/package.json similarity index 95% rename from libs/single-spa-community-angular/package.json rename to libs/single-spa-angular/package.json index 468f97cb..35d8fd6a 100644 --- a/libs/single-spa-community-angular/package.json +++ b/libs/single-spa-angular/package.json @@ -1,6 +1,6 @@ { "$schema": "../node_modules/ng-packagr/ng-package.schema.json", - "name": "@single-spa-community/angular", + "name": "single-spa-angular", "version": "21.0.1", "description": "Helpers for building single-spa applications which use Angular 2", "schematics": "./schematics/schematics.json", diff --git a/libs/single-spa-community-angular/internals/ng-package.json b/libs/single-spa-angular/parcel/ng-package.json similarity index 66% rename from libs/single-spa-community-angular/internals/ng-package.json rename to libs/single-spa-angular/parcel/ng-package.json index 0b71c2c9..e3b2079f 100644 --- a/libs/single-spa-community-angular/internals/ng-package.json +++ b/libs/single-spa-angular/parcel/ng-package.json @@ -2,6 +2,6 @@ "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", "lib": { "entryFile": "src/index.ts", - "flatModuleFile": "single-spa-community-angular-internals" + "flatModuleFile": "single-spa-angular-parcel" } } diff --git a/libs/single-spa-community-angular/parcel/src/index.ts b/libs/single-spa-angular/parcel/src/index.ts similarity index 100% rename from libs/single-spa-community-angular/parcel/src/index.ts rename to libs/single-spa-angular/parcel/src/index.ts diff --git a/libs/single-spa-community-angular/parcel/src/parcel.component.ts b/libs/single-spa-angular/parcel/src/parcel.component.ts similarity index 100% rename from libs/single-spa-community-angular/parcel/src/parcel.component.ts rename to libs/single-spa-angular/parcel/src/parcel.component.ts diff --git a/libs/single-spa-community-angular/parcel/src/parcel.module.ts b/libs/single-spa-angular/parcel/src/parcel.module.ts similarity index 100% rename from libs/single-spa-community-angular/parcel/src/parcel.module.ts rename to libs/single-spa-angular/parcel/src/parcel.module.ts diff --git a/libs/single-spa-angular/project.json b/libs/single-spa-angular/project.json new file mode 100644 index 00000000..d42b7232 --- /dev/null +++ b/libs/single-spa-angular/project.json @@ -0,0 +1,17 @@ +{ + "name": "single-spa-angular", + "$schema": "../../node_modules/nx/schemas/project-schema.json", + "projectType": "library", + "sourceRoot": "libs/single-spa-angular/src", + "prefix": "single-spa-angular", + "targets": { + "build": { + "executor": "@nx/angular:package", + "options": { + "tsConfig": "libs/single-spa-angular/tsconfig.lib.json", + "project": "libs/single-spa-angular/ng-package.json" + } + } + }, + "tags": [] +} diff --git a/libs/single-spa-community-angular/src/platform-providers.ts b/libs/single-spa-angular/src/platform-providers.ts similarity index 100% rename from libs/single-spa-community-angular/src/platform-providers.ts rename to libs/single-spa-angular/src/platform-providers.ts diff --git a/libs/single-spa-community-angular/src/providers.ts b/libs/single-spa-angular/src/providers.ts similarity index 100% rename from libs/single-spa-community-angular/src/providers.ts rename to libs/single-spa-angular/src/providers.ts diff --git a/libs/single-spa-community-angular/src/public_api.ts b/libs/single-spa-angular/src/public_api.ts similarity index 100% rename from libs/single-spa-community-angular/src/public_api.ts rename to libs/single-spa-angular/src/public_api.ts diff --git a/libs/single-spa-community-angular/src/run-outside-angular.ts b/libs/single-spa-angular/src/run-outside-angular.ts similarity index 100% rename from libs/single-spa-community-angular/src/run-outside-angular.ts rename to libs/single-spa-angular/src/run-outside-angular.ts diff --git a/libs/single-spa-community-angular/src/single-spa-angular.ts b/libs/single-spa-angular/src/single-spa-angular.ts similarity index 99% rename from libs/single-spa-community-angular/src/single-spa-angular.ts rename to libs/single-spa-angular/src/single-spa-angular.ts index 72f76a4b..cc1eafc7 100644 --- a/libs/single-spa-community-angular/src/single-spa-angular.ts +++ b/libs/single-spa-angular/src/single-spa-angular.ts @@ -1,6 +1,6 @@ import type { ApplicationRef, NgModuleRef, NgZone } from '@angular/core'; import type { LifeCycles } from 'single-spa'; -import { getContainerElementAndSetTemplate } from '@single-spa-community/angular/internals'; +import { getContainerElementAndSetTemplate } from 'single-spa-angular/internals'; import { SingleSpaPlatformLocation } from './platform-providers'; import type { SingleSpaAngularOptions, BootstrappedSingleSpaAngularOptions } from './types'; diff --git a/libs/single-spa-community-angular/src/types.ts b/libs/single-spa-angular/src/types.ts similarity index 91% rename from libs/single-spa-community-angular/src/types.ts rename to libs/single-spa-angular/src/types.ts index 56de7455..aeec12e2 100644 --- a/libs/single-spa-community-angular/src/types.ts +++ b/libs/single-spa-angular/src/types.ts @@ -1,6 +1,6 @@ import type { NgModuleRef, Type, NgZone, ApplicationRef } from '@angular/core'; import type { AppProps } from 'single-spa'; -import type { BaseSingleSpaAngularOptions } from '@single-spa-community/angular/internals'; +import type { BaseSingleSpaAngularOptions } from 'single-spa-angular/internals'; export interface SingleSpaAngularOptions< T = Record, diff --git a/libs/single-spa-community-angular/tsconfig.json b/libs/single-spa-angular/tsconfig.json similarity index 100% rename from libs/single-spa-community-angular/tsconfig.json rename to libs/single-spa-angular/tsconfig.json diff --git a/libs/single-spa-community-angular/tsconfig.lib.json b/libs/single-spa-angular/tsconfig.lib.json similarity index 100% rename from libs/single-spa-community-angular/tsconfig.lib.json rename to libs/single-spa-angular/tsconfig.lib.json diff --git a/libs/single-spa-community-angular/webpack/__snapshots__/index.spec.ts.snap b/libs/single-spa-angular/webpack/__snapshots__/index.spec.ts.snap similarity index 100% rename from libs/single-spa-community-angular/webpack/__snapshots__/index.spec.ts.snap rename to libs/single-spa-angular/webpack/__snapshots__/index.spec.ts.snap diff --git a/libs/single-spa-community-angular/webpack/externals.ts b/libs/single-spa-angular/webpack/externals.ts similarity index 88% rename from libs/single-spa-community-angular/webpack/externals.ts rename to libs/single-spa-angular/webpack/externals.ts index 52e01844..7d0e13ee 100644 --- a/libs/single-spa-community-angular/webpack/externals.ts +++ b/libs/single-spa-angular/webpack/externals.ts @@ -46,8 +46,8 @@ export const externals = [ '@angular/upgrade/static', 'single-spa', - '@single-spa-community/angular/internals', - '@single-spa-community/angular', - '@single-spa-community/angular/elements', - '@single-spa-community/angular/parcel', + 'single-spa-angular/internals', + 'single-spa-angular', + 'single-spa-angular/elements', + 'single-spa-angular/parcel', ]; diff --git a/libs/single-spa-community-angular/webpack/index.spec.ts b/libs/single-spa-angular/webpack/index.spec.ts similarity index 100% rename from libs/single-spa-community-angular/webpack/index.spec.ts rename to libs/single-spa-angular/webpack/index.spec.ts diff --git a/libs/single-spa-community-angular/webpack/index.ts b/libs/single-spa-angular/webpack/index.ts similarity index 100% rename from libs/single-spa-community-angular/webpack/index.ts rename to libs/single-spa-angular/webpack/index.ts diff --git a/libs/single-spa-community-angular/webpack/webpack-5/remove-mini-css-extract.ts b/libs/single-spa-angular/webpack/webpack-5/remove-mini-css-extract.ts similarity index 100% rename from libs/single-spa-community-angular/webpack/webpack-5/remove-mini-css-extract.ts rename to libs/single-spa-angular/webpack/webpack-5/remove-mini-css-extract.ts diff --git a/libs/single-spa-community-angular/project.json b/libs/single-spa-community-angular/project.json deleted file mode 100644 index d1dd1abc..00000000 --- a/libs/single-spa-community-angular/project.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "single-spa-community-angular", - "$schema": "../../node_modules/nx/schemas/project-schema.json", - "projectType": "library", - "sourceRoot": "libs/single-spa-community-angular/src", - "prefix": "single-spa-community-angular", - "targets": { - "build": { - "executor": "@nx/angular:package", - "options": { - "tsConfig": "libs/single-spa-community-angular/tsconfig.lib.json", - "project": "libs/single-spa-community-angular/ng-package.json" - } - } - }, - "tags": [] -} diff --git a/package.json b/package.json index efea2c99..1fe1b4b5 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "@single-spa-community/angular", + "name": "single-spa-angular", "version": "0.0.0", "description": "Helpers for building single-spa applications which use Angular 2+", "repository": { @@ -34,7 +34,7 @@ "test": "yarn clean && jest", "lint": "eslint apps libs --ext ts", "// - SINGLE-SPA-ANGULAR": "Scripts for building single-spa-angular", - "build:single-spa-angular": "nx build single-spa-community-angular --skip-nx-cache && cpx README.md lib", + "build:single-spa-angular": "nx build single-spa-angular --skip-nx-cache && cpx README.md lib", "// - WEBPACK": "Scripts for building Webpack config transformer", "build:webpack": "rimraf lib/lib && tsc -p tsconfig.webpack.json", "// - SYSTEM": "Scripts for building singla-spa-angular in SystemJS format", @@ -53,6 +53,7 @@ "serve:app:elements": "yarn nx serve elements --disable-host-check --live-reload false --port 4000", "serve:app:parcel": "yarn nx serve parcel --disable-host-check --live-reload false --port 4400", "serve:app:root-config": "yarn webpack-dev-server --config apps/root-config/webpack.config.js", + "serve:app:assets": "yarn serve system -s -l 4600 --cors", "serve:all": "concurrently 'yarn:serve:app:*'", "// - INTEGRATION BUILDS": "Build apps that are required for E2E testing #requires yarn install:integration", "build:app:shop": "nx build shop", diff --git a/schematics/ng-add/_files/extra-webpack.config.js.template b/schematics/ng-add/_files/extra-webpack.config.js.template index 63e987a6..73a1ee2a 100644 --- a/schematics/ng-add/_files/extra-webpack.config.js.template +++ b/schematics/ng-add/_files/extra-webpack.config.js.template @@ -1,4 +1,4 @@ -const singleSpaAngularWebpack = require('@single-spa-community/angular/lib/webpack').default; +const singleSpaAngularWebpack = require('single-spa-angular/lib/webpack').default; module.exports = (config, options) => { const singleSpaWebpackConfig = singleSpaAngularWebpack(config, options); diff --git a/schematics/ng-add/_files/src/main.single-spa.ts.template b/schematics/ng-add/_files/src/main.single-spa.ts.template index 3899d02e..1ef1165c 100644 --- a/schematics/ng-add/_files/src/main.single-spa.ts.template +++ b/schematics/ng-add/_files/src/main.single-spa.ts.template @@ -1,10 +1,10 @@ <% if (routing) { %> import { bootstrapApplication, platformBrowser } from '@angular/platform-browser'; import { NavigationStart, Router } from '@angular/router'; -import { singleSpaAngular, provideSingleSpaPlatform } from '@single-spa-community/angular' +import { singleSpaAngular, provideSingleSpaPlatform } from 'single-spa-angular' <% } else { %> import { bootstrapApplication, platformBrowser } from '@angular/platform-browser'; -import { singleSpaAngular } from '@single-spa-community/angular' +import { singleSpaAngular } from 'single-spa-angular' <% } %> import { appConfig } from './app/app.config'; diff --git a/system/rollup.config.js b/system/rollup.config.js index 3997eb67..a6d5f6a7 100644 --- a/system/rollup.config.js +++ b/system/rollup.config.js @@ -26,23 +26,23 @@ const packages = ['2022'] .map(ecma => [ { ecma, - angularPackage: '@single-spa-community/angular/internals', - filename: 'single-spa-community-angular-internals', + angularPackage: 'single-spa-angular/internals', + filename: 'single-spa-angular-internals', }, { ecma, - angularPackage: '@single-spa-community/angular', - filename: 'single-spa-community-angular', + angularPackage: 'single-spa-angular', + filename: 'single-spa-angular', }, { ecma, - angularPackage: '@single-spa-community/angular/elements', - filename: 'single-spa-community-angular-elements', + angularPackage: 'single-spa-angular/elements', + filename: 'single-spa-angular-elements', }, { ecma, - angularPackage: '@single-spa-community/angular/parcel', - filename: 'single-spa-community-angular-parcel', + angularPackage: 'single-spa-angular/parcel', + filename: 'single-spa-angular-parcel', }, ]) .flat(); diff --git a/tsconfig.base.json b/tsconfig.base.json index ecd0da4a..4d15a2dd 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -2,15 +2,15 @@ "compilerOptions": { "baseUrl": ".", "paths": { - "@single-spa-community/angular": ["libs/single-spa-community-angular/index.ts"], - "@single-spa-community/angular/elements": [ - "libs/single-spa-community-angular/elements/src/index.ts" + "single-spa-angular": ["libs/single-spa-angular/index.ts"], + "single-spa-angular/elements": [ + "libs/single-spa-angular/elements/src/index.ts" ], - "@single-spa-community/angular/internals": [ - "libs/single-spa-community-angular/internals/src/index.ts" + "single-spa-angular/internals": [ + "libs/single-spa-angular/internals/src/index.ts" ], - "@single-spa-community/angular/parcel": [ - "libs/single-spa-community-angular/parcel/src/index.ts" + "single-spa-angular/parcel": [ + "libs/single-spa-angular/parcel/src/index.ts" ] }, "target": "es2015", diff --git a/tsconfig.webpack.json b/tsconfig.webpack.json index 8fd358a8..29f97512 100644 --- a/tsconfig.webpack.json +++ b/tsconfig.webpack.json @@ -6,5 +6,5 @@ "module": "CommonJS", "types": ["node"] }, - "include": ["./libs/single-spa-community-angular/webpack/index.ts"] + "include": ["./libs/single-spa-angular/webpack/index.ts"] }