Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@
packages/boilerplate/composables/nuxt/plugin.js
packages/commercetools/composables/nuxt/plugin.js
packages/core/cache/nuxt/plugin.js
packages/core/nuxt-module/plugins/i18n-cookies.js
packages/core/nuxt-module/plugins/logger.js
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@
"build:bp:composables": "cd packages/boilerplate/composables && yarn build",
"build:bp:theme": "cd packages/boilerplate/theme && yarn build",
"build:bp:tools": "yarn build:core && yarn build:bp:api-client && yarn build:bp:composables",
"build:core": "yarn build:core:core && yarn build:core:cache && yarn build:core:middleware",
"build:core": "yarn build:core:core && yarn build:core:cache && yarn build:core:middleware && yarn build:core:nuxt-module",
"build:core:core": "cd packages/core/core && yarn build",
"build:core:cache": "cd packages/core/cache && yarn build",
"build:core:middleware": "cd packages/core/middleware && yarn build",
"build:core:nuxt-module": "cd packages/core/nuxt-module && yarn build",
"build:ct": "yarn build:ct:tools && yarn build:ct:theme",
"build:ct:api-client": "cd packages/commercetools/api-client && yarn build",
"build:ct:composables": "cd packages/commercetools/composables && yarn build",
Expand Down
2 changes: 1 addition & 1 deletion packages/core/docs/architecture/application-context.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Application context

An application context is an object available in the Nuxt.js application.
An application context is an object available in the Nuxt.js application.
Plugins and modules registered in the `nuxt.config.js` file populate this object and add integration-specific data under a unique key. The Nuxt.js application later uses this information to send requests to the Server Middleware.

## Structure of the context
Expand Down
8 changes: 8 additions & 0 deletions packages/core/docs/changelog/6641.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
module.exports = {
description: 'Added the ability to select plugins used by @vue-storefront/nuxt',
link: 'https://github.com/vuestorefront/vue-storefront/pull/6641',
isBreaking: false,
breakingChanges: [],
author: 'Mateusz Pietrusiński',
linkToGitHubAccount: 'https://github.com/Mateuszpietrusinski'
};
3 changes: 2 additions & 1 deletion packages/core/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@
"core-cache-ref": "cd ../cache && api-extractor run --local",
"core-core-ref": "cd ../core && api-extractor run --local",
"core-middleware-ref": "cd ../middleware && api-extractor run --local",
"core-nuxt-module-ref": "cd ../nuxt-module && api-extractor run --local",
"core-ref-md": "api-documenter markdown --i reference/api --o reference/api",
"build:core": "yarn core-cache-ref && yarn core-core-ref && yarn core-middleware-ref && yarn core-ref-md"
"build:core": "yarn core-cache-ref && yarn core-core-ref && yarn core-middleware-ref && yarn core-nuxt-module-ref && yarn core-ref-md"
},
"devDependencies": {
"@microsoft/api-documenter": "^7.13.7",
Expand Down
2 changes: 1 addition & 1 deletion packages/core/nuxt-module/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
node_modules
!lib
lib
10 changes: 10 additions & 0 deletions packages/core/nuxt-module/api-extractor.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"extends": "../../api-extractor.base.json",
"mainEntryPointFilePath": "./lib/src/api-extractor-data.d.ts",
"dtsRollup": {
"untrimmedFilePath": "./lib/<unscopedPackageName>.d.ts"
},
"docModel": {
"apiJsonFilePath": "<projectFolder>/core/docs/reference/api/<unscopedPackageName>.api.json"
}
}
1 change: 0 additions & 1 deletion packages/core/nuxt-module/lib/helpers/isProduction.js

This file was deleted.

9 changes: 0 additions & 9 deletions packages/core/nuxt-module/lib/helpers/log.js

This file was deleted.

7 changes: 0 additions & 7 deletions packages/core/nuxt-module/lib/helpers/merge.js

This file was deleted.

7 changes: 0 additions & 7 deletions packages/core/nuxt-module/lib/helpers/resolveDependency.js

This file was deleted.

93 changes: 0 additions & 93 deletions packages/core/nuxt-module/lib/module.js

