Merge c03a52f into f30f021

dword-design · Dec 31, 2019 · b957bce · b957bce
2 parents f30f021 + c03a52f
commit b957bce
Show file tree

Hide file tree

Showing 9 changed files with 1,774 additions and 325 deletions.
diff --git a/package.json b/package.json
@@ -2,9 +2,6 @@
   "name": "@dword-design/base-config-server",
   "version": "1.2.1",
   "description": "",
-  "bugs": {
-    "url": "https://github.com/dword-design/base-config-server/issues"
-  },
   "repository": "dword-design/base-config-server",
   "license": "MIT",
   "author": "Sebastian Landwehr <info@dword-design.de>",
@@ -31,17 +28,11 @@
     "get-package-name": "^1.0.0"
   },
   "devDependencies": {
-    "@dword-design/base": "^3.7.3",
+    "@dword-design/base": "^4.0.0",
     "@dword-design/functions": "^2.2.2",
     "expect": "^24.9.0",
     "glob-promise": "^3.4.0",
     "output-files": "^1.1.7",
-    "sort-package-json": "^1.30.0",
     "with-local-tmp-dir": "^2.2.1"
-  },
-  "contributors": [
-    "Renovate Bot (http://renovatebot.com)",
-    "dword-design (http://www.dword-design.de)"
-  ],
-  "maintainers": []
+  }
 }
diff --git a/test/build/build-errors.test.js b/test/build/build-errors.test.js
@@ -3,18 +3,19 @@ import withLocalTmpDir from 'with-local-tmp-dir'
 import expect from 'expect'
 import outputFiles from 'output-files'
 import glob from 'glob-promise'
-import sortPackageJson from 'sort-package-json'
 import { endent } from '@dword-design/functions'
