diff --git a/modules/openiddict/app/OpenIddict.Demo.Server/OpenIddict.Demo.Server.csproj b/modules/openiddict/app/OpenIddict.Demo.Server/OpenIddict.Demo.Server.csproj
index 227a4bfd7b..97453af046 100644
--- a/modules/openiddict/app/OpenIddict.Demo.Server/OpenIddict.Demo.Server.csproj
+++ b/modules/openiddict/app/OpenIddict.Demo.Server/OpenIddict.Demo.Server.csproj
@@ -40,10 +40,10 @@
-
-
-
-
+
+
+
+
diff --git a/npm/ng-packs/scripts/copy-packages-to-templates.ts b/npm/ng-packs/scripts/copy-packages-to-templates.ts
new file mode 100644
index 0000000000..c611c1109a
--- /dev/null
+++ b/npm/ng-packs/scripts/copy-packages-to-templates.ts
@@ -0,0 +1,82 @@
+import execa from 'execa';
+import fse from 'fs-extra';
+import fs from 'fs';
+
+const templates = ['app', 'app-nolayers', 'module'];
+const packageMap = {
+ account: 'ng.account',
+ 'account-core': 'ng.account.core',
+ components: 'ng.components',
+ core: 'ng.core',
+ 'feature-management': 'ng.feature-management',
+ identity: 'ng.identity',
+ 'permission-management': 'ng.permission-management',
+ 'setting-management': 'ng.setting-management',
+ 'tenant-management': 'ng.tenant-management',
+ 'theme-basic': 'ng.theme.basic',
+ 'theme-shared': 'ng.theme.shared',
+};
+
+(async () => {
+ await execa('yarn', ['build'], {
+ stdout: 'inherit',
+ });
+
+ await installPackages();
+
+ await removeAbpPackages();
+
+ await copyBuildedPackagesFromDistFolder();
+})();
+
+async function runEachTemplate(
+ handler: (template: string, templatePath?: string) => void | Promise,
+) {
+ for (var template of templates) {
+ const templatePath = `../../../templates/${template}/angular`;
+ const result = handler(template, templatePath);
+ result instanceof Promise ? await result : result;
+ }
+}
+
+async function installPackages() {
+ await runEachTemplate(async (template, templatePath) => {
+ if (fse.existsSync(`${templatePath}/yarn.lock`)) {
+ fse.removeSync(`${templatePath}/yarn.lock`);
+ }
+ await execa('yarn', ['install', '--ignore-scripts'], {
+ stdout: 'inherit',
+ cwd: templatePath,
+ });
+ });
+}
+
+async function removeAbpPackages() {
+ await runEachTemplate(async (template, templatePath) => {
+ Object.values(packageMap).forEach(value => {
+ const path = `${templatePath}/node_modules/@abp/${value}`;
+ if (fs.existsSync(path)) {
+ fse.removeSync(path);
+ }
+ });
+ if (fs.existsSync(`${templatePath}/.angular`)) {
+ fse.removeSync(`${templatePath}/.angular`);
+ }
+ });
+}
+function createFolderIfNotExists(destination: string) {
+ destination.split('/').reduce((acc, dir) => {
+ if (!fs.existsSync(acc)) {
+ fs.mkdirSync(acc);
+ }
+ return `${acc}/${dir}`;
+ });
+}
+async function copyBuildedPackagesFromDistFolder() {
+ await runEachTemplate(async (template, templatePath) => {
+ Object.entries(packageMap).forEach(([key, value]) => {
+ createFolderIfNotExists(`${templatePath}/node_modules/@abp/${value}`);
+ fse.copySync(`../dist/packages/${key}/`, `${templatePath}/node_modules/@abp/${value}`);
+ });
+ });
+}
diff --git a/npm/ng-packs/scripts/package.json b/npm/ng-packs/scripts/package.json
index b0961239bb..8f82f88cc9 100644
--- a/npm/ng-packs/scripts/package.json
+++ b/npm/ng-packs/scripts/package.json
@@ -8,7 +8,8 @@
"build:prod": "ts-node -r tsconfig-paths/register prod-build.ts",
"build:schematics": "ts-node -r tsconfig-paths/register build-schematics.ts",
"publish-packages": "ts-node -r tsconfig-paths/register publish.ts",
- "replace-with-tilde": "ts-node -r tsconfig-paths/register replace-with-tilde.ts"
+ "replace-with-tilde": "ts-node -r tsconfig-paths/register replace-with-tilde.ts",
+ "copy-to-templates": "ts-node -r tsconfig-paths/register copy-packages-to-templates.ts"
},
"author": "",
"dependencies": {
diff --git a/templates/app-nolayers/angular/src/styles.scss b/templates/app-nolayers/angular/src/styles.scss
index dbc4332587..efe57bd8c3 100644
--- a/templates/app-nolayers/angular/src/styles.scss
+++ b/templates/app-nolayers/angular/src/styles.scss
@@ -24,9 +24,3 @@
transform: translate(-50%, -50%);
}
}
-
-:root {
- --lpx-logo: url('/assets/images/logo.png');
- --lpx-logo-icon: url('/assets/images/logo-icon.png');
- --lpx-brand: #edae53;
-}
\ No newline at end of file
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj
index c205202a42..af31d6b3b0 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj
@@ -63,10 +63,10 @@
-
-
-
-
+
+
+
+
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj
index 661dfdf8db..9525771603 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj
@@ -64,10 +64,10 @@
-
-
-
-
+
+
+
+
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj
index f4c4638ef9..afd7cf01cf 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj
@@ -48,9 +48,9 @@
-
-
-
+
+
+
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj
index 9697e2cf25..9b9817c9a6 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj
@@ -49,9 +49,9 @@
-
-
-
+
+
+
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj
index 5bafd4f788..10e8b24a06 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj
@@ -58,10 +58,10 @@
-
-
-
-
+
+
+
+
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj
index 174a674f39..4c48cc7a23 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj
@@ -59,10 +59,10 @@
-
-
-
-
+
+
+
+
diff --git a/templates/app/angular/src/styles.scss b/templates/app/angular/src/styles.scss
index 14d29fc69b..efe57bd8c3 100644
--- a/templates/app/angular/src/styles.scss
+++ b/templates/app/angular/src/styles.scss
@@ -24,9 +24,3 @@
transform: translate(-50%, -50%);
}
}
-
-:root {
- --lpx-logo: url('/assets/images/logo.png');
- --lpx-logo-icon: url('/assets/images/logo-icon.png');
- --lpx-brand: #edae53;
-}
\ No newline at end of file