diff --git a/Makefile b/Makefile
index 3ea42cb8..d587217a 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ all: dev-setup lint build-js-production test
dev-setup: clean clean-dev npm-init
npm-init:
- npm install
+ npm ci
npm-update:
npm update
diff --git a/appinfo/info.xml b/appinfo/info.xml
index ef7b67f6..50859b87 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -5,7 +5,7 @@
Photos
Your memories under your control
Your memories under your control
- 19.0.0
+ 1.0.0
agpl
John Molakvoæ
Photos
diff --git a/js/chunks/1-312ec9a59eeae7ab33ab.js b/js/1.js
similarity index 99%
rename from js/chunks/1-312ec9a59eeae7ab33ab.js
rename to js/1.js
index d6183af7..ef7e0fa9 100644
Binary files a/js/chunks/1-312ec9a59eeae7ab33ab.js and b/js/1.js differ
diff --git a/js/1.js.map b/js/1.js.map
new file mode 100644
index 00000000..beeab9a7
Binary files /dev/null and b/js/1.js.map differ
diff --git a/js/chunks/2-312ec9a59eeae7ab33ab.js b/js/2.js
similarity index 99%
rename from js/chunks/2-312ec9a59eeae7ab33ab.js
rename to js/2.js
index 464cc334..df18fa69 100644
Binary files a/js/chunks/2-312ec9a59eeae7ab33ab.js and b/js/2.js differ
diff --git a/js/2.js.map b/js/2.js.map
new file mode 100644
index 00000000..714f462f
Binary files /dev/null and b/js/2.js.map differ
diff --git a/js/chunks/3-312ec9a59eeae7ab33ab.js b/js/3.js
similarity index 99%
rename from js/chunks/3-312ec9a59eeae7ab33ab.js
rename to js/3.js
index ffc3dc02..90e14252 100644
Binary files a/js/chunks/3-312ec9a59eeae7ab33ab.js and b/js/3.js differ
diff --git a/js/3.js.map b/js/3.js.map
new file mode 100644
index 00000000..dcef666d
Binary files /dev/null and b/js/3.js.map differ
diff --git a/js/chunks/1-312ec9a59eeae7ab33ab.js.map b/js/chunks/1-312ec9a59eeae7ab33ab.js.map
deleted file mode 100644
index 5ff344a1..00000000
--- a/js/chunks/1-312ec9a59eeae7ab33ab.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"sources":["webpack:///./src/assets/Illustrations/empty.svg"],"names":["module","exports"],"mappings":"2EAAAA,EAAOC,QAAU","file":"chunks/1-312ec9a59eeae7ab33ab.js","sourcesContent":["module.exports = \"\""],"sourceRoot":""}
\ No newline at end of file
diff --git a/js/chunks/2-312ec9a59eeae7ab33ab.js.map b/js/chunks/2-312ec9a59eeae7ab33ab.js.map
deleted file mode 100644
index 57d7a870..00000000
--- a/js/chunks/2-312ec9a59eeae7ab33ab.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"sources":["webpack:///./src/assets/Illustrations/folder.svg"],"names":["module","exports"],"mappings":"2EAAAA,EAAOC,QAAU","file":"chunks/2-312ec9a59eeae7ab33ab.js","sourcesContent":["module.exports = \"\""],"sourceRoot":""}
\ No newline at end of file
diff --git a/js/chunks/3-312ec9a59eeae7ab33ab.js.map b/js/chunks/3-312ec9a59eeae7ab33ab.js.map
deleted file mode 100644
index 5aee5820..00000000
--- a/js/chunks/3-312ec9a59eeae7ab33ab.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"sources":["webpack:///./src/assets/Illustrations/images.svg"],"names":["module","exports"],"mappings":"2EAAAA,EAAOC,QAAU","file":"chunks/3-312ec9a59eeae7ab33ab.js","sourcesContent":["module.exports = \"\""],"sourceRoot":""}
\ No newline at end of file
diff --git a/js/photos.js b/js/photos.js
index 0860046b..a86dc5de 100644
Binary files a/js/photos.js and b/js/photos.js differ
diff --git a/js/photos.js.map b/js/photos.js.map
index 31540c3e..1e39cb93 100644
Binary files a/js/photos.js.map and b/js/photos.js.map differ
diff --git a/package-lock.json b/package-lock.json
index cfa8e072..528b3be6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "photos",
- "version": "19.0.0",
+ "version": "1.0.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -2320,12 +2320,6 @@
"resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
"integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ="
},
- "array-find": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/array-find/-/array-find-1.0.0.tgz",
- "integrity": "sha1-bI4obRHtdoMn+OYuzuhzU8o+eLg=",
- "dev": true
- },
"array-find-index": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
@@ -3909,17 +3903,6 @@
"once": "^1.4.0"
}
},
- "enhanced-resolve": {
- "version": "0.9.1",
- "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz",
- "integrity": "sha1-TW5omzcl+GCQknzMhs2fFjW4ni4=",
- "dev": true,
- "requires": {
- "graceful-fs": "^4.1.2",
- "memory-fs": "^0.2.0",
- "tapable": "^0.1.8"
- }
- },
"entities": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
@@ -4064,24 +4047,6 @@
"resolve": "^1.5.0"
}
},
- "eslint-import-resolver-webpack": {
- "version": "0.11.1",
- "resolved": "https://registry.npmjs.org/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.11.1.tgz",
- "integrity": "sha512-eK3zR7xVQR/MaoBWwGuD+CULYVuqe5QFlDukman71aI6IboCGzggDUohHNfu1ZeBnbHcUHJc0ywWoXUBNB6qdg==",
- "dev": true,
- "requires": {
- "array-find": "^1.0.0",
- "debug": "^2.6.8",
- "enhanced-resolve": "~0.9.0",
- "find-root": "^1.1.0",
- "has": "^1.0.1",
- "interpret": "^1.0.0",
- "lodash": "^4.17.4",
- "node-libs-browser": "^1.0.0 || ^2.0.0",
- "resolve": "^1.10.0",
- "semver": "^5.3.0"
- }
- },
"eslint-loader": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/eslint-loader/-/eslint-loader-3.0.2.tgz",
@@ -4655,12 +4620,6 @@
"pkg-dir": "^3.0.0"
}
},
- "find-root": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
- "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==",
- "dev": true
- },
"find-up": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
@@ -6776,12 +6735,6 @@
}
}
},
- "memory-fs": {
- "version": "0.2.0",
- "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz",
- "integrity": "sha1-8rslNovBIeORwlIN6Slpyu4KApA=",
- "dev": true
- },
"meow": {
"version": "3.7.0",
"resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
@@ -10062,12 +10015,6 @@
}
}
},
- "tapable": {
- "version": "0.1.10",
- "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz",
- "integrity": "sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=",
- "dev": true
- },
"tar": {
"version": "2.2.2",
"resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz",
diff --git a/package.json b/package.json
index 1acc97ec..c577b3b2 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "photos",
"description": "Your memories under your control",
- "version": "19.0.0",
+ "version": "1.0.0",
"author": "John Molakvoæ ",
"contributors": [
"John Molakvoæ "
@@ -67,7 +67,6 @@
"eslint": "^5.16.0",
"eslint-config-nextcloud": "^0.1.0",
"eslint-config-standard": "^12.0.0",
- "eslint-import-resolver-webpack": "^0.11.1",
"eslint-loader": "^3.0.2",
"eslint-plugin-import": "^2.18.2",
"eslint-plugin-nextcloud": "^0.3.0",
diff --git a/webpack.common.js b/webpack.common.js
index 06c06cb3..4a3acbcc 100644
--- a/webpack.common.js
+++ b/webpack.common.js
@@ -5,8 +5,7 @@ const StyleLintPlugin = require('stylelint-webpack-plugin')
const SassGetGridConfig = require('./src/utils/SassGetGridConfig')
const ModuleReplaceWebpackPlugin = require('module-replace-webpack-plugin');
-const packageJson = require('./package.json')
-const appName = packageJson.name
+const appName = process.env.npm_package_name
module.exports = {
entry: path.join(__dirname, 'src', 'main.js'),
@@ -14,7 +13,7 @@ module.exports = {
path: path.resolve(__dirname, './js'),
publicPath: '/js/',
filename: `${appName}.js`,
- chunkFilename: 'chunks/[name]-[hash].js',
+ chunkFilename: '[name].js?v=[contenthash]',
},
module: {
rules: [