Issue 666 (#667)

* 2.1.0

* Low impact changes (#619)

* dependencies clean-up

* types for child_process' spawnSync

* types for child_process' spawnSync + options fix

* linting

* Relative rootdir (#620)

* relative rootDir support

* relative rootDir support (untrackedFiles behavior changed)

* relative rootDir doc changes

* Cleanup before next pr (#621)

* prettier + sort imports

* splitLines types

* unused package 'connect'

* ucfirst, isOnline types

* ellipsize types

* redundant package 'fs-copy-file-sync'

* removing extra line

* // TODO

* packages dependencies update

* comment fix

* fixes

* nicer ellipsize typing

* better?

* Refactor `inquirer` package (#622)

* regroup `inquirer` into a single file

* fix typo

* linting

* switch to `find-up`

* switch to `find-up` & `strip-bom`

* dependencies update

* findUp implementation fix

* enum accessor fix

* fs-extra & typescript dependency fix

* linting

* dependencies clean-up (again)

* non any cast

* issue 666: normalize EOL

* Prettier did this

* `normalize-newline` added. other packages updated

package.json

@@ -73,6 +73,7 @@
     "is-online": "^8.2.0",
     "mkdirp": "^0.5.1",
     "multimatch": "^4.0.0",
+    "normalize-newline": "3.0.0",
     "open": "^6.4.0",
     "path": "^0.12.7",
     "pluralize": "^8.0.0",

src/commands/push.ts

@@ -1,5 +1,12 @@
+import path from 'path';
+import { readFileSync } from 'fs-extra';
+import multimatch from 'multimatch';
+import { watchTree } from 'watch';
+import { loadAPICredentials } from '../auth';
 import { DOT, DOTFILE } from '../dotfile';
 import { FS_OPTIONS, fetchProject, pushFiles } from '../files';
+import { overwritePrompt } from '../inquirer';
+import { isValidManifest } from '../manifest';
 import {
   LOG,
   PROJECT_MANIFEST_BASENAME,
@@ -9,13 +16,7 @@ import {
   spinner,
 } from '../utils';
 
-import { isValidManifest } from '../manifest';
-import { loadAPICredentials } from '../auth';
-import multimatch from 'multimatch';
-import { overwritePrompt } from '../inquirer';
-import path from 'path';
-import { readFileSync } from 'fs-extra';
-import { watchTree } from 'watch';
+const normalizeNewline = require('normalize-newline');
 
 /**
  * Uploads all files into the script.google.com filesystem.
@@ -81,5 +82,5 @@ const manifestHasChanges = async (): Promise<boolean> => {
   const remoteFiles = await fetchProject(scriptId, undefined, true);
   const remoteManifest = remoteFiles.find(file => file.name === PROJECT_MANIFEST_BASENAME);
   if (!remoteManifest) throw Error('remote manifest no found');
-  return localManifest !== remoteManifest.source;
+  return normalizeNewline(localManifest) !== normalizeNewline(remoteManifest.source);
 };