Skip to content

Commit

Permalink
feat: make it compatible with nuxt-typo3 1.0.0 (#33)
Browse files Browse the repository at this point in the history
  • Loading branch information
mercs600 committed Nov 18, 2021
1 parent 50a85ba commit 96871e3
Show file tree
Hide file tree
Showing 192 changed files with 668 additions and 1,706 deletions.
3 changes: 3 additions & 0 deletions example/nuxt.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,10 @@ export default {
*/
typo3: {
baseURL: process.env.NUXT_HOST,
registerForms: true,
api: {
baseURL: 'https://api.t3pwa.com'
// baseURL: 'https://api.pwa-demo.ddev.site'
},
i18n: {
locales: ['en', 'pl', 'de'],
Expand All @@ -65,6 +67,7 @@ export default {
** Build configuration
*/
build: {
transpile: ['nuxt-typo3'],
/*
** You can extend webpack config here
*/
Expand Down
4 changes: 2 additions & 2 deletions example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"dependencies": {
"@nuxtjs/pwa": "^3.0.0-0",
"nuxt": "^2.0.0",
"nuxt-typo3": "latest",
"nuxt-typo3-theme": "^0.0.3-alpha.1"
"nuxt-typo3": "^1.0.0-alpha.0",
"nuxt-typo3-theme": "^0.0.3-alpha.3"
},
"devDependencies": {
"@nuxt/typescript-build": "^0.6.0",
Expand Down
82 changes: 28 additions & 54 deletions example/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -929,21 +929,6 @@
"@babel/helper-validator-identifier" "^7.14.9"
to-fast-properties "^2.0.0"

"@braid/vue-formulate-i18n@^1.16.0":
version "1.16.0"
resolved "https://registry.yarnpkg.com/@braid/vue-formulate-i18n/-/vue-formulate-i18n-1.16.0.tgz#71c9121c909c7bbdfd4dfcf6a57d554f5bb1ec75"
integrity sha512-CuX1kN7bWg4ukynnTS3LGsmPKrUvS2Wh75zKatIe+nHQQy0gSvfmggQsCz4QZey7Ois+pGYmOIgrE1SvX+zQTw==

"@braid/vue-formulate@^2.4.2":
version "2.5.2"
resolved "https://registry.yarnpkg.com/@braid/vue-formulate/-/vue-formulate-2.5.2.tgz#32076d6a513760763a3a89dd69e8911c1bad1fcb"
integrity sha512-0LWKp3Rjq2a+WwA4y49VaXqQOVClJGy6mmdivxJJyRvNB0aUcTOKOINLumeU/XHf7/c0HNhtbZih2vs6hMDyvQ==
dependencies:
"@braid/vue-formulate-i18n" "^1.16.0"
is-plain-object "^3.0.1"
is-url "^1.2.4"
nanoid "^2.1.11"

"@csstools/convert-colors@^1.4.0":
version "1.4.0"
resolved "https://registry.yarnpkg.com/@csstools/convert-colors/-/convert-colors-1.4.0.tgz#ad495dc41b12e75d588c6db8b9834f08fa131eb7"
Expand Down Expand Up @@ -1462,7 +1447,7 @@
webpack-node-externals "^3.0.0"
webpackbar "^4.0.0"

"@nuxtjs/axios@^5.9.0":
"@nuxtjs/axios@^5.13.6":
version "5.13.6"
resolved "https://registry.yarnpkg.com/@nuxtjs/axios/-/axios-5.13.6.tgz#6f4bbd98a3a7799a5d2c0726c6ad2a98aa111881"
integrity sha512-XS+pOE0xsDODs1zAIbo95A0LKlilvJi8YW0NoXYuq3/jjxGgWDxizZ6Yx0AIIjZOoGsXJOPc0/BcnSEUQ2mFBA==
Expand Down Expand Up @@ -2262,12 +2247,12 @@
optionalDependencies:
prettier "^1.18.2"

"@vue/composition-api@^1.0.0-rc.5":
version "1.2.4"
resolved "https://registry.yarnpkg.com/@vue/composition-api/-/composition-api-1.2.4.tgz#4befcefc0e1c570fd0879a2d8b8f901f3a4e35d0"
integrity sha512-8LVV6O4slsroBhRKxly3em5H3D5Q+ggPG75lcilh5MfLGs69LEdwm6dKhSOXtQoSyMGF4Rq30E4DcouopM8Rxg==
"@vue/composition-api@1.3.3":
version "1.3.3"
resolved "https://registry.yarnpkg.com/@vue/composition-api/-/composition-api-1.3.3.tgz#a782f2d40e41d4cbb6b4550692c7e01d2182d457"
integrity sha512-mjhfLjpCBecARYVJX65F0TYerlJQWtEgKjom4Btuu0x7k701EcvL66zyWQryf64HuIj9YR4h6aNRhM0AP/E3eQ==
dependencies:
tslib "^2.3.0"
tslib "^2.3.1"

"@vue/eslint-config-standard@^6.0.0":
version "6.1.0"
Expand Down Expand Up @@ -7200,11 +7185,6 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4:
dependencies:
isobject "^3.0.1"

is-plain-object@^3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-3.0.1.tgz#662d92d24c0aa4302407b0d45d21f2251c85f85b"
integrity sha512-Xnpx182SBMrr/aBik8y+GuR4U1L9FqMSojwDQwPMmxyC6bvEqly9UBCxhauBF5vNh2gwWJNX6oDV7O+OM4z34g==

is-regex@^1.0.4, is-regex@^1.1.3, is-regex@^1.1.4:
version "1.1.4"
resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
Expand Down Expand Up @@ -7279,11 +7259,6 @@ is-typedarray@~1.0.0:
resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=

is-url@^1.2.4:
version "1.2.4"
resolved "https://registry.yarnpkg.com/is-url/-/is-url-1.2.4.tgz#04a4df46d28c4cff3d73d01ff06abeb318a1aa52"
integrity sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==

is-weakref@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.1.tgz#842dba4ec17fa9ac9850df2d6efbc1737274f2a2"
Expand Down Expand Up @@ -8336,11 +8311,6 @@ nan@^2.12.1:
resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee"
integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==

nanoid@^2.1.11:
version "2.1.11"
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-2.1.11.tgz#ec24b8a758d591561531b4176a01e3ab4f0f0280"
integrity sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA==

nanoid@^3.1.23:
version "3.1.30"
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.30.tgz#63f93cc548d2a113dc5dfbc63bfa09e2b9b64362"
Expand Down Expand Up @@ -8567,33 +8537,32 @@ number-is-nan@^1.0.0:
resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=

nuxt-typo3-ce@^0.0.2:
version "0.0.2"
resolved "https://registry.yarnpkg.com/nuxt-typo3-ce/-/nuxt-typo3-ce-0.0.2.tgz#326ad2232bfbaa699d1bea18d6c9517f4df695ef"
integrity sha512-+Q6dT7bVllKVbRccTKhKd1SNIhRKR6pke7s02JXad6VER/xlx8Srz6N5BWTse9CXcjcc93ZVDbrbkKBgg9u54A==
nuxt-typo3-ce@^0.0.3-alpha.3:
version "0.0.3-alpha.3"
resolved "https://registry.yarnpkg.com/nuxt-typo3-ce/-/nuxt-typo3-ce-0.0.3-alpha.3.tgz#f33fb48f2f2b8dd1e0f91eb21f6fb48c41aa9552"
integrity sha512-LNu90JmER6VFPHGcuUzj8FK+wdp/JTDjAovdSQzyLmgwU9icdFfBABByli/dgVOhsf04ccj6PKCuoqcJtGsbkg==
dependencies:
"@vue/composition-api" "^1.0.0-rc.5"
"@vue/composition-api" "1.3.3"

nuxt-typo3-theme@^0.0.3-alpha.1:
version "0.0.3-alpha.1"
resolved "https://registry.yarnpkg.com/nuxt-typo3-theme/-/nuxt-typo3-theme-0.0.3-alpha.1.tgz#8edbe4ef151489dcf6f27e7390c1b9602716908c"
integrity sha512-8ddpY/LoAm8+N/IuvUNr6NBjv7D0DD4ovE1AxJBaSBwk83TeoVinnKwmF6J+/NIY+rBqEdGOl8I0NU4/u55H8Q==
nuxt-typo3-theme@^0.0.3-alpha.3:
version "0.0.3-alpha.3"
resolved "https://registry.yarnpkg.com/nuxt-typo3-theme/-/nuxt-typo3-theme-0.0.3-alpha.3.tgz#d0083a81545eacd49bab11133598bdf43ffca3a2"
integrity sha512-khHk3GsYYuDZ79I1Asf/1fQfxoYWdNq2chqx8Rjtibfi6S1tFqJHCYCtU93Rncs1HFoGFmFj7Is0UWJ9jffaxg==
dependencies:
"@nuxtjs/google-fonts" "^1.3.0"
body-scroll-lock "^3.1.5"
nuxt-typo3-ce "^0.0.2"
nuxt-typo3-ce "^0.0.3-alpha.3"
sanitize.css "^12.0.1"
vue-mq "^1.0.1"
vue-svgicon "^3.2.9"

nuxt-typo3@latest:
version "0.9.4"
resolved "https://registry.yarnpkg.com/nuxt-typo3/-/nuxt-typo3-0.9.4.tgz#19f8407cce84abc0a8c1b26cecde10280b3240d7"
integrity sha512-illD3jylZ1aGteCFAru16JjSZiKiz65QgXxDaSjXGBCOtQRreGWdpy1wa2Huh/v3fRKjCVL9s2KKXOi9eccLbg==
nuxt-typo3@^1.0.0-alpha.0:
version "1.0.0-alpha.0"
resolved "https://registry.yarnpkg.com/nuxt-typo3/-/nuxt-typo3-1.0.0-alpha.0.tgz#6b8bff11e27fbaaa707da5540aa64c61913f272c"
integrity sha512-IUAVxEx9oX4zh4nOhPzphFIY59S0vzgnfyOHt82HAdiVy6X1fXrs9OA0l2560w6gK7j16rRfC9qULuLUWXAeeQ==
dependencies:
"@braid/vue-formulate" "^2.4.2"
"@nuxtjs/axios" "^5.9.0"
defu "^2.0.4"
"@nuxtjs/axios" "^5.13.6"
vee-validate "^3.4.13"

nuxt@^2.0.0:
version "2.15.8"
Expand Down Expand Up @@ -12131,7 +12100,7 @@ tslib@1.14.1, tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==

tslib@^2.0.3, tslib@^2.3.0:
tslib@^2.0.3, tslib@^2.3.1:
version "2.3.1"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
Expand Down Expand Up @@ -12576,6 +12545,11 @@ vary@^1.1.2, vary@~1.1.2:
resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=

vee-validate@^3.4.13:
version "3.4.14"
resolved "https://registry.yarnpkg.com/vee-validate/-/vee-validate-3.4.14.tgz#51f91c01d6660c43c6252c417c89fb07cdf8b8dd"
integrity sha512-Hqqic8G9WcRSIzCxiCPqMZv4qB8JE1lIQqIOLDm2K5BXUiL8d4a2+kqkanv8gQSGDzYpnCQZ7BO/T99Aj05T1Q==

vendors@^1.0.0:
version "1.0.4"
resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz#e2b800a53e7a29b93506c3cf41100d16c4c4ad8e"
Expand Down
66 changes: 28 additions & 38 deletions packages/nuxt-typo3-ce/index.ts
Original file line number Diff line number Diff line change
@@ -1,47 +1,37 @@
import VueCompositionAPI from '@vue/composition-api'
import Vue, { VueConstructor } from 'vue'
import CeFrame from './src/components/CeFrame'
import CeRenderer from './src/components/CeRenderer'
import CeDebug from './src/components/CeDebug'
import CeDynamic from './src/components/CeDynamic'
import CeDefault from './src/components/CeDefault'
import CeShortcut from './src/components/CeShortcut'
import CeHeader from './src/components/CeHeader'
import CeText from './src/components/CeText'
import CeHtmlParser from './src/components/CeHtmlParser'
import CeLink from './src/components/CeLink'
import CeTable from './src/components/CeTable'
import CeBullets from './src/components/CeBullets'
import CeDiv from './src/components/CeDiv'
import CeHtml from './src/components/CeHtml'
import CeImage from './src/components/CeImage'
import CeMenuPages from './src/components/CeMenuPages'
import { VueConstructor } from 'vue'
import T3CeDefault from './src/components/T3CeDefault'
import T3CeShortcut from './src/components/T3CeShortcut'
import T3CeHeader from './src/components/T3CeHeader'
import T3CeText from './src/components/T3CeText'
import T3CeHtmlParser from './src/components/T3CeHtmlParser'
import T3CeTable from './src/components/T3CeTable'
import T3CeBullets from './src/components/T3CeBullets'
import T3CeDiv from './src/components/T3CeDiv'
import T3CeHtml from './src/components/T3CeHtml'
import T3CeImage from './src/components/T3CeImage'
import T3CeMenuPages from './src/components/T3CeMenuPages'

const globalComponents: Record<
string,
Vue.VueConstructor | Vue.FunctionalComponentOptions
> = {
CeFrame,
CeRenderer,
CeDebug,
CeDynamic,
CeDefault,
CeShortcut,
CeHeader,
CeText,
CeHtmlParser,
CeLink,
CeBullets,
CeDiv,
CeHtml,
CeImage,
CeMenuPages,
CeTable,
CeMenuSubpages: CeMenuPages,
CeMenuRelatedPages: CeMenuPages,
CeMenuRecentlyUpdated: CeMenuPages,
CeMenuSectionPages: CeMenuPages,
CeMenuCategorizedPages: CeMenuPages
T3CeDefault,
T3CeShortcut,
T3CeHeader,
T3CeText,
T3CeHtmlParser,
T3CeBullets,
T3CeDiv,
T3CeHtml,
T3CeImage,
T3CeMenuPages,
T3CeTable,
CeMenuSubpages: T3CeMenuPages,
CeMenuRelatedPages: T3CeMenuPages,
CeMenuRecentlyUpdated: T3CeMenuPages,
CeMenuSectionPages: T3CeMenuPages,
CeMenuCategorizedPages: T3CeMenuPages
}

const UiPlugin = {
Expand Down
3 changes: 3 additions & 0 deletions packages/nuxt-typo3-ce/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ module.exports = {
'^.+\\.js$': 'babel-jest',
'^.+\\.vue$': 'vue-jest'
},
transformIgnorePatterns: [
'<rootDir>/node_modules/(?!nuxt-typo3)',
],
moduleNameMapper: {
'^@/(.*)$': '<rootDir>/$1',
'^~/(.*)$': '<rootDir>/$1',
Expand Down
2 changes: 1 addition & 1 deletion packages/nuxt-typo3-ce/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"eslint-config-macopedia": "^0.2.0-alpha.1",
"flush-promises": "^1.0.2",
"fork-ts-checker-webpack-plugin": "^5.2.0",
"nuxt-typo3": "^0.9.3",
"nuxt-typo3": "^1.0.0-alpha.0",
"prettier-standard": "^16.4.1",
"react-is": "^16.13.1",
"sass": "^1.26.5",
Expand Down
1 change: 0 additions & 1 deletion packages/nuxt-typo3-ce/src/components/CeBullets/index.ts

This file was deleted.

22 changes: 0 additions & 22 deletions packages/nuxt-typo3-ce/src/components/CeDebug/CeDebug.data.ts

This file was deleted.

16 changes: 0 additions & 16 deletions packages/nuxt-typo3-ce/src/components/CeDebug/CeDebug.spec.js

This file was deleted.

48 changes: 0 additions & 48 deletions packages/nuxt-typo3-ce/src/components/CeDebug/CeDebug.vue

This file was deleted.

1 change: 0 additions & 1 deletion packages/nuxt-typo3-ce/src/components/CeDebug/index.ts

This file was deleted.

1 change: 0 additions & 1 deletion packages/nuxt-typo3-ce/src/components/CeDefault/index.ts

This file was deleted.

1 change: 0 additions & 1 deletion packages/nuxt-typo3-ce/src/components/CeDiv/index.ts

This file was deleted.

Loading

0 comments on commit 96871e3

Please sign in to comment.