Merge pull request #381 from IgniteUI/vnext

Updating  master from vnext for React release

Author: ChronosSF

CODEOWNERS

@@ -0,0 +1,7 @@
+# code owners must approve PRs
+* @HUSSAR-mtrela
+
+# *.md @HUSSAR-mtrela
+# *.js @HUSSAR-mtrela
+# *.ts @HUSSAR-mtrela
+# *.json @HUSSAR-mtrela

README.md

@@ -158,3 +158,22 @@ NOTE this will re-generate the Readme.md file in the new sample
 ## Learn More
 
 To learn more about **Ignite UI for React** components, check out the [React documentation](https://www.infragistics.com/products/ignite-ui-react/react/components/general-getting-started.html).
+
+
+# Updating Version of IgniteUI Packages
+
+Perform these steps to update version of **Ignite UI for React** packages in all samples. NOTE that the order of these steps is very important.
+
+- open this repo in VS Code
+- open [gulp-samples.js](./browser/tasks/gulp-samples.js) file
+- navigate to the `updateIG` function
+- change version of **Ignite UI for React** packages in the `packageUpgrades` array
+- open terminal window
+- run `cd browser` command
+- run `gulp updateIG` command
+- run `npm install --legacy-peer-deps` command
+- create pull request with your changes
+- open the [Igniteui-xplat-example](https://github.com/IgniteUI/igniteui-xplat-examples) repo in VS Code
+- update version of **Ignite UI for React** packages in [React template](https://github.com/IgniteUI/igniteui-xplat-examples/blob/23.2.x/editor-templates/React/main-template/package.json)
+- create pull request with your changes in [Igniteui-xplat-example](https://github.com/IgniteUI/igniteui-xplat-examples) repo
+

azure-pipelines/build-pipeline.yml

@@ -4,10 +4,7 @@ trigger:
     - vnext
     - master
 
-pr:
-  branches:
-    exclude:
-    - '*'  # must quote since "*" is a YAML reserved character; we want a string
+pr: none
 
 parameters:
 - name: isVerbose
@@ -34,31 +31,76 @@ stages:
           versionSource: 'spec'
           versionSpec: '16.x'
 
+      - task: RegexReplace@3
+        enabled: false
+        displayName: 'Replace deps with scoped ones'
+        inputs:
+          InputSearchPattern: 'browser\package.json'
+          FindRegex: 'igniteui-react-[a-z]+'
+          ReplaceRegex: '@infragistics/$1'
+          UseUTF8: true
+          UseRAW: true
+
       - task: Npm@1
-        displayName: 'npm install'
+        displayName: 'Register licensed npm registry in .npmrc'
         inputs:
-          command: custom
+          command: 'custom'
           workingDir: '$(Build.SourcesDirectory)\browser'
-          verbose: ${{ parameters.isVerbose }}
-          customCommand: 'install --legacy-peer-deps'
-          customEndpoint: 'public proget'
+          customCommand: 'config -L project set @infragistics:registry=https://packages.infragistics.com/npm/js-licensed/'
+          customEndpoint: 'internal proget'
+
+      - task: PowerShell@2
+        displayName: 'Replace references to IG trial packages with licensed ones'
+        inputs:
+          failOnStderr: true
+          showWarnings: true
+          workingDirectory: '$(Build.SourcesDirectory)\browser'
+          targetType: 'inline'
+          script: |
+            $packageJson = Get-Content -Raw .\package.json | ConvertFrom-Json
+            $properties = $packageJson.dependencies.PSObject.Properties `
+                | where-object { $_.Name.StartsWith("igniteui-react") -or $_.Name.StartsWith("igniteui-dockmanager") }
+
+            foreach( $property in $properties )
+            {
+                $oldName = $property.Name;
+                $newName = "@infragistics/" + $oldName
+
+                # remember the current value of the old property
+                $value = $property.Value;
+
+                # remove reference to the trial package reference
+                $packageJson.dependencies.psobject.Properties.Remove($oldName);
+
+                # add reference to the licensed package reference
+                $packageJson.dependencies | Add-Member -NotePropertyName $newName -NotePropertyValue $value;
+            }
 
+            ConvertTo-Json -InputObject $packageJson | Set-Content -Path .\package.json
       - task: Npm@1
-        displayName: 'npm uninstall igniteui-dockmanager (trial)'
+        displayName: 'npm install'
         inputs:
           command: custom
           workingDir: '$(Build.SourcesDirectory)\browser'
           verbose: ${{ parameters.isVerbose }}
-          customCommand: 'uninstall igniteui-dockmanager --no-save'
+          customCommand: 'install --legacy-peer-deps'
+          customEndpoint: 'public proget'
 
-      - task: CmdLine@2
-        displayName: 'Install jq - using choco.'
+      - task: PowerShell@2
+        displayName: 'Replace references to IG trial packages with licensed ones in TSX files'
         inputs:
-          script: 'choco install jq -y'
           failOnStderr: true
+          showWarnings: true
+          workingDirectory: '$(Build.SourcesDirectory)'
+          targetType: 'inline'
+          script: |
+            Get-ChildItem -Include "*.tsx","*.ts" -Recurse | `
+            ForEach {  (Get-Content $_.PSPath | ForEach { ($_ -replace '([from|import])\s?[''"](igniteui-[react|dockmanager].*)[''"]', '$1 "@infragistics/$2"') }) | `
+            Set-Content $_.PSPath }
 
       - task: PowerShell@2
         displayName: 'npm install igniteui-dockmanager (licensed)'
+        enabled: false # Disable this extra step because we are already going for the licensed version in the package.json - 2 steps above
         inputs:
           targetType: 'inline'
           # We are using a PowerShell script because the npm step doesn't allow for explicit use of variable expansion which is what we use here.

browser/.eslintrc.js

@@ -24,6 +24,7 @@ module.exports = {
       "no-undef": "off",
       "camelcase": "off",
       "no-unused-vars": "off",
+      "no-extra-semi": "off",
       "no-extend-native": "off",
       "no-throw-literal": "off",
       "no-useless-concat": "off",
@@ -56,6 +57,7 @@ module.exports = {
             "no-unused-vars": "off",
             "no-extend-native": "off",
             "no-throw-literal": "off",
+            "no-extra-semi": "off",
             "no-useless-concat": "off",
             "no-mixed-operators": "off",
             "no-prototype-builtins": "off",
@@ -77,4 +79,4 @@ module.exports = {
         }
       }
     ]
-  };
+  };

browser/config-overrides.js

@@ -1,10 +1,61 @@
+const path = require('path');
+let pathsConfig = require("./tsconfig.paths.json");
+const {alias, configPaths, expandResolveAlias, expandRulesInclude, expandPluginsScope} = require('react-app-rewire-alias')
+
+//this works around the fact that alias doesn't support multiple paths
+function aliasMultiple(aliasMap) {
+    const alias0 = Object.keys(aliasMap).reduce( (a,i) => {
+      a[i] = aliasMap[i][0]
+      return a
+    }, {});
+    const alias1 = Object.keys(aliasMap).reduce( (a,i) => {
+        a[i] = aliasMap[i][1]
+        return a
+      }, {});
+    return function(config) {
+      expandResolveAlias(config.resolve, aliasMap);
+      expandRulesInclude(config.module.rules, Object.values(alias0));
+      expandRulesInclude(config.module.rules, Object.values(alias1));
+      expandPluginsScope(config.resolve.plugins, Object.values(alias0), Object.values(alias0));
+      expandPluginsScope(config.resolve.plugins, Object.values(alias1), Object.values(alias1));
+      return config;
+    }
+  }
+
 /* eslint-disable no-undef */
 /* eslint-disable @typescript-eslint/no-var-requires */
 module.exports = function override(config, env) {
     console.log("config-overrides.js started");
     const paths = require('./node_modules/react-scripts/config/paths');
     // console.log("config-overrides.js paths");
-    // console.log(paths);
+    console.log(paths);
+
+    console.log(pathsConfig);
+    let tspaths = pathsConfig.compilerOptions.paths;
+    tspaths = Object.keys(tspaths).reduce((a, p) => {
+        let target = tspaths[p];
+        a[p.replace(/\/\*$/,'')] = Array.isArray(target) ? target.map((t) => t.replace(/\/\*$/,'')) : target.replace(/\/\*$/,'');
+        return a;
+    }, {});
+    console.log(tspaths);
+    tspaths = Object.keys(tspaths).reduce((a, p) => {
+        let target = tspaths[p];
+        a[p.replace(/\/\*$/,'')] = Array.isArray(target) ? target.map((t) => path.resolve(__dirname, t)) : path.resolve(__dirname, target);
+        
+        return a;
+    }, {});
+    console.log(tspaths);
+
+    // config.resolve = {
+    //     ...config.resolve,
+    //     alias: {
+    //       ...config.alias,
+    //       ...tspaths
+    //     },
+    // };
+
+    //console.log(config.resolve);
+
     let rules = config.module.rules;
     //let paths = config._paths;
     let oneOf = null; // rules[1].oneOf;
@@ -112,5 +163,10 @@ module.exports = function override(config, env) {
     }
 
     console.log("\n\n\n\n");
-    return config;
+    //let newConfig = alias(configPathsMultiple('./tsconfig.paths.json'))(config);
+    //console.log(newConfig);
+
+    let newConfig = aliasMultiple(tspaths)(config);
+    console.log(newConfig);
+    return newConfig;
 }

browser/gulpfile.js

@@ -47,7 +47,8 @@ exports.updateBrowser = updateBrowser = gulp.series(
     sb.updateVersion,
     sb.getSamples,
     sb.copySamples,
-    sb.updateCodeViewer
+    sb.updateCodeViewer,
+    sb.updateReadme,
     // sb.copyPackageJson,
 );