chore: update repo (#34)

pi0 · web-flow · commit 79d0ff34427a · 2020-06-01T16:16:39.000+02:00
diff --git a/.babelrc b/.babelrc
@@ -0,0 +1,5 @@
+{
+  "presets": [
+    ["@babel/env", { "targets": { "node": 10 }}]
+  ]
+}
diff --git a/.commitlintrc.js b/.commitlintrc.js
diff --git a/.eslintignore b/.eslintignore
@@ -3,4 +3,4 @@ dist
 .nuxt
 coverage
 templates
-src/installComponents.js
+lib/installComponents.js
diff --git a/.huskyrc.js b/.huskyrc.js
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) [Nuxt.js Team](https://github.com/orgs/nuxt/people)
+Copyright (c) Nuxt.js Team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
@@ -317,9 +317,7 @@ Next: publish your `awesome-ui` module to [npm](https://www.npmjs.com) and share
 
 ## License
 
-[MIT License](./LICENSE)
-
-Copyright (c) Nuxt.js Team
+[MIT](./LICENSE)
 
 <!-- Badges -->
 
diff --git a/babel.config.js b/babel.config.js
diff --git a/jest.config.js b/jest.config.js
@@ -1,27 +1,13 @@
 module.exports = {
   testEnvironment: 'node',
-  transform: {
-    '^.+\\.ts$': 'ts-jest',
-    '^.+\\.js$': 'babel-jest'
-  },
+  preset: 'ts-jest',
+  collectCoverage: true,
   globals: {
     'ts-jest': {
       tsConfig: 'tsconfig.test.json',
       diagnostics: {
         ignoreCodes: [2345]
       }
     }
-  },
-  collectCoverage: true,
-  collectCoverageFrom: [
-    'src/**/*.ts'
-  ]
-  // coverageThreshold: {
-  //   global: {
-  //     branches: 100,
-  //     functions: 100,
-  //     lines: 100,
-  //     statements: 100
-  //   }
-  // }
+  }
 }
diff --git a/lib/installComponents.js b/lib/installComponents.js
diff --git a/package.json b/package.json
@@ -4,55 +4,52 @@
   "description": "Auto Import Components for Nuxt.js",
   "repository": "nuxt/components",
   "license": "MIT",
-  "contributors": [
-    {
-      "name": "Kevin Marrec (@kevinmarrec)"
-    },
-    {
-      "name": "Ricardo Gobbo de Souza",
-      "email": "ricardogobbosouza@yahoo.com.br"
-    },
-    {
-      "name": "Pooya Parsa",
-      "email": "pooya@nuxtjs.com"
-    }
-  ],
   "main": "dist/index.js",
-  "typings": "dist/index.d.ts",
+  "types": "dist/index.d.ts",
   "files": [
     "dist",
+    "lib",
     "templates"
   ],
   "scripts": {
-    "build": "yarn clean && tsc",
+    "build": "yarn clean && bili src/index.ts",
     "clean": "rimraf dist",
-    "dev": "tsc && nuxt-ts test/fixture",
+    "dev": "nuxt-ts test/fixture",
     "lint": "eslint --ext .ts,.js,.vue .",
     "release": "yarn test && yarn build && standard-version && git push --follow-tags && npm publish",
     "test": "yarn lint && jest --verbose"
   },
+  "dependencies": {
+    "chalk": "^4.0.0",
+    "chokidar": "^3.4.0",
+    "glob": "^7.1.6",
+    "lodash": "^4.17.15",
+    "semver": "^7.3.2"
+  },
   "devDependencies": {
-    "@commitlint/cli": "latest",
-    "@commitlint/config-conventional": "latest",
+    "@babel/preset-env": "^7.10.2",
     "@nuxt/typescript-build": "latest",
     "@nuxt/typescript-runtime": "latest",
     "@nuxtjs/eslint-config-typescript": "latest",
-    "@types/glob": "latest",
+    "@types/glob": "^7.1.1",
     "@types/jest": "latest",
     "@types/loader-utils": "latest",
     "@types/lodash": "latest",
     "@types/semver": "latest",
-    "codecov": "latest",
+    "bili": "latest",
     "eslint": "latest",
-    "husky": "latest",
     "jest": "latest",
     "nuxt-edge": "latest",
-    "pug": "^3.0.0",
-    "pug-plain-loader": "^1.0.0",
+    "pug": "latest",
+    "pug-plain-loader": "latest",
     "rimraf": "latest",
+    "rollup-plugin-typescript2": "latest",
     "standard-version": "latest",
     "ts-jest": "latest",
-    "typescript": "~3.8"
+    "typescript": "latest"
+  },
+  "peerDependencies": {
+    "webpack": "*"
   },
   "publishConfig": {
     "access": "public"
diff --git a/renovate.json b/renovate.json
@@ -7,8 +7,5 @@
   },
   "labels": [
     "dependencies"
-  ],
-  "ignoreDeps": [
-    "typescript"
   ]
 }
