Merge pull request #8 from iamvishnusankar/development

Remove deepmerge and added @corex/deepmerge

.github/workflows/test.yml

@@ -0,0 +1,21 @@
+name: Test
+on:
+  pull_request:
+    branches:
+      - master
+      - development
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Github Checkout
+        uses: actions/checkout@v2
+      - name: Install & Build & Test
+        run: |
+          yarn install --production=false
+          yarn lint
+          yarn test
+        env:
+          NODE_ENV: test
+          CI: true

.prettierignore

@@ -0,0 +1,3 @@
+.next
+public
+dist

azure-pipeline/npm.yml

@@ -47,3 +47,16 @@ steps:
   - bash: |
       yarn ywc publish
     displayName: Publish Packages
+
+  # Github Release
+  - task: GitHubRelease@1
+    displayName: Github Release
+    inputs:
+      gitHubConnection: 'iamvishnusankar'
+      repositoryName: '$(Build.Repository.Name)'
+      action: 'create'
+      target: '$(Build.SourceVersion)'
+      tagSource: 'userSpecifiedTag'
+      tag: 'v$(Build.BuildNumber)'
+      changeLogCompareToRelease: 'lastFullRelease'
+      changeLogType: 'commitBased'

packages/next-sitemap/package.json

@@ -17,6 +17,6 @@
     "lint": "tsc --noEmit --declaration"
   },
   "dependencies": {
-    "deepmerge": "^4.2.2"
+    "@corex/deepmerge": "^2.2.7"
   }
 }

packages/next-sitemap/src/config/index.ts

@@ -1,7 +1,7 @@
 import fs from 'fs'
 import allPath from '../path'
 import { IConfig } from '../interface'
-import deepmerge from 'deepmerge'
+import merge from '@corex/deepmerge'
 
 export const defaultConfig: Partial<IConfig> = {
   rootDir: 'public',
@@ -20,12 +20,10 @@ export const defaultConfig: Partial<IConfig> = {
   },
 }
 
-const overwriteMerge = (_: any[], sourceArray: any[], __: any) => sourceArray
-
 export const withDefaultConfig = (config: Partial<IConfig>) =>
-  deepmerge(defaultConfig, config, {
-    arrayMerge: overwriteMerge,
-  })
+  merge([defaultConfig, config], {
+    arrayMergeType: 'overwrite',
+  }) as IConfig
 
 export const loadConfig = (): IConfig => {
   if (fs.existsSync(allPath.CONFIG_FILE)) {

packages/next-sitemap/tsconfig.json

@@ -1,10 +1,8 @@
 {
-  "extends": "../../tsconfig.workspace.json",
+  "extends": "@corex/tsconfig",
   "compilerOptions": {
     "rootDir": "src",
-    "outDir": "dist",
-    "noEmit": false,
-    "module": "CommonJS",
-    "target": "ESNext"
-  }
+    "outDir": "dist"
+  },
+  "include": ["src"]
 }

yarn.lock

@@ -8934,4 +8934,4 @@ yargs@^15.3.1:
     string-width "^4.2.0"
     which-module "^2.0.0"
     y18n "^4.0.0"
-    yargs-parser "^18.1.2"
+    yargs-parser "^18.1.2"