-import packageConfig from '../package.config'
 
 export default () => withLocalTmpDir(__dirname, async () => {
   await outputFiles({
-    'package.json': JSON.stringify(sortPackageJson({
-      ...packageConfig,
-      devDependencies: {
-        '@dword-design/base-config-server': '^1.0.0',
-      },
-    }), undefined, 2),
+    'package.json': endent`
+      {
+        "baseConfig": "server",
+        "devDependencies": {
+          "@dword-design/base-config-server": "^1.0.0"
+        }
+      }
+
+    `,
     src: {
       'cli.js': endent`
         #!/usr/bin/env node

diff --git a/test/build/linting-errors.test.js b/test/build/linting-errors.test.js
@@ -3,18 +3,18 @@ import withLocalTmpDir from 'with-local-tmp-dir'
 import expect from 'expect'
 import outputFiles from 'output-files'
 import glob from 'glob-promise'
-import sortPackageJson from 'sort-package-json'
 import { endent } from '@dword-design/functions'
-import packageConfig from '../package.config'
 
 export default () => withLocalTmpDir(__dirname, async () => {
   await outputFiles({
-    'package.json': JSON.stringify(sortPackageJson({
-      ...packageConfig,
-      devDependencies: {
-        '@dword-design/base-config-server': '^1.0.0',
-      },
-    }), undefined, 2),
+    'package.json': endent`
+      {
+        "baseConfig": "server",
+        "devDependencies": {
+          "@dword-design/base-config-server": "^1.0.0"
+        }
+      }
+    `,
     src: {
       'cli.js': endent`
         #!/usr/bin/env node

diff --git a/test/build/valid.test.js b/test/build/valid.test.js
@@ -4,19 +4,20 @@ import expect from 'expect'
 import P from 'path'
 import outputFiles from 'output-files'
 import glob from 'glob-promise'
-import sortPackageJson from 'sort-package-json'
 import { endent } from '@dword-design/functions'
-import packageConfig from '../package.config'
 import { readFile } from 'fs-extra'
 
 export default () => withLocalTmpDir(__dirname, async () => {
   await outputFiles({
-    'package.json': JSON.stringify(sortPackageJson({
-      ...packageConfig,
-      devDependencies: {
-        '@dword-design/base-config-server': '^1.0.0',
-      },
-    }), undefined, 2),
+    'package.json': endent`
+      {
+        "baseConfig": "server",
+        "devDependencies": {
+          "@dword-design/base-config-server": "^1.0.0"
+        }
+      }
+
+    `,
     'src/index.js': 'export default 1 |> x => x * 2',
     src: {
       'cli.js': endent`
@@ -46,9 +47,5 @@ export default () => withLocalTmpDir(__dirname, async () => {
   ])
   expect(require(P.resolve('dist'))).toEqual(2)
   expect(await readFile('.gitignore', 'utf8')).toMatch('/.eslintrc.json\n')
-  expect(stdout).toEqual(endent`
-    Copying config files …
-    Updating README.md …
-    Successfully compiled 2 files with Babel.
-  ` + '\n')
+  expect(stdout).toEqual('Successfully compiled 2 files with Babel.\n')
 })
diff --git a/test/package.config.js b/test/package.config.js
diff --git a/test/start/build-errors.test.js b/test/start/build-errors.test.js
@@ -2,19 +2,20 @@ import { spawn } from 'child-process-promise'
 import withLocalTmpDir from 'with-local-tmp-dir'
 import P from 'path'
 import outputFiles from 'output-files'
-import sortPackageJson from 'sort-package-json'
 import { endent } from '@dword-design/functions'
 import { outputFile } from 'fs-extra'
-import packageConfig from '../package.config'
 
 export default () => withLocalTmpDir(__dirname, async () => {
   await outputFiles({
-    'package.json': JSON.stringify(sortPackageJson({
-      ...packageConfig,
-      devDependencies: {
-        '@dword-design/base-config-server': '^1.0.0',
-      },
-    }), undefined, 2),
+    'package.json': endent`
+      {
+        "baseConfig": "server",
+        "devDependencies": {
+          "@dword-design/base-config-server": "^1.0.0"
+        }
+      }
+
+    `,
     src: {
       'cli.js': endent`
         #!/usr/bin/env node

diff --git a/test/start/linting-errors.test.js b/test/start/linting-errors.test.js
@@ -2,19 +2,20 @@ import { spawn } from 'child-process-promise'
 import withLocalTmpDir from 'with-local-tmp-dir'
 import P from 'path'
 import outputFiles from 'output-files'
-import sortPackageJson from 'sort-package-json'
 import { endent } from '@dword-design/functions'
 import { outputFile } from 'fs-extra'
-import packageConfig from '../package.config'
 
 export default () => withLocalTmpDir(__dirname, async () => {
   await outputFiles({
-    'package.json': JSON.stringify(sortPackageJson({
-      ...packageConfig,
-      devDependencies: {
-        '@dword-design/base-config-server': '^1.0.0',
-      },
-    }), undefined, 2),
+    'package.json': endent`
+      {
+        "baseConfig": "server",
+        "devDependencies": {
+          "@dword-design/base-config-server": "^1.0.0"
+        }
+      }
+
+    `,
     src: {
       'cli.js': endent`
         #!/usr/bin/env node

diff --git a/test/start/valid.test.js b/test/start/valid.test.js
@@ -2,19 +2,20 @@ import { spawn } from 'child-process-promise'
 import withLocalTmpDir from 'with-local-tmp-dir'
 import P from 'path'
 import outputFiles from 'output-files'
-import sortPackageJson from 'sort-package-json'
 import { endent } from '@dword-design/functions'
 import { outputFile } from 'fs-extra'
-import packageConfig from '../package.config'
 
 export default () => withLocalTmpDir(__dirname, async () => {
   await outputFiles({
-    'package.json': JSON.stringify(sortPackageJson({
-      ...packageConfig,
-      devDependencies: {
-        '@dword-design/base-config-server': '^1.0.0',
-      },
-    }), undefined, 2),
+    'package.json': endent`
+      {
+        "baseConfig": "server",
+        "devDependencies": {
+          "@dword-design/base-config-server": "^1.0.0"
+        }
+      }
+
+    `,
     src: {
       'cli.js': endent`
         #!/usr/bin/env node