diff --git a/src/index.ts b/src/index.ts
@@ -36,7 +36,7 @@ export interface Options {
 const isPureObjectOrString = (val: any) => (!Array.isArray(val) && typeof val === 'object') || typeof val === 'string'
 const getDir = (p: string) => fs.statSync(p).isDirectory() ? p : path.dirname(p)
 
-export default <Module> function () {
+const componentsModule = <Module> function () {
   requireNuxtVersion.call(this, '2.10')
 
   const { components } = this.options
@@ -137,7 +137,12 @@ export default <Module> function () {
   // Add Webpack entry for runtime installComponents function
   this.nuxt.hook('webpack:config', (configs: WebpackConfig[]) => {
     for (const config of configs.filter(c => ['client', 'modern', 'server'].includes(c.name!))) {
-      ((config.entry as WebpackEntry).app as string[]).unshift(path.resolve(__dirname, 'installComponents.js'))
+      ((config.entry as WebpackEntry).app as string[]).unshift(path.resolve(__dirname, '../lib/installComponents.js'))
     }
   })
 }
+
+// @ts-ignore
+componentsModule.meta = { name: '@nuxt/components' }
+
+export default componentsModule
diff --git a/src/loader.ts b/src/loader.ts
@@ -3,11 +3,6 @@ import loaderUtils from 'loader-utils'
 import { extractTags } from './tagExtractor'
 import { Component, matcher } from './scan'
 
-interface LoaderOptions {
-  dependencies: string[]
-  getComponents(): Component[]
-}
-
 function install (this: WebpackLoader.LoaderContext, content: string, components: Component[]) {
   const imports = '{' + components.map(c => `${c.pascalName}: ${c.import}`).join(',') + '}'
 
@@ -32,7 +27,11 @@ export default async function loader (this: WebpackLoader.LoaderContext, content
   if (!this.resourceQuery) {
     this.addDependency(this.resourcePath)
 
-    const { dependencies, getComponents } = loaderUtils.getOptions(this) as LoaderOptions
+    const { dependencies, getComponents } = {
+      dependencies: [],
+      getComponents: () => [],
+      ...loaderUtils.getOptions(this)
+    }
 
     for (const dependency of dependencies) {
       this.addDependency(dependency)
diff --git a/test/fixture/nuxt.config.ts b/test/fixture/nuxt.config.ts
@@ -1,13 +1,12 @@
 import path from 'path'
 import { Configuration } from '@nuxt/types'
-import componentsModule from '../../src'
+import nuxtComponents from '../../src'
 
 const config: Configuration = {
-  rootDir: path.resolve(__dirname, '../..'),
-  buildDIr: path.resolve(__dirname, '.nuxt'),
-  srcDir: __dirname,
-
-  buildModules: ['@nuxt/typescript-build', componentsModule],
+  buildModules: [
+    '@nuxt/typescript-build',
+    nuxtComponents
+  ],
 
   components: {
     dirs: [
diff --git a/test/module.ts b/test/module.ts
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,20 +1,18 @@
 {
   "compilerOptions": {
-    "target": "esnext",
-    "lib": ["dom", "esnext"],
+    "target": "ESNext",
+    "module": "ESNext",
+    "moduleResolution": "Node",
     "outDir": "dist",
     "declaration": true,
-    "sourceMap": true,
-    "module": "CommonJS",
-    "moduleResolution": "node",
-    "allowJs": true,
-    "skipLibCheck": true,
     "esModuleInterop": true,
     "strict": true,
     "noFallthroughCasesInSwitch": true,
     "noImplicitReturns": true,
     "stripInternal": true,
     "noUnusedLocals": true
   },
-  "include": ["src"]
+  "include": [
+    "src"
+  ]
 }
diff --git a/tsconfig.test.json b/tsconfig.test.json
@@ -1,17 +1,11 @@
 {
+  "extends": "./tsconfig.json",
   "compilerOptions": {
-    "target": "esnext",
-    "lib": ["dom", "esnext"],
-    "module": "esnext",
-    "moduleResolution": "node",
-    "skipLibCheck": true,
-    "esModuleInterop": true,
-    "strict": true,
-    "noImplicitAny": false,
-    "noFallthroughCasesInSwitch": true,
-    "noImplicitReturns": true,
-    "stripInternal": true,
-    "noUnusedLocals": true
+    "strict": false,
+    "target": "ES2019",
+    "module": "CommonJS"
   },
-  "include": ["test"]
+  "include": [
+    "test"
+  ]
 }
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,5 @@`
`7`	`7`	`},`
`8`	`8`	`"labels": [`
`9`	`9`	`"dependencies"`
`10`		`- ],`
`11`		`- "ignoreDeps": [`
`12`		`- "typescript"`
`13`	`10`	`]`
`14`	`11`	`}`