chore: lib -> dist

fisker · Nov 28, 2019 · 6a7cb41 · 6a7cb41
1 parent 2ac5b1a
commit 6a7cb41
Show file tree

Hide file tree

Showing 14 changed files with 24 additions and 21 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -27,4 +27,4 @@ coverage/**
 
 # project glob
 **/node_modules/**
-**/lib/**
+**/dist/**
diff --git a/.gitignore b/.gitignore
@@ -89,4 +89,4 @@ typings/
 
 # project ignore files
 .vscode/
-packages/*/lib/
+packages/*/dist/
diff --git a/.prettierignore b/.prettierignore
@@ -27,5 +27,5 @@ coverage/**
 
 # project glob
 **/node_modules/**
-**/lib/**
+**/dist/**
 
diff --git a/package.json b/package.json
@@ -48,6 +48,7 @@
     "@self/prettier-config": "npm:@fisker/prettier-config@1.0.22",
     "ava": "2.4.0",
     "cz-conventional-changelog-emoji": "0.1.0",
+    "del-cli": "3.0.0",
     "eslint": "6.7.1",
     "esm": "3.2.25",
     "husky": "3.1.0",
@@ -58,7 +59,6 @@
     "prettier": "1.19.1",
     "prettier-format": "1.0.1",
     "prettier-package-json": "2.1.0",
-    "rimraf": "3.0.0",
     "rollup": "1.27.5",
     "write-prettier-file": "1.2.2"
   },

diff --git a/packages/husky-config/package.json b/packages/husky-config/package.json
@@ -12,14 +12,14 @@
     "url": "https://github.com/fisker/shared-configs/issues"
   },
   "version": "1.1.3",
-  "main": "lib/index.js",
+  "main": "dist/index.js",
   "files": [
-    "lib"
+    "dist"
   ],
   "scripts": {
     "build": "run-p build:*",
     "build:js": "rollup --config",
-    "clean": "rimraf lib",
+    "clean": "del-cli dist",
     "dev": "rollup --config --watch",
     "test": "run-p test:*",
     "test:js": "ava --verbose"

diff --git a/packages/husky-config/rollup.config.js b/packages/husky-config/rollup.config.js
@@ -2,7 +2,7 @@ export default [
   {
     input: './src/index.js',
     output: {
-      file: './lib/index.js',
+      file: './dist/index.js',
       format: 'cjs',
     },
   },

diff --git a/packages/lint-staged-config/package.json b/packages/lint-staged-config/package.json
@@ -12,14 +12,14 @@
     "url": "https://github.com/fisker/shared-configs/issues"
   },
   "version": "1.0.6",
-  "main": "lib/index.js",
+  "main": "dist/index.js",
   "files": [
-    "lib"
+    "dist"
   ],
   "scripts": {
     "build": "run-p build:*",
     "build:js": "rollup --config",
-    "clean": "rimraf lib",
+    "clean": "del-cli dist",
     "dev": "rollup --config --watch",
     "test": "run-p test:*",
     "test:js": "echo \"no test yet\""

diff --git a/packages/lint-staged-config/rollup.config.js b/packages/lint-staged-config/rollup.config.js
@@ -2,7 +2,7 @@ export default [
   {
     input: './src/index.js',
     output: {
-      file: './lib/index.js',
+      file: './dist/index.js',
       format: 'cjs',
     },
   },

diff --git a/packages/lint-staged-config/src/commands.js b/packages/lint-staged-config/src/commands.js
@@ -2,4 +2,5 @@ export const PRETTIER = 'prettier --write'
 export const ESLINT = 'eslint --fix'
 export const STYLELINT = 'stylelint --fix'
 export const MARKDOWNLINT = 'markdownlint --fix'
+export const SORT_PACKAGE_JSON = 'sort-package-json'
 export const GIT_ADD = 'git add'
diff --git a/packages/lint-staged-config/src/index.js b/packages/lint-staged-config/src/index.js
@@ -1,4 +1,4 @@
-import {GIT_ADD} from './commands'
+import {GIT_ADD, SORT_PACKAGE_JSON} from './commands'
 // eslint-disable-next-line unicorn/import-index
 import * as languages from './languages/index'
 import mergeCommands from './utils/merge-commands'
@@ -10,5 +10,7 @@ module.exports = mergeCommands(parseCommands(languages)).reduce(
     ...config,
     [extensionsToGlob(extensions)]: [...commands, GIT_ADD],
   }),
-  {}
+  {
+    'package.json': [SORT_PACKAGE_JSON, GIT_ADD],
+  }
 )
diff --git a/packages/postcss-config/package.json b/packages/postcss-config/package.json
@@ -12,9 +12,9 @@
     "url": "https://github.com/fisker/shared-configs/issues"
   },
   "version": "1.1.2",
-  "main": "lib/index.js",
+  "main": "dist/index.js",
   "files": [
-    "lib"
+    "dist"
   ],
   "scripts": {
     "build": "rollup --config",

diff --git a/packages/postcss-config/rollup.config.js b/packages/postcss-config/rollup.config.js
@@ -2,7 +2,7 @@ export default [
   {
     input: './src/index.js',
     output: {
-      file: './lib/index.js',
+      file: './dist/index.js',
       format: 'cjs',
     },
   },

diff --git a/packages/prettier-config/package.json b/packages/prettier-config/package.json
@@ -12,15 +12,15 @@
     "url": "https://github.com/fisker/shared-configs/issues"
   },
   "version": "1.0.22",
-  "main": "lib/index.js",
+  "main": "dist/index.js",
   "files": [
-    "lib"
+    "dist"
   ],
   "scripts": {
     "build": "run-s build:js build:docs",
     "build:docs": "node -r esm ./scripts/generate-options.js",
     "build:js": "rollup --config",
-    "clean": "rimraf lib",
+    "clean": "del-cli dist",
     "dev": "rollup --config --watch",
     "test": "run-p test:*",
     "test:js": "ava"

diff --git a/packages/prettier-config/rollup.config.js b/packages/prettier-config/rollup.config.js
@@ -2,7 +2,7 @@ export default [
   {
     input: './src/index.js',
     output: {
-      file: './lib/index.js',
+      file: './dist/index.js',
       format: 'cjs',
     },
   },