This file was deleted.

21 changes: 0 additions & 21 deletions packages/core/nuxt-module/lib/modules/raw-sources-loader.js

This file was deleted.

18 changes: 13 additions & 5 deletions packages/core/nuxt-module/package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
{
"name": "@vue-storefront/nuxt",
"version": "2.5.5",
"description": "",
"main": "lib/module.js",
"main": "lib/index.cjs.js",
"module": "lib/index.es.js",
"types": "lib/src/index.d.ts",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
"build": "rimraf lib && rollup -c",
"test": "echo \"Error: no test specified\" && exit 1",
"prepublish": "yarn build"
},
"author": "Vue Storefront",
"license": "MIT",
Expand All @@ -19,9 +22,14 @@
"nuxt-purgecss": "^1.0.0"
},
"devDependencies": {
"@nuxt/types": "^2.15.8"
"@nuxt/types": "^2.15.8",
"@rollup/plugin-json": "~4.1.0"
},
"publishConfig": {
"access": "public"
}
},
"files": [
"lib/**/*",
"plugins/**/*"
]
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

import { configureContext } from '@vue-storefront/core';
import { useContext as useBaseContext } from '@nuxtjs/composition-api';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ const e2eTestingPlugin = (ctx) => {
bind: (element, binding) => {
const enabled = ctx.isDev || ctx.env.NUXT_ENV_E2E === true.toString();

return enabled && element.setAttribute(`data-e2e`, binding.value);
return enabled && element.setAttribute('data-e2e', binding.value);
}
});
};

export default e2eTestingPlugin;
export default e2eTestingPlugin;
36 changes: 36 additions & 0 deletions packages/core/nuxt-module/rollup.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
import pkg from './package.json';
import typescript from 'rollup-plugin-typescript2';
import { terser } from 'rollup-plugin-terser';
import json from '@rollup/plugin-json';

export function generateBaseConfig(pkg) {
return {
input: 'src/index.ts',
output: [
{
file: pkg.main,
format: 'cjs',
sourcemap: true
},
{
file: pkg.module,
format: 'es',
sourcemap: true
}
],
external: [
...Object.keys(pkg.dependencies || {})
],
plugins: [
typescript({
// eslint-disable-next-line global-require
typescript: require('typescript'),
objectHashIgnoreUnknownHack: true
}),
terser(),
json()
]
};
}

export default generateBaseConfig(pkg);
11 changes: 11 additions & 0 deletions packages/core/nuxt-module/src/api-extractor-data.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/**
* Core Vue Storefront 2 nuxt module.
*
* @remarks
* The `@vue-storefront/nuxt` library is responsible for loading core nuxt plugins.
*
* @packageDocumentation
*/

export { default as VueStorefrontNuxtModule } from './index';
export { ModuleOptions } from './types';
3 changes: 3 additions & 0 deletions packages/core/nuxt-module/src/helpers/isProduction.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import { ModuleOptions } from '../types';

export default (options: ModuleOptions): boolean => process.env.NODE_ENV === 'production' || options.coreDevelopment;
12 changes: 12 additions & 0 deletions packages/core/nuxt-module/src/helpers/log.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import consola from 'consola';
import chalk from 'chalk';
import { Log } from '../types';

const log: Log = Object.freeze({
info: (message) => consola.info(chalk.bold('VSF'), message),
success: (message) => consola.success(chalk.bold('VSF'), message),
warning: (message) => consola.warn(chalk.bold('VSF'), message),
error: (message) => consola.error(chalk.bold('VSF'), message)
});

export default log;
7 changes: 7 additions & 0 deletions packages/core/nuxt-module/src/helpers/merge.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { mergeWith, isArray } from 'lodash';

export default (source, destination) => mergeWith(source, destination, (objValue, srcValue) => {
if (isArray(objValue)) {
return objValue.concat(srcValue);
}
});
7 changes: 7 additions & 0 deletions packages/core/nuxt-module/src/helpers/resolveDependency.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
export default function resolveDependency(name: string): string {
try {
return require.resolve(name, { paths: [process.cwd()] });
} catch (error) {
return '';
}
}
Loading