Merge pull request #3374 from IgniteUI/vnext

Promote staging to production
IgniteUI · Aug 17, 2023 · b3287c6 · b3287c6
2 parents 2cea049 + 8f016cc
commit b3287c6
Show file tree

Hide file tree

Showing 59 changed files with 5,592 additions and 5,998 deletions.
diff --git a/.github/workflows/build-app-crm.yml b/.github/workflows/build-app-crm.yml
@@ -49,7 +49,7 @@ jobs:
         run: npm config set ${{secrets.IG_SCOPE}}:_auth=${{secrets.IG_TOKEN}}
 
       - name: Install dependencies
-        run: npm ci --legacy-peer-deps
+        run: npm ci
 
       - name: Run lint
         run: npm run lint

diff --git a/.github/workflows/build-app-lob.yml b/.github/workflows/build-app-lob.yml
@@ -54,7 +54,7 @@ jobs:
         run: npm config set ${{secrets.IG_SCOPE}}:_auth=${{secrets.IG_TOKEN}}
 
       - name: Install dependencies
-        run: npm ci --legacy-peer-deps
+        run: npm ci
 
       - name: Run lint
         run: npm run lint

diff --git a/gulpfile.js b/gulpfile.js
@@ -166,6 +166,7 @@ const processApp = (projectPath, dest, directoriesToExclude) => {
             fs.readFile(file.path, 'utf-8', (err, content) => {
                 // Adjust sample application bundle files
                 const jsonObj = JSON.parse(content);
+                const codesandboxConfigFolder = '.codesandbox';
                 const additionals = [];
                 const packageJson =
                 {
@@ -197,6 +198,8 @@ const processApp = (projectPath, dest, directoriesToExclude) => {
                     fs.mkdirSync(sampleAppPath);
                 }
 
+                fs.mkdirSync(`${sampleAppPath}/${codesandboxConfigFolder}`);
+
                 // Distribute Sample Files
                 jsonObj.sampleFiles.forEach(sampleFile => {
                     let sampleContent;
@@ -211,10 +214,12 @@ const processApp = (projectPath, dest, directoriesToExclude) => {
                     let tempPath = "";
                     paths.forEach(p => {
                         tempPath += p + "/";
-                        if (p.indexOf(".") !== -1) {
+                        if (p.indexOf(".") !== -1 && p !== codesandboxConfigFolder) {
                             fs.writeFileSync(sampleAppPath + "/" + tempPath, sampleContent);
                         } else
-                            if (!fs.existsSync(sampleAppPath + "/" + tempPath)) {
+                            if (p === 'Dockerfile') {
+                                fs.writeFileSync(sampleAppPath + "/" + tempPath, sampleContent);
+                            } else if (!fs.existsSync(sampleAppPath + "/" + tempPath)) {
                                 fs.mkdirSync(sampleAppPath + "/" + tempPath)
                             }
                     })

diff --git a/live-editing/configs/BadgeConfigGenerator.ts b/live-editing/configs/BadgeConfigGenerator.ts
@@ -8,6 +8,18 @@ export class BadgeConfigGenerator implements IConfigGenerator {
     public generateConfigs(): Config[] {
         const configs = new Array<Config>();
 
+        // badge icon sample
+        configs.push(new Config({
+            component: 'BadgeIconComponent',
+            additionalFiles: ["src/app/data-display/badge/model/member.model.ts"],
+            appModuleConfig: new AppModuleConfig({
+                imports: ['IgxBadgeModule', 'IgxAvatarModule', 'BadgeIconComponent'],
+                ngDeclarations: ['BadgeIconComponent'],
+                ngImports: ['IgxBadgeModule', 'IgxAvatarModule']
+            }),
+            shortenComponentPathBy: "/data-display/badge/"
+        }));
+
         // badge sample 2
         configs.push(new Config({
             component: 'BadgeSample2Component',

diff --git a/live-editing/configs/BannerConfigGenerator.ts b/live-editing/configs/BannerConfigGenerator.ts
@@ -91,8 +91,7 @@ export class BannerConfigGenerator implements IConfigGenerator {
                     'IgxRippleModule', 'IgxIconModule', 'BannerStylingComponent'],
                 ngDeclarations: ['BannerStylingComponent'],
                 ngImports: ['IgxBannerModule', 'IgxCardModule', 'IgxToastModule',  'IgxNavbarModule', 'IgxButtonModule',
-                    'IgxRippleModule', 'IgxIconModule', 'IgxButtonModule',
-                    'IgxRippleModule']
+                    'IgxRippleModule', 'IgxIconModule']
             }),
             shortenComponentPathBy: "/notifications/banner/"
         }));

diff --git a/live-editing/configs/GridConfigGenerator.ts b/live-editing/configs/GridConfigGenerator.ts
@@ -93,7 +93,7 @@ export class GridConfigGenerator implements IConfigGenerator {
             additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/invoiceData.ts'],
             appModuleConfig: new AppModuleConfig({
                 imports: ['IgxButtonModule', 'IgxGridModule',
-                    'IgxSwitchModule', 'GridGroupBySampleComponent', 'IgxIconModule', 'IgxBadgeModule', 'IgxPreventDocumentScrollModule', 'IgxDropDownModule', 'IgxToggleModule'],
+                    'IgxSwitchModule', 'GridGroupByCustomSampleComponent', 'IgxIconModule', 'IgxBadgeModule', 'IgxPreventDocumentScrollModule', 'IgxDropDownModule', 'IgxToggleModule'],
                 ngDeclarations: ['GridGroupByCustomSampleComponent'],
                 ngImports: ['IgxPreventDocumentScrollModule', 'IgxButtonModule', 'IgxGridModule', 'IgxIconModule', 'IgxBadgeModule', 'IgxDropDownModule','IgxToggleModule' ]
             })
@@ -958,9 +958,9 @@ export class GridConfigGenerator implements IConfigGenerator {
             component: 'GridClipboardSampleComponent',
             additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/nwindData.ts'],
             appModuleConfig: new AppModuleConfig({
-                imports: ['GridClipboardSampleComponent', 'IgxGridModule', 'IgxSwitchModule', 'IgxInputGroupModule', 'IgxIconModule', 'IgxPreventDocumentScrollModule'],
+                imports: ['GridClipboardSampleComponent', 'IgxGridModule', 'IgxSwitchModule', 'IgxInputGroupModule', 'IgxIconModule', 'IgxPreventDocumentScrollModule', 'IgxButtonModule'],
                 ngDeclarations: ['GridClipboardSampleComponent'],
-                ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule', 'IgxSwitchModule', 'IgxInputGroupModule', 'IgxIconModule']
+                ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule', 'IgxSwitchModule', 'IgxInputGroupModule', 'IgxIconModule', 'IgxButtonModule']
             })
         }));
         configs.push(new Config({

diff --git a/live-editing/configs/IconConfigGenerator.ts b/live-editing/configs/IconConfigGenerator.ts
@@ -45,6 +45,17 @@ export class IconConfigGenerator implements IConfigGenerator {
             shortenComponentPathBy: "/data-display/icon/"
         }));
 
+        // Material Symbols Sample
+        configs.push(new Config({
+            component: 'MaterialSymbolsComponent',
+            appModuleConfig: new AppModuleConfig({
+                imports: ['IgxIconModule', 'MaterialSymbolsComponent'],
+                ngDeclarations: ['MaterialSymbolsComponent'],
+                ngImports: ['IgxIconModule']
+            }),
+            shortenComponentPathBy: "/data-display/material-symbols/"
+        }));
+
         // Material icons extended sample
         configs.push(new Config({
             component: 'MaterialIconsExtendedComponent',