From 0db16a75eb530737b1f9fc71eca71dd889599dae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Tue, 3 Nov 2020 19:07:36 +0100 Subject: [PATCH] Update mod2 --- .gitignore | 2 +- assets/js/lib/index.js | 2 +- assets/js/main.js | 1 + assets/jsconfig.json | 11 ----------- go.mod | 3 ++- go.sum | 1 + package-lock.json | 13 +++++++++++++ package.hugo.json | 19 +++++++++++++++++++ package.json | 29 +++++++++++++++++++++++++++++ 9 files changed, 67 insertions(+), 14 deletions(-) delete mode 100644 assets/jsconfig.json create mode 100644 package-lock.json create mode 100644 package.hugo.json create mode 100644 package.json diff --git a/.gitignore b/.gitignore index 4d466c6..996340a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ public/ node_modules/ - assets/jsconfig.json \ No newline at end of file +assets/jsconfig.json \ No newline at end of file diff --git a/assets/js/lib/index.js b/assets/js/lib/index.js index 1c791ee..41b3cd8 100644 --- a/assets/js/lib/index.js +++ b/assets/js/lib/index.js @@ -1,3 +1,3 @@ export function hello4() { - return 'Hello from lib in the main project'; + return 'Hello from lib in the main project!!'; } diff --git a/assets/js/main.js b/assets/js/main.js index ac41e01..f65fb47 100644 --- a/assets/js/main.js +++ b/assets/js/main.js @@ -6,6 +6,7 @@ import * as data from 'core/util/data.json'; // But doing import from 'core/util' you will get the index.js file from mod1 // (higher up in the import list), so we need to be explicit: import { hello3 } from 'core/util/hello3'; + // From main import { hello4 } from './lib'; // From the Hugo template. diff --git a/assets/jsconfig.json b/assets/jsconfig.json deleted file mode 100644 index 385d600..0000000 --- a/assets/jsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "compilerOptions": { - "baseUrl": ".", - "paths": { - "*": [ - "../../../../hugo_cache/modules/filecache/modules/pkg/mod/github.com/gohugoio/hugo!test!modules!j!s/mod1@v0.2.0/assets/*", - "../../../../hugo_cache/modules/filecache/modules/pkg/mod/github.com/gohugoio/hugo!test!modules!j!s/mod2@v0.1.0/assets/*" - ] - } - } -} \ No newline at end of file diff --git a/go.mod b/go.mod index d947406..ee98c2b 100644 --- a/go.mod +++ b/go.mod @@ -6,6 +6,7 @@ require ( github.com/bep/hugo-jslibs/alpinejs v0.5.14 // indirect github.com/date-fns/date-fns v2.16.1+incompatible // indirect github.com/gohugoio/hugoTestModulesJS/mod1 v0.2.0 // indirect - github.com/gohugoio/hugoTestModulesJS/mod2 v0.1.0 // indirect + github.com/gohugoio/hugoTestModulesJS/mod2 v0.2.0 // indirect ) + diff --git a/go.sum b/go.sum index f65acee..024b9ba 100644 --- a/go.sum +++ b/go.sum @@ -17,3 +17,4 @@ github.com/gohugoio/hugoTestModulesJS/mod1 v0.2.0/go.mod h1:IfctxwCwBB4wVUA+bUb4 github.com/gohugoio/hugoTestModulesJS/mod2 v0.0.0-20201011192008-decf54abafdd h1:Uu3lXkigL0q13sVksE7NVnoPTyxx4ViYKrNA70QDKA4= github.com/gohugoio/hugoTestModulesJS/mod2 v0.0.0-20201011192008-decf54abafdd/go.mod h1:uynOkor8I03PIUuDZN4NYQ+Bmkye7vNLV5tRUBC2+10= github.com/gohugoio/hugoTestModulesJS/mod2 v0.1.0/go.mod h1:uynOkor8I03PIUuDZN4NYQ+Bmkye7vNLV5tRUBC2+10= +github.com/gohugoio/hugoTestModulesJS/mod2 v0.2.0/go.mod h1:uynOkor8I03PIUuDZN4NYQ+Bmkye7vNLV5tRUBC2+10= diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..de6b150 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,13 @@ +{ + "name": "hugotestprojectjsmodimports", + "version": "1.0.0", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "date-fns": { + "version": "2.16.1", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.16.1.tgz", + "integrity": "sha512-sAJVKx/FqrLYHAQeN7VpJrPhagZc9R4ImZIWYRFZaaohR3KzmuK88touwsSwSVT8Qcbd4zoDsnGfX4GFB4imyQ==" + } + } +} diff --git a/package.hugo.json b/package.hugo.json new file mode 100644 index 0000000..72de38f --- /dev/null +++ b/package.hugo.json @@ -0,0 +1,19 @@ +{ + "name": "hugotestprojectjsmodimports", + "version": "1.0.0", + "description": "Test project used for integration testing.", + "main": "index.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/gohugoio/hugoTestProjectJSModImports.git" + }, + "author": "", + "license": "ISC", + "bugs": { + "url": "https://github.com/gohugoio/hugoTestProjectJSModImports/issues" + }, + "homepage": "https://github.com/gohugoio/hugoTestProjectJSModImports#readme" +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..ae9e50a --- /dev/null +++ b/package.json @@ -0,0 +1,29 @@ +{ + "author": "", + "bugs": { + "url": "https://github.com/gohugoio/hugoTestProjectJSModImports/issues" + }, + "comments": { + "dependencies": { + "date-fns": "github.com/gohugoio/hugoTestModulesJS/mod2" + }, + "devDependencies": {} + }, + "dependencies": { + "date-fns": "^2.16.1" + }, + "description": "Test project used for integration testing.", + "devDependencies": {}, + "homepage": "https://github.com/gohugoio/hugoTestProjectJSModImports#readme", + "license": "ISC", + "main": "index.js", + "name": "hugotestprojectjsmodimports", + "repository": { + "type": "git", + "url": "git+https://github.com/gohugoio/hugoTestProjectJSModImports.git" + }, + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "version": "1.0.0" +}