@cocreate/cli 1.35.1 → 1.36.0

package/CHANGELOG.md

@@ -1,3 +1,27 @@
+# [1.36.0](https://github.com/CoCreate-app/CoCreate-cli/compare/v1.35.2...v1.36.0) (2023-08-16)
+
+
+### Bug Fixes
+
+* comment out creating pwa symlink in admin and website ([03231cc](https://github.com/CoCreate-app/CoCreate-cli/commit/03231cca9a699cf207d5773538fd9d0d5f7c2c92))
+* crud attributes renamed ([381f3a0](https://github.com/CoCreate-app/CoCreate-cli/commit/381f3a0f01fb2b816a48a5e53dd5f059a153e754))
+* Refactored *-target to *-selector ([6b66d9a](https://github.com/CoCreate-app/CoCreate-cli/commit/6b66d9ae0ed84c52385fcea6e6a6849dc23186dd))
+* Remove unnecessary dependencies from CoCreate.config.js ([8463408](https://github.com/CoCreate-app/CoCreate-cli/commit/8463408415aa6d13e1ebbfa6c57629adc2ecc2f6))
+* webpack.config and package.json make use of mode=production instead of process.env ([bb6d483](https://github.com/CoCreate-app/CoCreate-cli/commit/bb6d483f062a1220417b4ed178db1d13e56740ad))
+
+
+### Features
+
+* create symlink for service worker, offline page, and manifest ([eaad236](https://github.com/CoCreate-app/CoCreate-cli/commit/eaad2369868c07293617dfb8f34e26252e75f6e9))
+* name attribute and variable renamed to key ([3dec7ba](https://github.com/CoCreate-app/CoCreate-cli/commit/3dec7baffd61cb3200158e85f36070c00a362eb3))
+
+## [1.35.2](https://github.com/CoCreate-app/CoCreate-cli/compare/v1.35.1...v1.35.2) (2023-06-16)
+
+
+### Bug Fixes
+
+* Update dependencies versions for [@cocreate](https://github.com/cocreate) libraries ([243fa7d](https://github.com/CoCreate-app/CoCreate-cli/commit/243fa7d2765280b0c48144b744f20a839d615fbb))
+
 ## [1.35.1](https://github.com/CoCreate-app/CoCreate-cli/compare/v1.35.0...v1.35.1) (2023-06-16)
 
 

package/CoCreate.config.js

@@ -4,8 +4,8 @@ module.exports = {
     "host": "",
     "sources": [
         {
-            "collection": "files",
-            "document": {
+            "array": "files",
+            "object": {
                 "_id": "637ca36250234ef1671ce30f",
                 "name": "index.html",
                 "path": "/docs/cli/index.html",
@@ -122,10 +122,6 @@ module.exports = {
             'path': '../CoCreate-events',
             'repo': 'github.com/CoCreate-app/CoCreate-events.git'
         },
-        {
-            'path': '../CoCreate-fetch',
-            'repo': 'github.com/CoCreate-app/CoCreate-fetch.git'
-        },
         {
             'path': '../CoCreate-file',
             'repo': 'github.com/CoCreate-app/CoCreate-file.git'
@@ -138,10 +134,6 @@ module.exports = {
             'path': '../CoCreate-floating-label',
             'repo': 'github.com/CoCreate-app/CoCreate-floating-label.git'
         },
-        {
-            'path': '../CoCreate-form',
-            'repo': 'github.com/CoCreate-app/CoCreate-form.git'
-        },
         {
             'path': '../CoCreate-fullscreen',
             'repo': 'github.com/CoCreate-app/CoCreate-fullscreen.git'
@@ -218,10 +210,6 @@ module.exports = {
             'path': '../CoCreate-render',
             'repo': 'github.com/CoCreate-app/CoCreate-render.git'
         },
-        {
-            'path': '../CoCreate-render-json',
-            'repo': 'github.com/CoCreate-app/CoCreate-render-json.git'
-        },
         {
             'path': '../CoCreate-resize',
             'repo': 'github.com/CoCreate-app/CoCreate-resize.git'
@@ -414,11 +402,6 @@ module.exports = {
             'path': '../../CoCreate-plugins/CoCreate-twitter',
             'repo': 'github.com/CoCreate-app/CoCreate-twitter.git'
         },
-        {
-            'path': '../../CoCreate-plugins/CoCreate-uppy',
-            'repo': 'github.com/CoCreate-app/CoCreate-uppy.git'
-        },
-
 
         //     {
         //         'path': '../CoCreateApi',

package/docs/index.html

@@ -11,19 +11,19 @@
             sizes="32x32"
             href="https://cocreate.app/images/favicon.ico" />
         <meta
-            name="description"
+            key="description"
             content="A simple HTML5 and pure javascript component. Easy configuration using HTML5 attributes or Javscript api and highly styleable." />
         <meta
-            name="keywords"
+            key="keywords"
             content="helper classes, utility classes, css framework, css library, inline style classes" />
         <meta name="robots" content="index,follow" />
 
         <link
             rel="stylesheet"
             href="/docs/index.css"
-            collection="files"
-            document_id="60888216117c640e7596303f"
-            name="src"
+            array="files"
+            object="60888216117c640e7596303f"
+            key="src"
             type="text/css"
             save="true" />
 
@@ -37,20 +37,20 @@
             scroll="sticky-nav,hide-nav"
             scroll-up="10"
             scroll-down="10"
-            collection="files"
-            document_id="60395ef42b3ac232657040fd"
-            name="src"></nav>
+            array="files"
+            object="60395ef42b3ac232657040fd"
+            key="src"></nav>
         <sidenav
             id="menuL"
             class="position:fixed top:0px left:0px overflow:hidden background:whitesmoke height:100vh width:0px width:300px@xl"
             resizable
-            resize-target="[content_id='content']"
+            resize-selector="[content_id='content']"
             resize-property="margin-left"
             resize-value="width">
             <menu
-                collection="files"
-                document_id="603717b07de7fb350ae9fec8"
-                name="src"></menu>
+                array="files"
+                object="603717b07de7fb350ae9fec8"
+                key="src"></menu>
             <div resize="right"></div>
         </sidenav>
         <main
@@ -197,9 +197,9 @@
                                 <textarea
                                     type="code"
                                     lang="html"
-                                    collection="demos"
-                                    document_id=""
-                                    name="demo"
+                                    array="demos"
+                                    object=""
+                                    key="demo"
                                     save="false"
                                     id="demo"
                                     class="height:100% width:100% outline:none border:none resize:none padding:5px"></textarea>
@@ -222,7 +222,7 @@
                                     show="#eye-slash"
                                     hide="#eye, #demo-preview"
                                     toggle="code-height"
-                                    toggle-target="#demo-code"
+                                    toggle-selector="#demo-code"
                                     ><i
                                         class="height:18px fill:#505050"
                                         src="/assets/svg/eye.svg"></i
@@ -234,7 +234,7 @@
                                     show="#eye, #demo-preview"
                                     hide="#eye-slash"
                                     toggle="code-height"
-                                    toggle-target="#demo-code"
+                                    toggle-selector="#demo-code"
                                     ><i
                                         class="height:20px fill:#505050"
                                         src="/assets/svg/eye-slash.svg"></i
@@ -263,7 +263,7 @@
                                 <a
                                     class="margin-right:5px"
                                     fullscreen
-                                    fullscreen-target="#playground"></a>
+                                    fullscreen-selector="#playground"></a>
                             </div>
                         </div>
                         <!-- End SandBox -->

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/cli",
-  "version": "1.35.1",
+  "version": "1.36.0",
   "description": "Polyrepo management bash CLI tool. Run all git commands and yarn commands on multiple repositories. Also includes a few custom macros for cloning, installing, etc.",
   "keywords": [
     "cli",
@@ -57,8 +57,8 @@
     "coc": "src/coc.js"
   },
   "dependencies": {
-    "@cocreate/config": "^1.0.9",
-    "@cocreate/file": "^1.3.9",
+    "@cocreate/config": "^1.1.0",
+    "@cocreate/file": "^1.3.10",
     "glob": "^7.1.7",
     "prettier": "^2.3.2"
   }

package/src/commands/fs/config.js

@@ -14,14 +14,14 @@ function globUpdater(er, files) {
 
 function update(MdPath) {
     let name = path.basename(path.resolve(path.dirname(MdPath), './')).substring(9);
-    let document_id = '';
+    let object = '';
     let replaceContent = fs.readFileSync(MdPath).toString();
 
 
     let content_source = replaceContent.substring(replaceContent.indexOf("sources"));
-    let content1 = content_source.substring(content_source.indexOf("document_id"));
+    let content1 = content_source.substring(content_source.indexOf("object"));
     let content2 = content1.substring(content1.indexOf(':'));
-    document_id = content2.substring(3, content2.indexOf(',') - 4);
+    object = content2.substring(3, content2.indexOf(',') - 4);
 
 
     let fileContent = `module.exports = {
@@ -33,9 +33,9 @@ function update(MdPath) {
     
     "sources": [
         {
-            "collection": "files",
-            "document": {
-                "_id": "${document_id}",
+            "array": "files",
+            "object": {
+                "_id": "${object}",
                 "name": "index.html",
                 "path": "/docs/${name}/index.html",
                 "src": "{{./docs/index.html}}",
@@ -54,12 +54,12 @@ function update(MdPath) {
 
 `;
 
-    if (!document_id.length)
-        console.log("Document_id Undefined: ", MdPath);
-    if (document_id.length != 24 && document_id.length != 0)
-        console.log("Document_id not valid! please check your config: ", MdPath);
+    if (!object.length)
+        console.log("object Undefined: ", MdPath);
+    if (object.length != 24 && object.length != 0)
+        console.log("object not valid! please check your config: ", MdPath);
     else {
-        console.log(MdPath, " -> document_id : ", document_id);
+        console.log(MdPath, " -> object : ", object);
         if (fs.existsSync(MdPath))
             fs.unlinkSync(MdPath);
         fs.writeFileSync(MdPath, fileContent);

package/src/commands/other/symlinkPwa.js

@@ -33,7 +33,19 @@ function createSymlink(dir, dest, option) {
 
 }
 
-symlink('./src/assets', '../assets', 'dir')
-symlink('./src/manifest.webmanifest', '../manifest.webmanifest', 'file')
-symlink('./src/sw.js', '../sw.js', 'file')
-symlink('./src/offline.html', '../offline.html', 'file')
+
+symlink('./dist/service-worker.js', '../../service-worker.js', 'file')
+// symlink('./dist/service-worker.js', '../../CoCreate-admin/src/service-worker.js', 'file')
+// symlink('./dist/service-worker.js', '../../CoCreate-website/src/service-worker.js', 'file')
+
+symlink('./demo/offline.html', '../../offline.html', 'file')
+// symlink('./demo/offline.html', '../../CoCreate-admin/src/offline.html', 'file')
+// symlink('./demo/offline.html', '../../CoCreate-website/src/offline.html', 'file')
+
+symlink('./demo/manifest.webmanifest', '../../manifest.webmanifest', 'file')
+// symlink('./demo/manifest.webmanifest', '../../CoCreate-admin/src/manifest.webmanifest', 'file')
+// symlink('./demo/manifest.webmanifest', '../../CoCreate-website/src/manifest.webmanifest', 'file')
+
+// symlink('./demo/manifest-assets', '../../manifest-assets', 'dir')
+// symlink('./demo/manifest-assets', '../../CoCreate-admin/manifest-assets', 'dir')
+// symlink('./demo/manifest-assets', '../../CoCreate-website/manifest-assets', 'dir')

package/webpack.config.js

@@ -1,84 +1,90 @@
 const path = require("path")
 const TerserPlugin = require("terser-webpack-plugin")
 const MiniCssExtractPlugin = require("mini-css-extract-plugin")
-let isProduction = process.env.NODE_ENV === "production"
 const { CleanWebpackPlugin } = require("clean-webpack-plugin")
 
-module.exports = {
-  entry: {
-    "CoCreate-cli": "./src/index.js",
-  },
-  output: {
-    path: path.resolve(__dirname, "dist"),
-    filename: isProduction ? "[name].min.js" : "[name].js",
-    libraryTarget: "umd",
-    libraryExport: "default",
-    library: ["CoCreate", "cli"],
-    globalObject: "this",
-  },
+module.exports = (env, argv) => {
+    let isProduction = false
+    if (argv.mode === 'production')
+        isProduction = true
 
-  plugins: [
-    new CleanWebpackPlugin(),
-    new MiniCssExtractPlugin({
-      filename: "[name].css",
-    }),
-  ],
-  // Default mode for Webpack is production.
-  // Depending on mode Webpack will apply different things
-  // on final bundle. For now we don't need production's JavaScript
-  // minifying and other thing so let's set mode to development
-  mode: isProduction ? "production" : "development",
-  module: {
-    rules: [
-      {
-        test: /.js$/,
-        exclude: /(node_modules)/,
-        use: {
-          loader: "babel-loader",
-          options: {
-            plugins: ["@babel/plugin-transform-modules-commonjs"],
-          },
+    const config = {
+        entry: {
+            "CoCreate-cli": "./src/index.js",
         },
-      },
-      {
-        test: /.css$/i,
-        use: [
-          { loader: "style-loader", options: { injectType: "linkTag" } },
-          "file-loader",
+        output: {
+            path: path.resolve(__dirname, "dist"),
+            filename: isProduction ? "[name].min.js" : "[name].js",
+            libraryTarget: "umd",
+            libraryExport: "default",
+            library: ["CoCreate", "cli"],
+            globalObject: "this",
+        },
+
+        plugins: [
+            new CleanWebpackPlugin(),
+            new MiniCssExtractPlugin({
+                filename: "[name].css",
+            }),
         ],
-      },
-    ],
-  },
+        // Default mode for Webpack is production.
+        // Depending on mode Webpack will apply different things
+        // on final bundle. For now we don't need production's JavaScript
+        // minifying and other thing so let's set mode to development
+        mode: isProduction ? "production" : "development",
+        module: {
+            rules: [
+                {
+                    test: /.js$/,
+                    exclude: /(node_modules)/,
+                    use: {
+                        loader: "babel-loader",
+                        options: {
+                            plugins: ["@babel/plugin-transform-modules-commonjs"],
+                        },
+                    },
+                },
+                {
+                    test: /.css$/i,
+                    use: [
+                        { loader: "style-loader", options: { injectType: "linkTag" } },
+                        "file-loader",
+                    ],
+                },
+            ],
+        },
 
-  // add source map
-  ...(isProduction ? {} : { devtool: "eval-source-map" }),
+        // add source map
+        ...(isProduction ? {} : { devtool: "eval-source-map" }),
 
-  optimization: {
-    minimize: true,
-    minimizer: [
-      new TerserPlugin({
-        extractComments: true,
-        // cache: true,
-        parallel: true,
-        // sourceMap: true, // Must be set to true if using source-maps in production
-        terserOptions: {
-          // https://github.com/webpack-contrib/terser-webpack-plugin#terseroptions
-          // extractComments: 'all',
-          compress: {
-            drop_console: true,
-          },
-        },
-      }),
-    ],
-    splitChunks: {
-      chunks: "all",
-      minSize: 200,
-      // maxSize: 99999,
-      //minChunks: 1,
+        optimization: {
+            minimize: true,
+            minimizer: [
+                new TerserPlugin({
+                    extractComments: true,
+                    // cache: true,
+                    parallel: true,
+                    // sourceMap: true, // Must be set to true if using source-maps in production
+                    terserOptions: {
+                        // https://github.com/webpack-contrib/terser-webpack-plugin#terseroptions
+                        // extractComments: 'all',
+                        compress: {
+                            drop_console: true,
+                        },
+                    },
+                }),
+            ],
+            splitChunks: {
+                chunks: "all",
+                minSize: 200,
+                // maxSize: 99999,
+                //minChunks: 1,
 
-      cacheGroups: {
-        defaultVendors: false,
-      },
-    },
-  },
-}
+                cacheGroups: {
+                    defaultVendors: false,
+                },
+            },
+        },
+    }
+    return config
+}