Skip to content
This repository has been archived by the owner on Apr 6, 2023. It is now read-only.

Commit

Permalink
chore: upgrade untyped
Browse files Browse the repository at this point in the history
  • Loading branch information
antfu committed Aug 26, 2022
1 parent 2aa43d8 commit 088e529
Show file tree
Hide file tree
Showing 23 changed files with 45 additions and 99 deletions.
2 changes: 1 addition & 1 deletion docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"pathe": "^0.3.5",
"rimraf": "^3.0.2",
"scule": "^0.3.2",
"untyped": "^0.4.6",
"untyped": "^0.4.7",
"vue-mq": "^1.0.1",
"vue-plausible": "^1.3.2"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/kit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"semver": "^7.3.7",
"unctx": "^2.0.1",
"unimport": "^0.6.7",
"untyped": "^0.4.6"
"untyped": "^0.4.7"
},
"devDependencies": {
"@types/lodash.template": "^4",
Expand Down
2 changes: 1 addition & 1 deletion packages/nuxt/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"unenv": "^0.6.1",
"unimport": "^0.6.7",
"unplugin": "^0.9.2",
"untyped": "^0.4.6",
"untyped": "^0.4.7",
"vue": "^3.2.37",
"vue-bundle-renderer": "^0.4.2",
"vue-devtools-stub": "^0.1.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/schema/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@types/lodash.template": "^4",
"@types/semver": "^7",
"unbuild": "latest",
"untyped": "^0.4.6",
"untyped": "^0.4.7",
"vite": "~3.0.9"
},
"dependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/schema/src/config/_adhoc.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { defineSchemaObject } from '../utils'
import { defineUntypedSchema } from 'untyped'

