Skip to content

Commit 0927bb3

Browse files
scriptypescriptype
committed
Ditch contentModel/models bc everything is a model now
1 parent 87e21e1 commit 0927bb3

File tree

11 files changed

+30
-30
lines changed

11 files changed

+30
-30
lines changed

src/compiler/contentModel/models/asset.js renamed to src/compiler/contentModel/asset.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const { join } = require('path')
2-
const { makePermalink } = require('../../../lib/contentModelHelpers')
3-
const ContentModelResourceNode = require('../../../lib/ContentModelResourceNode')
2+
const { makePermalink } = require('../../lib/contentModelHelpers')
3+
const ContentModelResourceNode = require('../../lib/ContentModelResourceNode')
44

55
const defaultSettings = {
66
assetsDirectory: 'assets'

src/compiler/contentModel/models/assetsDirectory.js renamed to src/compiler/contentModel/assetsDirectory.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
const ContentModelEntryNode = require('../../../lib/ContentModelEntryNode')
2-
const matcha = require('../../../lib/matcha')
1+
const ContentModelEntryNode = require('../../lib/ContentModelEntryNode')
2+
const matcha = require('../../lib/matcha')
33

44
const models = {
55
Asset: require('./asset')

src/compiler/contentModel/models/attachment.js renamed to src/compiler/contentModel/attachment.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const ContentModelResourceNode = require('../../../lib/ContentModelResourceNode')
1+
const ContentModelResourceNode = require('../../lib/ContentModelResourceNode')
22

33
class Attachment extends ContentModelResourceNode {
44
static serialize(attachment) {

src/compiler/contentModel/models/collection/category.js renamed to src/compiler/contentModel/collection/category.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
const makeSlug = require('slug')
22
const _ = require('lodash')
3-
const ContentModelEntryNode = require('../../../../lib/ContentModelEntryNode')
4-
const { makePermalink, isTemplateFile, sort } = require('../../../../lib/contentModelHelpers')
5-
const matcha = require('../../../../lib/matcha')
3+
const ContentModelEntryNode = require('../../../lib/ContentModelEntryNode')
4+
const { makePermalink, isTemplateFile, sort } = require('../../../lib/contentModelHelpers')
5+
const matcha = require('../../../lib/matcha')
66

77
const models = {
88
Post: require('./post'),

src/compiler/contentModel/models/collection/facet.js renamed to src/compiler/contentModel/collection/facet.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const { join } = require('path')
22
const makeSlug = require('slug')
3-
const { makePermalink, makeDateSlug } = require('../../../../lib/contentModelHelpers')
3+
const { makePermalink, makeDateSlug } = require('../../../lib/contentModelHelpers')
44

55
function serializeLinkedFacet(facetValue) {
66
return facetValue.slug ?

src/compiler/contentModel/models/collection/index.js renamed to src/compiler/contentModel/collection/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
const { join, resolve } = require('path')
22
const makeSlug = require('slug')
33
const _ = require('lodash')
4-
const ContentModelEntryNode = require('../../../../lib/ContentModelEntryNode')
4+
const ContentModelEntryNode = require('../../../lib/ContentModelEntryNode')
55
const {
66
removeExtension,
77
isTemplateFile,
88
makePermalink,
99
safeStringify,
1010
sort
11-
} = require('../../../../lib/contentModelHelpers')
11+
} = require('../../../lib/contentModelHelpers')
1212

13-
const matcha = require('../../../../lib/matcha')
13+
const matcha = require('../../../lib/matcha')
1414

1515
const models = {
1616
Attachment: require('../attachment'),

src/compiler/contentModel/models/collection/post.js renamed to src/compiler/contentModel/collection/post.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const { join } = require('path')
2-
const ContentModelEntryNode = require('../../../../lib/ContentModelEntryNode')
3-
const { templateExtensions } = require('../../../../lib/contentModelHelpers')
4-
const matcha = require('../../../../lib/matcha')
2+
const ContentModelEntryNode = require('../../../lib/ContentModelEntryNode')
3+
const { templateExtensions } = require('../../../lib/contentModelHelpers')
4+
const matcha = require('../../../lib/matcha')
55

66
const models = {
77
facet: require('./facet'),

src/compiler/contentModel/models/homepage.js renamed to src/compiler/contentModel/homepage.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const { join } = require('path')
2-
const ContentModelEntryNode = require('../../../lib/ContentModelEntryNode')
3-
const { templateExtensions } = require('../../../lib/contentModelHelpers')
4-
const matcha = require('../../../lib/matcha')
2+
const ContentModelEntryNode = require('../../lib/ContentModelEntryNode')
3+
const { templateExtensions } = require('../../lib/contentModelHelpers')
4+
const matcha = require('../../lib/matcha')
55

66
const models = {
77
Attachment: require('./attachment')

‎src/compiler/contentModel/index.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ const ContentModelEntryNode = require('../../lib/ContentModelEntryNode')
55
const matcha = require('../../lib/matcha')
66

77
const models = {
8-
Homepage: require('./models/homepage'),
9-
PagesDirectory: require('./models/pagesDirectory'),
10-
Subpage: require('./models/subpage'),
11-
Collection: require('./models/collection'),
12-
AssetsDirectory: require('./models/assetsDirectory'),
13-
Asset: require('./models/asset')
8+
Homepage: require('./homepage'),
9+
PagesDirectory: require('./pagesDirectory'),
10+
Subpage: require('./subpage'),
11+
Collection: require('./collection'),
12+
AssetsDirectory: require('./assetsDirectory'),
13+
Asset: require('./asset')
1414
}
1515

1616
const LINKED_FIELD_SYNTAX = /^\+[^ ]+$/
@@ -372,4 +372,4 @@ class ContentModel extends ContentModelEntryNode {
372372
}
373373
}
374374

375-
module.exports = ContentModel
375+
module.exports = ContentModel

src/compiler/contentModel/models/pagesDirectory.js renamed to src/compiler/contentModel/pagesDirectory.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
const ContentModelEntryNode = require('../../../lib/ContentModelEntryNode')
2-
const matcha = require('../../../lib/matcha')
1+
const ContentModelEntryNode = require('../../lib/ContentModelEntryNode')
2+
const matcha = require('../../lib/matcha')
33

44
const models = {
55
Subpage: require('./subpage'),

0 commit comments

Comments
 (0)