export default defineSchemaObject({
export default defineUntypedSchema({
/**
* Configure Nuxt component auto-registration.
*
Expand Down
5 changes: 2 additions & 3 deletions packages/schema/src/config/_app.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import { resolve, join } from 'pathe'
import { existsSync, readdirSync } from 'node:fs'
import defu from 'defu'
import { defineUntypedSchema } from 'untyped'

import { MetaObject } from '../types/meta'

import { defineSchemaObject } from '../utils'

export default defineSchemaObject({
export default defineUntypedSchema({
/**
* Vue.js config
* @version 2
Expand Down
4 changes: 2 additions & 2 deletions packages/schema/src/config/_common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import defu from 'defu'

import { RuntimeConfig } from '../types/config'

import { defineSchemaObject } from '../utils'
import { defineUntypedSchema } from 'untyped'

export default defineSchemaObject({
export default defineUntypedSchema({
/**
* Extend nested configurations from multiple local or remote sources.
*
Expand Down
4 changes: 2 additions & 2 deletions packages/schema/src/config/_internal.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { defineSchemaObject } from '../utils'
import { defineUntypedSchema } from 'untyped'

export default defineSchemaObject({
export default defineUntypedSchema({
/** @private */
_majorVersion: 2,
/** @private */
Expand Down
4 changes: 2 additions & 2 deletions packages/schema/src/config/build.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import defu from 'defu'
import { join } from 'pathe'
import { isCI, isTest } from 'std-env'
import { normalizeURL, withTrailingSlash } from 'ufo'
import { defineSchemaObject } from '../utils'
import { defineUntypedSchema } from 'untyped'

export default defineSchemaObject({
export default defineUntypedSchema({
/**
* The builder to use for bundling the Vue part of your application.
*
Expand Down
4 changes: 2 additions & 2 deletions packages/schema/src/config/cli.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { defineSchemaObject } from '../utils'
import { defineUntypedSchema } from 'untyped'

export default defineSchemaObject({
export default defineUntypedSchema({
/**
* Add a message to the CLI banner by adding a string to this array.
* @type {string[]}
Expand Down
4 changes: 2 additions & 2 deletions packages/schema/src/config/experimental.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { defineSchemaObject } from '../utils'
import { defineUntypedSchema } from 'untyped'

export default defineSchemaObject({
export default defineUntypedSchema({
/** @version 3 */
experimental: {
/**
Expand Down
4 changes: 2 additions & 2 deletions packages/schema/src/config/generate.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { resolve } from 'pathe'
import { joinURL } from 'ufo'
import { SchemaObject } from '../utils'
import { SchemaDefinition } from 'untyped'

/**
* @version 2
*/
export default <SchemaObject> {
export default <SchemaDefinition> {
/**
* Directory name that holds all the assets and generated pages for a `static` build.
*/
Expand Down
4 changes: 2 additions & 2 deletions packages/schema/src/config/messages.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { SchemaObject } from '../utils'
import { SchemaDefinition } from 'untyped'

/**
* @version 2
*/
export default <SchemaObject> {
export default <SchemaDefinition> {
/** The text that displays on the Nuxt loading indicator when `ssr: false`. */
loading: 'Loading...',
/** The 404 text on the default Nuxt error page. */
Expand Down
4 changes: 2 additions & 2 deletions packages/schema/src/config/nitro.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { defineSchemaObject } from '../utils'
import { defineUntypedSchema } from 'untyped'

export default defineSchemaObject({
export default defineUntypedSchema({
/**
* Configuration for Nitro.
*
Expand Down
4 changes: 2 additions & 2 deletions packages/schema/src/config/postcss.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import defu from 'defu'
import createResolver from 'postcss-import-resolver'
import { defineSchemaObject } from '../utils'
import { defineUntypedSchema } from 'untyped'

export default defineSchemaObject({
export default defineUntypedSchema({
/** @version 3 */
postcss: {
/** Path to postcss config file. */
Expand Down
4 changes: 2 additions & 2 deletions packages/schema/src/config/render.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { SchemaObject } from '../utils'
import { SchemaDefinition } from 'untyped'

/**
* @version 2
*/
export default <SchemaObject> {
export default <SchemaDefinition>{
/**
* Use this option to customize the Vue SSR bundle renderer.
* This option is skipped if `ssr: false`.
Expand Down
4 changes: 2 additions & 2 deletions packages/schema/src/config/router.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { normalizeURL, withTrailingSlash } from 'ufo'
import { defineSchemaObject } from '../utils'
import { defineUntypedSchema } from 'untyped'

export default defineSchemaObject({
export default defineUntypedSchema({
/**
* Additional options passed to `vue-router`.
*
Expand Down
4 changes: 2 additions & 2 deletions packages/schema/src/config/server.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { SchemaObject } from '../utils'
import { SchemaDefinition } from 'untyped'

/** @version 2 */
export default <SchemaObject> {
export default <SchemaDefinition>{
/**
* Whether to enable HTTPS.
*
Expand Down
4 changes: 2 additions & 2 deletions packages/schema/src/config/typescript.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { defineSchemaObject } from '../utils'
import { defineUntypedSchema } from 'untyped'

export default defineSchemaObject({
export default defineUntypedSchema({
/**
* Configuration for Nuxt's TypeScript integration.
*
Expand Down
4 changes: 2 additions & 2 deletions packages/schema/src/config/vite.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { resolve } from 'pathe'
import { withoutLeadingSlash } from 'ufo'
import { defineSchemaObject } from '../utils'
import { defineUntypedSchema } from 'untyped'

export default defineSchemaObject({
export default defineUntypedSchema({
/**
* Configuration that will be passed directly to Vite.
*
Expand Down
4 changes: 2 additions & 2 deletions packages/schema/src/config/webpack.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { join } from 'pathe'
import { defineSchemaObject } from '../utils'
import { defineUntypedSchema } from 'untyped'

export default defineSchemaObject({
export default defineUntypedSchema({
/** @version 3 */
webpack: {
/**
Expand Down
53 changes: 0 additions & 53 deletions packages/schema/src/utils.ts

This file was deleted.

14 changes: 7 additions & 7 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1661,7 +1661,7 @@ __metadata:
unbuild: latest
unctx: ^2.0.1
unimport: ^0.6.7
untyped: ^0.4.6
untyped: ^0.4.7
languageName: unknown
linkType: soft

Expand All @@ -1688,7 +1688,7 @@ __metadata:
ufo: ^0.8.5
unbuild: latest
unimport: ^0.6.7
untyped: ^0.4.6
untyped: ^0.4.7
vite: ~3.0.9
languageName: unknown
linkType: soft
Expand Down Expand Up @@ -9995,7 +9995,7 @@ __metadata:
unenv: ^0.6.1
unimport: ^0.6.7
unplugin: ^0.9.2
untyped: ^0.4.6
untyped: ^0.4.7
vue: ^3.2.37
vue-bundle-renderer: ^0.4.2
vue-devtools-stub: ^0.1.0
Expand Down Expand Up @@ -13209,15 +13209,15 @@ __metadata:
languageName: node
linkType: hard

"untyped@npm:^0.4.6":
version: 0.4.6
resolution: "untyped@npm:0.4.6"
"untyped@npm:^0.4.7":
version: 0.4.7
resolution: "untyped@npm:0.4.7"
dependencies:
"@babel/core": ^7.18.13
"@babel/standalone": ^7.18.13
"@babel/types": ^7.18.13
scule: ^0.3.2
checksum: 3caf8c6c523dfc7f31282ebaaa70a42c24d8b1682f85953a891a89ef3e3dd75ba470a6a0904b8ec454c374e99f2f9c088e3e9aecc9964539ceb4dfc0366656db
checksum: d5b189b19e114c4d60e122da9234c68a93d71b312a64bd8303e3aaa96f7a677befa8519ce003dec8cb587ed3e5503046131532196257ed10e647bc741532b1bc
languageName: node
linkType: hard

Expand Down

0 comments on commit 088e529

Please sign in to comment.